diff --git a/Notes-master/.DS_Store b/Notes-master/.DS_Store new file mode 100644 index 0000000..645a4f4 Binary files /dev/null and b/Notes-master/.DS_Store differ diff --git a/Notes-master/.gitignore b/Notes-master/.gitignore deleted file mode 100644 index 7df8dff..0000000 --- a/Notes-master/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# generated files -bin/ -gen/ - -# Local configuration file (sdk path, etc) -project.properties -.settings/ -.classpath -.project diff --git a/Notes-master/.gradle/.DS_Store b/Notes-master/.gradle/.DS_Store new file mode 100644 index 0000000..74ae344 Binary files /dev/null and b/Notes-master/.gradle/.DS_Store differ diff --git a/Notes-master/.gradle/8.0/checksums/checksums.lock b/Notes-master/.gradle/8.0/checksums/checksums.lock new file mode 100644 index 0000000..c07a004 Binary files /dev/null and b/Notes-master/.gradle/8.0/checksums/checksums.lock differ diff --git a/Notes-master/.gradle/8.0/checksums/md5-checksums.bin b/Notes-master/.gradle/8.0/checksums/md5-checksums.bin new file mode 100644 index 0000000..58c7c23 Binary files /dev/null and b/Notes-master/.gradle/8.0/checksums/md5-checksums.bin differ diff --git a/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin b/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin new file mode 100644 index 0000000..258708f Binary files /dev/null and b/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin differ diff --git a/Notes-master/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/Notes-master/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..37eb51e Binary files /dev/null and b/Notes-master/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock differ diff --git a/Notes-master/.gradle/8.0/dependencies-accessors/gc.properties b/Notes-master/.gradle/8.0/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin b/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin new file mode 100644 index 0000000..ecdc911 Binary files /dev/null and b/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock b/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock new file mode 100644 index 0000000..b3fd43b Binary files /dev/null and b/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/Notes-master/.gradle/8.0/fileChanges/last-build.bin b/Notes-master/.gradle/8.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/Notes-master/.gradle/8.0/fileChanges/last-build.bin differ diff --git a/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin b/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin new file mode 100644 index 0000000..6b7173e Binary files /dev/null and b/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock b/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..0909291 Binary files /dev/null and b/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin b/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..84a86e3 Binary files /dev/null and b/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/Notes-master/.gradle/8.0/gc.properties b/Notes-master/.gradle/8.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..b22b725 Binary files /dev/null and b/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Notes-master/.gradle/buildOutputCleanup/cache.properties b/Notes-master/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..882c55b --- /dev/null +++ b/Notes-master/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Apr 25 18:08:14 CST 2023 +gradle.version=8.0 diff --git a/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..2f1a61a Binary files /dev/null and b/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Notes-master/.gradle/file-system.probe b/Notes-master/.gradle/file-system.probe new file mode 100644 index 0000000..5761342 Binary files /dev/null and b/Notes-master/.gradle/file-system.probe differ diff --git a/Notes-master/.gradle/vcs-1/gc.properties b/Notes-master/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/Notes-master/.gradle/workspace-id.txt b/Notes-master/.gradle/workspace-id.txt new file mode 100644 index 0000000..3e16a08 Binary files /dev/null and b/Notes-master/.gradle/workspace-id.txt differ diff --git a/Notes-master/.gradle/workspace-id.txt.lock b/Notes-master/.gradle/workspace-id.txt.lock new file mode 100644 index 0000000..bec1aa5 Binary files /dev/null and b/Notes-master/.gradle/workspace-id.txt.lock differ diff --git a/Notes-master/.idea/.gitignore b/Notes-master/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/Notes-master/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/Notes-master/.idea/compiler.xml b/Notes-master/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/Notes-master/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Notes-master/.idea/deploymentTargetDropDown.xml b/Notes-master/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..32d6dcf --- /dev/null +++ b/Notes-master/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/.idea/gradle.xml b/Notes-master/.idea/gradle.xml new file mode 100644 index 0000000..ae388c2 --- /dev/null +++ b/Notes-master/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/Notes-master/.idea/jarRepositories.xml b/Notes-master/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/Notes-master/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/.idea/misc.xml b/Notes-master/.idea/misc.xml new file mode 100644 index 0000000..773fe0f --- /dev/null +++ b/Notes-master/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/Notes-master/NOTICE b/Notes-master/NOTICE deleted file mode 100644 index 9a54521..0000000 --- a/Notes-master/NOTICE +++ /dev/null @@ -1,190 +0,0 @@ - - Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/Notes-master/README b/Notes-master/README deleted file mode 100644 index fc0d824..0000000 --- a/Notes-master/README +++ /dev/null @@ -1,23 +0,0 @@ -[中文] - -1. MiCode便签是小米便签的社区开源版，由MIUI团队(www.miui.com) 发起并贡献第一批代码，遵循NOTICE文件所描述的开源协议， - 今后为MiCode社区(www.micode.net) 拥有，并由社区发布和维护。 - -2. Bug反馈和跟踪，请访问Github, - https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open - -3. 功能建议和综合讨论，请访问MiCode, - http://micode.net/forum.php?mod=forumdisplay&fid=38 - - -[English] - -1. MiCode Notes is open source edition of XM notepad, it's first initiated and sponsored by MIUI team (www.miui.com). - It's opened under license described by NOTICE file. It's owned by the MiCode community (www.micode.net). In future, - the MiCode community will release and maintain this project. - -2. Regarding issue tracking, please visit Github, - https://github.com/MiCode/Notes/issues?sort=created&direction=desc&state=open - -3. Regarding feature request and general discussion, please visit Micode forum, - http://micode.net/forum.php?mod=forumdisplay&fid=38 diff --git a/Notes-master/app/.DS_Store b/Notes-master/app/.DS_Store new file mode 100644 index 0000000..d7d3c8e Binary files /dev/null and b/Notes-master/app/.DS_Store differ diff --git a/Notes-master/app/build.gradle b/Notes-master/app/build.gradle new file mode 100644 index 0000000..b12fd57 --- /dev/null +++ b/Notes-master/app/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.android.application' + +android { + namespace "net.micode.notes" + compileSdk 30 + buildToolsVersion '30.0.2' + useLibrary 'org.apache.http.legacy' + + defaultConfig { + applicationId "net.micode.notes" + minSdkVersion 14 + targetSdkVersion 29 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + manifestPlaceholders = [server_environment: "RELEASE", uses_cleartext_traffic: "true"] + } + } + +} diff --git a/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/Notes-master/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/apk/debug/app-debug.apk b/Notes-master/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..9518b87 Binary files /dev/null and b/Notes-master/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Notes-master/app/build/intermediates/apk/debug/output-metadata.json b/Notes-master/app/build/intermediates/apk/debug/output-metadata.json new file mode 100644 index 0000000..b2231b9 --- /dev/null +++ b/Notes-master/app/build/intermediates/apk/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "app-debug.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt new file mode 100644 index 0000000..46dacc6 --- /dev/null +++ b/Notes-master/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -0,0 +1,2 @@ +#- File Locator - +listingFile=../../apk/debug/output-metadata.json diff --git a/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties b/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties new file mode 100644 index 0000000..742905b --- /dev/null +++ b/Notes-master/app/build/intermediates/app_metadata/debug/app-metadata.properties @@ -0,0 +1,2 @@ +appMetadataVersion=1.1 +androidGradlePluginVersion=8.0.0 diff --git a/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json new file mode 100644 index 0000000..714f651 --- /dev/null +++ b/Notes-master/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json @@ -0,0 +1,10 @@ +{ + "version": 3, + "artifactType": { + "type": "COMPATIBLE_SCREEN_MANIFEST", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [] +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar new file mode 100644 index 0000000..b894c6e Binary files /dev/null and b/Notes-master/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_0/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_0/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_0/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_1/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_1/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_1/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_2/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_2/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_2/graph.bin differ diff --git a/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_3/graph.bin b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_3/graph.bin new file mode 100644 index 0000000..601f245 Binary files /dev/null and b/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_ad8f205bff8ee720e9b8882b9fbfbf2d42fd5ec6f3b51d4c4ceaab8a4879503a_bucket_3/graph.bin differ diff --git a/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex new file mode 100644 index 0000000..92d12b6 Binary files /dev/null and b/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out new file mode 100644 index 0000000..8bc5d0b Binary files /dev/null and b/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out b/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/Notes-master/app/build/intermediates/dex_number_of_buckets_file/debug/out @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state new file mode 100644 index 0000000..7fb50e1 Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties new file mode 100644 index 0000000..7ef6f67 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Tue Apr 25 19:44:32 CST 2023 +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/raw/introduction=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml new file mode 100644 index 0000000..944978b --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + #335b5b5b33sp26sp20sp17sp14sp + -%s + --%s + --%s + --%s + + Messaging + Email + NotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties new file mode 100644 index 0000000..38b40dc --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -0,0 +1,96 @@ +#Tue Apr 25 19:44:32 CST 2023 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png +net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/drawable/new_note.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/note_list_footer.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/layout/widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction +net.micode.notes.app-main-5\:/raw/introduction=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/raw/introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/xml/preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/xml/searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml diff --git a/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml new file mode 100644 index 0000000..e49b0c3 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -0,0 +1,169 @@ + + + + -%s + --%s + --%s + --%s + + + Messaging + Email + + #335b5b5b + 26sp + 20sp + 17sp + 14sp + 33sp + + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + + Confirm to delete folder and its notes? + Confirm to delete this note? + Confirm to delete the selected %d notes? + Delete selected notes + Notes + Notes 2x2 + Notes 4x4 + Delete + Call notes + cancel + set + Delete reminder successfully + Sorry, can not set clock on empty note + Sorry, can not send and empty note to home + The note is not exist + Export failed, please check SD card + SD card busy, not available now + Sync is canceled + Sync failed, internal error occurs + Sync failed, please check network and account settings + Export fail + notes_%s.txt + /MIUI/notes/ + The folder %1$s exist, please rename + yyyyMMdd + MMMd kk:mm + Export text file (%1$s) to SD (%2$s) directory + (%d) + Have moved selected %1$d notes to %2$s folder + Input name + Note added to home + Remind me + New Folder + Delete + Deselect all + Export text + Change folder name + Delete folder + View folder + Large + Medium + Font size + Small + Super + Enter check list + Move to folder + Parent folder + Leave check list + Delete reminder + Search + Select all + Nothing selected, the operation is invalid + %d selected + Send to home + Settings + Share + Sync + Cancel syncing + Select folder + Expired + Send email + Open map + Call + Browse web + Take a look + Got it + Add note + ... + Sync notes with google task + Sync account + Add account + New note background color random + Cancel syncing + Sync immediately + Current account %1$s + All sync related information will be deleted, which may result in duplicated items sometime + Please select a google account. Local notes will be synced with google task. + Sync notes + Last sync time %1$s + yyyy-MM-dd hh:mm:ss + Cancel + Change sync account + Remove sync account + Settings + Cannot change the account because sync is in progress + %1$s has been set as the sync account + Notes + Search notes + Searching Notes + Text in your notes + Set reminder + Export successful + Sync is successful with account %1$s + Getting remote note list... + Logging into %1$s... + Synchronize local notes with Google Task... + Sync is canceled + Sync is failed + Sync is successful + Syncing notes... + No associated note found, click to create associated note. + Privacy mode，can not see note content + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml new file mode 100644 index 0000000..944978b --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -0,0 +1,56 @@ + + + 短信 + 郵件 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + %1$s 條符合”%2$s“的搜尋結果 + + 短信 + 邮件 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + %1$s 条符合“%2$s”的搜索结果 + #335b5b5b33sp26sp20sp17sp14sp + -%s + --%s + --%s + --%s + + Messaging + Email + NotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + %1$s result for \"%2$s\" + + %1$s results for \"%2$s\" + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml new file mode 100644 index 0000000..e0eb48f --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml new file mode 100644 index 0000000..6d6ae10 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml new file mode 100644 index 0000000..9f7bba1 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt new file mode 100644 index 0000000..a6cdf50 --- /dev/null +++ b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -0,0 +1,4 @@ +#Tue May 16 12:38:10 CST 2023 +base.0=/Users/mac/AndroidStudioProjects/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex +path.0=classes.dex +renamed.0=classes.dex diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources new file mode 100644 index 0000000..751f88b Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 new file mode 100644 index 0000000..945a7c5 Binary files /dev/null and b/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class new file mode 100644 index 0000000..a7948fd Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class new file mode 100644 index 0000000..42394b7 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class new file mode 100644 index 0000000..569dbdc Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class new file mode 100644 index 0000000..76ef96e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class new file mode 100644 index 0000000..36c8d49 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class new file mode 100644 index 0000000..42461a2 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class new file mode 100644 index 0000000..413745e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class new file mode 100644 index 0000000..64fe9eb Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class new file mode 100644 index 0000000..0b075b4 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class new file mode 100644 index 0000000..1d3de0e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class new file mode 100644 index 0000000..20ff3f7 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class new file mode 100644 index 0000000..5236c5e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class new file mode 100644 index 0000000..099f3ba Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class new file mode 100644 index 0000000..2783ae3 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class new file mode 100644 index 0000000..5aaf1d4 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class new file mode 100644 index 0000000..359609e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class new file mode 100644 index 0000000..1a059ce Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class new file mode 100644 index 0000000..75665c2 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class new file mode 100644 index 0000000..86d1c0c Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class new file mode 100644 index 0000000..f73069c Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class new file mode 100644 index 0000000..a654e5d Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class new file mode 100644 index 0000000..21c7e34 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class new file mode 100644 index 0000000..9d9b173 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class new file mode 100644 index 0000000..e65832c Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class new file mode 100644 index 0000000..ef527ce Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class new file mode 100644 index 0000000..69ce7c4 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class new file mode 100644 index 0000000..a0c88d0 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class new file mode 100644 index 0000000..15f1f77 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class new file mode 100644 index 0000000..705d4cc Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class new file mode 100644 index 0000000..63e7f9c Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class new file mode 100644 index 0000000..6a86737 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class new file mode 100644 index 0000000..6af3200 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class new file mode 100644 index 0000000..d320e3e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class new file mode 100644 index 0000000..84e57a4 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class new file mode 100644 index 0000000..8805a06 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class new file mode 100644 index 0000000..7f2eb75 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class new file mode 100644 index 0000000..b4ec3ba Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class new file mode 100644 index 0000000..f2e1b62 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class new file mode 100644 index 0000000..98353eb Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class new file mode 100644 index 0000000..a1d202d Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class new file mode 100644 index 0000000..a41b775 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class new file mode 100644 index 0000000..029286f Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class new file mode 100644 index 0000000..e65c35c Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class new file mode 100644 index 0000000..de51bad Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class new file mode 100644 index 0000000..d04cbe7 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class new file mode 100644 index 0000000..255a4e6 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class new file mode 100644 index 0000000..400d289 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class new file mode 100644 index 0000000..415e755 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class new file mode 100644 index 0000000..70481dd Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class new file mode 100644 index 0000000..71e5215 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class new file mode 100644 index 0000000..ddd74fd Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class new file mode 100644 index 0000000..54e7df6 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class new file mode 100644 index 0000000..fad3442 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class new file mode 100644 index 0000000..023f716 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class new file mode 100644 index 0000000..b4cba7b Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class new file mode 100644 index 0000000..49e0f6e Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class new file mode 100644 index 0000000..e7c4807 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class new file mode 100644 index 0000000..8e1f0bf Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class new file mode 100644 index 0000000..5713ce5 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class new file mode 100644 index 0000000..2040186 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class new file mode 100644 index 0000000..9874f47 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class new file mode 100644 index 0000000..3a19d3b Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class new file mode 100644 index 0000000..771aa91 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class new file mode 100644 index 0000000..f1ba220 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class new file mode 100644 index 0000000..76c0c9d Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class new file mode 100644 index 0000000..ce64839 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class new file mode 100644 index 0000000..14a87f0 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class new file mode 100644 index 0000000..eb95784 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class new file mode 100644 index 0000000..dbd1e8a Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class new file mode 100644 index 0000000..5a9da61 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class new file mode 100644 index 0000000..19f6959 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class new file mode 100644 index 0000000..993c05a Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class new file mode 100644 index 0000000..127437f Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class new file mode 100644 index 0000000..2edab7b Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class new file mode 100644 index 0000000..3981f16 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class new file mode 100644 index 0000000..8c00146 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class new file mode 100644 index 0000000..a24c999 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class new file mode 100644 index 0000000..81f06d3 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class new file mode 100644 index 0000000..6fa34c6 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class new file mode 100644 index 0000000..1816017 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class new file mode 100644 index 0000000..2bdb58b Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class new file mode 100644 index 0000000..5e432e9 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class new file mode 100644 index 0000000..4596834 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class new file mode 100644 index 0000000..362fa05 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class new file mode 100644 index 0000000..8523228 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class new file mode 100644 index 0000000..d91bc85 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class new file mode 100644 index 0000000..99c7a64 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class new file mode 100644 index 0000000..17e4d3b Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class new file mode 100644 index 0000000..7b80036 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class new file mode 100644 index 0000000..d9abeb9 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class new file mode 100644 index 0000000..39e534a Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class new file mode 100644 index 0000000..eb938cf Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class new file mode 100644 index 0000000..0937be2 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class new file mode 100644 index 0000000..a00281f Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class new file mode 100644 index 0000000..043e410 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class new file mode 100644 index 0000000..ee3fd40 Binary files /dev/null and b/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt new file mode 100644 index 0000000..5bec0cd --- /dev/null +++ b/Notes-master/app/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -0,0 +1,285 @@ +R_DEF: Internal format may change without notice +local +array format_for_exported_note +array menu_share_ways +color primary_text_dark +color secondary_text_dark +color user_query_highlight +dimen text_font_size_large +dimen text_font_size_medium +dimen text_font_size_normal +dimen text_font_size_small +dimen text_font_size_super +drawable bg_btn_set_color +drawable bg_color_btn_mask +drawable call_record +drawable clock +drawable delete +drawable dropdown_icon +drawable edit_blue +drawable edit_green +drawable edit_red +drawable edit_title_blue +drawable edit_title_green +drawable edit_title_red +drawable edit_title_white +drawable edit_title_yellow +drawable edit_white +drawable edit_yellow +drawable font_large +drawable font_normal +drawable font_size_selector_bg +drawable font_small +drawable font_super +drawable icon_app +drawable list_background +drawable list_blue_down +drawable list_blue_middle +drawable list_blue_single +drawable list_blue_up +drawable list_folder +drawable list_footer_bg +drawable list_green_down +drawable list_green_middle +drawable list_green_single +drawable list_green_up +drawable list_red_down +drawable list_red_middle +drawable list_red_single +drawable list_red_up +drawable list_white_down +drawable list_white_middle +drawable list_white_single +drawable list_white_up +drawable list_yellow_down +drawable list_yellow_middle +drawable list_yellow_single +drawable list_yellow_up +drawable menu_delete +drawable menu_move +drawable new_note +drawable new_note_normal +drawable new_note_pressed +drawable note_edit_color_selector_panel +drawable notification +drawable search_result +drawable selected +drawable title_alert +drawable title_bar_bg +drawable widget_2x_blue +drawable widget_2x_green +drawable widget_2x_red +drawable widget_2x_white +drawable widget_2x_yellow +drawable widget_4x_blue +drawable widget_4x_green +drawable widget_4x_red +drawable widget_4x_white +drawable widget_4x_yellow +id account_dialog_subtitle +id account_dialog_title +id action_select_all +id amPm +id btn_new_note +id btn_set_bg_color +id cb_edit_item +id date +id delete +id et_edit_text +id et_foler_name +id font_size_selector +id hour +id iv_alert_icon +id iv_bg_blue +id iv_bg_blue_select +id iv_bg_green +id iv_bg_green_select +id iv_bg_red +id iv_bg_red_select +id iv_bg_white +id iv_bg_white_select +id iv_bg_yellow +id iv_bg_yellow_select +id iv_large_select +id iv_medium_select +id iv_small_select +id iv_super_select +id ll_font_large +id ll_font_normal +id ll_font_small +id ll_font_super +id menu_alert +id menu_delete +id menu_delete_remind +id menu_export_text +id menu_font_size +id menu_list_mode +id menu_new_folder +id menu_new_note +id menu_search +id menu_send_to_desktop +id menu_setting +id menu_share +id menu_sync +id minute +id move +id navigation_bar +id note_bg_color_selector +id note_edit_list +id note_edit_view +id note_item +id note_title +id notes_list +id prefenerece_sync_status_textview +id preference_sync_button +id selection_menu +id sv_note_edit +id tv_alert_date +id tv_folder_name +id tv_modified_date +id tv_name +id tv_time +id tv_title +id tv_title_bar +id widget_bg_image +id widget_text +layout account_dialog_title +layout add_account_text +layout datetime_picker +layout dialog_edit_text +layout folder_list_item +layout note_edit +layout note_edit_list_item +layout note_item +layout note_list +layout note_list_dropdown_menu +layout note_list_footer +layout settings_header +layout widget_2x +layout widget_4x +menu call_note_edit +menu call_record_folder +menu note_edit +menu note_list +menu note_list_dropdown +menu note_list_options +menu sub_folder +plurals search_results_title +raw introduction +string alert_message_delete_folder +string alert_message_delete_note +string alert_message_delete_notes +string alert_title_delete +string app_name +string app_widget2x2 +string app_widget4x4 +string button_delete +string call_record_folder_name +string datetime_dialog_cancel +string datetime_dialog_ok +string delete_remind_time_message +string error_note_empty_for_clock +string error_note_empty_for_send_to_desktop +string error_note_not_exist +string error_sdcard_export +string error_sdcard_unmounted +string error_sync_cancelled +string error_sync_internal +string error_sync_network +string failed_sdcard_export +string file_name_txt_format +string file_path +string folder_exist +string format_date_ymd +string format_datetime_mdhm +string format_exported_file_location +string format_folder_files_count +string format_move_notes_to_folder +string hint_foler_name +string info_note_enter_desktop +string menu_alert +string menu_create_folder +string menu_delete +string menu_deselect_all +string menu_export_text +string menu_folder_change_name +string menu_folder_delete +string menu_folder_view +string menu_font_large +string menu_font_normal +string menu_font_size +string menu_font_small +string menu_font_super +string menu_list_mode +string menu_move +string menu_move_parent_folder +string menu_normal_mode +string menu_remove_remind +string menu_search +string menu_select_all +string menu_select_none +string menu_select_title +string menu_send_to_desktop +string menu_setting +string menu_share +string menu_sync +string menu_sync_cancel +string menu_title_select_folder +string note_alert_expired +string note_link_email +string note_link_other +string note_link_tel +string note_link_web +string notealert_enter +string notealert_ok +string notelist_menu_new +string notelist_string_info +string preferences_account_summary +string preferences_account_title +string preferences_add_account +string preferences_bg_random_appear_title +string preferences_button_sync_cancel +string preferences_button_sync_immediately +string preferences_dialog_change_account_title +string preferences_dialog_change_account_warn_msg +string preferences_dialog_select_account_tips +string preferences_dialog_select_account_title +string preferences_last_sync_time +string preferences_last_sync_time_format +string preferences_menu_cancel +string preferences_menu_change_account +string preferences_menu_remove_account +string preferences_title +string preferences_toast_cannot_change_account +string preferences_toast_success_set_accout +string search +string search_hint +string search_label +string search_setting_description +string set_remind_time_message +string success_sdcard_export +string success_sync_account +string sync_progress_init_list +string sync_progress_login +string sync_progress_syncing +string ticker_cancel +string ticker_fail +string ticker_success +string ticker_syncing +string widget_havenot_content +string widget_under_visit_mode +style HighlightTextAppearancePrimary +style HighlightTextAppearanceSecondary +style NoteActionBarStyle +style NoteTheme +style TextAppearanceLarge +style TextAppearanceMedium +style TextAppearanceNormal +style TextAppearancePrimaryItem +style TextAppearanceSecondaryItem +style TextAppearanceSuper +style TextAppearanceUnderMenuIcon +xml preferences +xml searchable +xml widget_2x_info +xml widget_4x_info diff --git a/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt new file mode 100644 index 0000000..c685fd4 --- /dev/null +++ b/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -0,0 +1,274 @@ +1 +2 +17 +21 +22 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:25:5-44 +23 android:minSdkVersion="14" +23-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:25:15-41 +24 android:targetSdkVersion="29" /> +24-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:25:5-44 +25 +26 +26-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:27:5-81 +26-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:27:22-78 +27 +27-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:28:5-88 +27-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:28:22-85 +28 +28-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:29:5-67 +28-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:29:22-64 +29 +29-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:30:5-72 +29-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:30:22-69 +30 +30-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:31:5-74 +30-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:31:22-71 +31 +31-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:32:5-80 +31-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:32:22-77 +32 +32-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:33:5-71 +32-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:33:22-68 +33 +33-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:34:5-74 +33-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:34:22-71 +34 +34-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:35:5-81 +34-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:35:22-78 +35 +36 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:37:5-154:19 +37 android:debuggable="true" +38 android:icon="@drawable/icon_app" +38-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:38:9-42 +39 android:label="@string/app_name" +39-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:39:9-41 +40 android:testOnly="true" > +41 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:40:9-53:20 +42 android:name="net.micode.notes.ui.NotesListActivity" +42-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:41:13-49 +43 android:configChanges="keyboardHidden|orientation|screenSize" +43-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:42:13-74 +44 android:label="@string/app_name" +44-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:43:13-45 +45 android:launchMode="singleTop" +45-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:44:13-43 +46 android:theme="@style/NoteTheme" +46-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:45:13-45 +47 android:uiOptions="splitActionBarWhenNarrow" +47-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:46:13-57 +48 android:windowSoftInputMode="adjustPan" > +48-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:47:13-52 +49 +49-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:49:13-52:29 +50 +50-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:50:17-69 +50-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:50:25-66 +51 +52 +52-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:51:17-77 +52-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:51:27-74 +53 +54 +55 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:55:9-84:20 +56 android:name="net.micode.notes.ui.NoteEditActivity" +56-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:56:13-48 +57 android:configChanges="keyboardHidden|orientation|screenSize" +57-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:57:13-74 +58 android:launchMode="singleTop" +58-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:58:13-43 +59 android:theme="@style/NoteTheme" > +59-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:59:13-45 +60 +60-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:61:13-67:29 +60-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:61:28-49 +61 +61-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:63:17-69 +61-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:63:25-66 +62 +63 +63-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:17-76 +63-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:27-73 +64 +65 +65-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:17-78 +65-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:23-75 +66 +66-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:17-78 +66-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:23-75 +67 +68 +68-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:69:13-74:29 +69 +69-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:70:17-79 +69-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:70:25-76 +70 +71 +71-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:17-76 +71-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:27-73 +72 +73 +73-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:17-78 +73-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:23-75 +74 +74-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:17-78 +74-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:65:23-75 +75 +76 +76-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:76:13-79:29 +77 +77-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:77:17-71 +77-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:77:25-68 +78 +79 +79-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:17-76 +79-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:64:27-73 +80 +81 +82 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:81:13-83:54 +83 android:name="android.app.searchable" +83-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:82:17-54 +84 android:resource="@xml/searchable" /> +84-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:83:17-51 +85 +86 +87 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:86:9-89:43 +88 android:name="net.micode.notes.data.NotesProvider" +88-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:87:13-63 +89 android:authorities="micode_notes" +89-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:88:13-47 +90 android:multiprocess="true" /> +90-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:89:13-40 +91 +92 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:91:9-103:20 +93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +93-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:92:13-57 +94 android:label="@string/app_widget2x2" > +94-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:93:13-50 +95 +95-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:94:13-98:29 +96 +96-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-84 +96-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:25-81 +97 +97-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:17-85 +97-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:25-82 +98 +98-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:17-85 +98-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:25-82 +99 +100 +101 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:100:13-102:58 +102 android:name="android.appwidget.provider" +102-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:101:17-58 +103 android:resource="@xml/widget_2x_info" /> +103-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:102:17-55 +104 +105 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:104:9-117:20 +106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +106-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:105:13-57 +107 android:label="@string/app_widget4x4" > +107-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:106:13-50 +108 +108-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:94:13-98:29 +109 +109-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:17-84 +109-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:95:25-81 +110 +110-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:17-85 +110-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:96:25-82 +111 +111-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:17-85 +111-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:97:25-82 +112 +113 +114 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:100:13-102:58 +115 android:name="android.appwidget.provider" +115-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:101:17-58 +116 android:resource="@xml/widget_4x_info" /> +116-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:102:17-55 +117 +118 +118-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:119:9-123:20 +118-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:119:19-55 +119 +119-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:120:13-122:29 +120 +120-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:121:17-79 +120-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:121:25-76 +121 +122 +123 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:125:9-128:20 +124 android:name="net.micode.notes.ui.AlarmReceiver" +124-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:126:13-61 +125 android:process=":remote" > +125-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:127:13-38 +126 +127 +128 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:130:9-136:20 +129 android:name="net.micode.notes.ui.AlarmAlertActivity" +129-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:131:13-50 +130 android:label="@string/app_name" +130-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:132:13-45 +131 android:launchMode="singleInstance" +131-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:133:13-48 +132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +132-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:134:13-75 +133 +134 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:139:9-144:20 +135 android:name="net.micode.notes.ui.NotesPreferenceActivity" +135-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:140:13-71 +136 android:label="@string/preferences_title" +136-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:141:13-54 +137 android:launchMode="singleTop" +137-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:142:13-43 +138 android:theme="@android:style/Theme.Holo.Light" > +138-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:143:13-60 +139 +140 +141 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:146:9-149:19 +142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +142-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:147:13-74 +143 android:exported="false" > +143-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:148:13-37 +144 +145 +146 /Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:151:9-153:52 +147 android:name="android.app.default_searchable" +147-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:152:13-58 +148 android:value=".ui.NoteEditActivity" /> +148-->/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/AndroidManifest.xml:153:13-49 +149 +150 +151 diff --git a/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar b/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar new file mode 100644 index 0000000..15cb0ec Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_java_res/debug/base.jar differ diff --git a/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml new file mode 100644 index 0000000..ad07480 --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..ad07480 --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json b/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..a56d03a --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "MERGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat new file mode 100644 index 0000000..e5df6da Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat new file mode 100644 index 0000000..8cc05db Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat new file mode 100644 index 0000000..2eda191 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat new file mode 100644 index 0000000..59c2358 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat new file mode 100644 index 0000000..89fb25d Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat new file mode 100644 index 0000000..40e03de Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat new file mode 100644 index 0000000..809ce24 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat new file mode 100644 index 0000000..f80e058 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat new file mode 100644 index 0000000..be22aa0 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat new file mode 100644 index 0000000..2a07d4f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat new file mode 100644 index 0000000..b71467d Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat new file mode 100644 index 0000000..9cf62b3 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat new file mode 100644 index 0000000..f77ea7d Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat new file mode 100644 index 0000000..4b9e264 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat new file mode 100644 index 0000000..cbb044c Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat new file mode 100644 index 0000000..14d4feb Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat new file mode 100644 index 0000000..9226aa6 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat new file mode 100644 index 0000000..d49f07e Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat new file mode 100644 index 0000000..b33f03f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat new file mode 100644 index 0000000..d631a65 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat new file mode 100644 index 0000000..0400aeb Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat new file mode 100644 index 0000000..f6a97f6 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat new file mode 100644 index 0000000..28656cb Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat new file mode 100644 index 0000000..ca8a144 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat new file mode 100644 index 0000000..2a028e8 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat new file mode 100644 index 0000000..ca41f40 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat new file mode 100644 index 0000000..7302f30 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat new file mode 100644 index 0000000..02a4f77 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat new file mode 100644 index 0000000..4382694 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat new file mode 100644 index 0000000..b4e71dc Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat new file mode 100644 index 0000000..b230b8f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat new file mode 100644 index 0000000..633e0e7 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat new file mode 100644 index 0000000..d432a14 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat new file mode 100644 index 0000000..5a72f21 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat new file mode 100644 index 0000000..3e628af Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat new file mode 100644 index 0000000..a4b4193 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat new file mode 100644 index 0000000..7ae0f98 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat new file mode 100644 index 0000000..6cbb18b Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat new file mode 100644 index 0000000..a4a6692 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat new file mode 100644 index 0000000..9623c13 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat new file mode 100644 index 0000000..404ea2c Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat new file mode 100644 index 0000000..4bb304b Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat new file mode 100644 index 0000000..449a2d8 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat new file mode 100644 index 0000000..74c5445 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat new file mode 100644 index 0000000..99bbe37 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat new file mode 100644 index 0000000..cfab562 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat new file mode 100644 index 0000000..afdf9b0 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat new file mode 100644 index 0000000..a53a14d Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat new file mode 100644 index 0000000..d0312eb Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat new file mode 100644 index 0000000..01ef2da Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat new file mode 100644 index 0000000..ca5c107 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat new file mode 100644 index 0000000..23eb0dc Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat new file mode 100644 index 0000000..a138233 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat new file mode 100644 index 0000000..3b4516a Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat new file mode 100644 index 0000000..465926e Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat new file mode 100644 index 0000000..ed8e6a9 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat new file mode 100644 index 0000000..fb37689 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat new file mode 100644 index 0000000..adfba04 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat new file mode 100644 index 0000000..8b13b97 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat new file mode 100644 index 0000000..896fb83 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat new file mode 100644 index 0000000..2c0cce3 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat new file mode 100644 index 0000000..973eb75 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat new file mode 100644 index 0000000..c521cf6 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat new file mode 100644 index 0000000..dd55472 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat new file mode 100644 index 0000000..2912b97 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat new file mode 100644 index 0000000..90b6f06 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat new file mode 100644 index 0000000..6556925 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat new file mode 100644 index 0000000..eec4deb Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat new file mode 100644 index 0000000..1bbe3ab Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat new file mode 100644 index 0000000..305e7a6 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat new file mode 100644 index 0000000..61742b5 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat new file mode 100644 index 0000000..78701a1 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat new file mode 100644 index 0000000..7b3fb68 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat new file mode 100644 index 0000000..6c97e3d Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat new file mode 100644 index 0000000..006b151 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat new file mode 100644 index 0000000..1c3342f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat new file mode 100644 index 0000000..8f48256 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat new file mode 100644 index 0000000..749f04b Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat new file mode 100644 index 0000000..98f56f4 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat new file mode 100644 index 0000000..9caf2e6 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat new file mode 100644 index 0000000..a74989a Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat new file mode 100644 index 0000000..94470b7 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat new file mode 100644 index 0000000..7b10945 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat new file mode 100644 index 0000000..5cbb9e9 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat new file mode 100644 index 0000000..c025a60 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat new file mode 100644 index 0000000..4316da7 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat new file mode 100644 index 0000000..7d74a65 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat new file mode 100644 index 0000000..9210c15 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat new file mode 100644 index 0000000..ad66757 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat new file mode 100644 index 0000000..68b46ae Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat b/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat new file mode 100644 index 0000000..02a9e4e Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/raw_introduction.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat new file mode 100644 index 0000000..4e7bd33 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat new file mode 100644 index 0000000..0e5932b Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat new file mode 100644 index 0000000..40e69d2 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat new file mode 100644 index 0000000..752f47f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat new file mode 100644 index 0000000..625e86f Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat new file mode 100644 index 0000000..ad294be Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat new file mode 100644 index 0000000..4d8a2a5 Binary files /dev/null and b/Notes-master/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat differ diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json new file mode 100644 index 0000000..bd5910e --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -0,0 +1,186 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json new file mode 100644 index 0000000..29f6ed5 --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rCN/strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json new file mode 100644 index 0000000..65db860 --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -0,0 +1,47 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values-zh-rTW/strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json new file mode 100644 index 0000000..5d0083c --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -0,0 +1,100 @@ +{ + "logs": [ + { + "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", + "map": [ + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "712", + "endColumns": "56", + "endOffsets": "764" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "/Users/mac/AndroidStudioProjects/Notes-master/app/src/main/res/values/styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json new file mode 100644 index 0000000..2603807 --- /dev/null +++ b/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -0,0 +1,382 @@ +[ + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/searchable.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-6:/xml/preferences.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", + "source": "net.micode.notes.app-main-6:/raw/introduction" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/settings_header.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-6:/drawable/new_note.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml" + } +] \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json b/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/Notes-master/app/build/intermediates/navigation_json/debug/navigation.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml new file mode 100644 index 0000000..ad07480 --- /dev/null +++ b/Notes-master/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json new file mode 100644 index 0000000..eea66e3 --- /dev/null +++ b/Notes-master/app/build/intermediates/packaged_manifests/debug/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "PACKAGED_MANIFESTS", + "kind": "Directory" + }, + "applicationId": "net.micode.notes", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 1, + "versionName": "0.1", + "outputFile": "AndroidManifest.xml" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/Notes-master/res/color/primary_text_dark.xml b/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml similarity index 94% rename from Notes-master/res/color/primary_text_dark.xml rename to Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml index 7c85459..8ad98e3 100644 --- a/Notes-master/res/color/primary_text_dark.xml +++ b/Notes-master/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml @@ -1,4 +1,4 @@ - + + @@ -56,7 +58,8 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" > - + @@ -129,8 +132,10 @@ android:label="@string/app_name" android:launchMode="singleInstance" android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > + + { private static int GTASK_SYNC_NOTIFICATION_ID = 5234235; @@ -57,52 +65,60 @@ public class GTaskASyncTask extends AsyncTask { mTaskManager.cancelSync(); } - public void publishProgess(String message) { + public void publishProgess(String message) {// 发布进度单位，系统将会调用onProgressUpdate()方法更新这些值 + publishProgress(new String[] { message }); } private void showNotification(int tickerId, String content) { - Notification notification = new Notification(R.drawable.notification, mContext - .getString(tickerId), System.currentTimeMillis()); - notification.defaults = Notification.DEFAULT_LIGHTS; - notification.flags = Notification.FLAG_AUTO_CANCEL; + PendingIntent pendingIntent; if (tickerId != R.string.ticker_success) { + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesPreferenceActivity.class), 0); } else { + pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } - notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, - pendingIntent); + + + Notification.Builder builder = new Notification.Builder(mContext) + .setAutoCancel(true) + .setContentTitle(mContext.getString(R.string.app_name)) + .setContentText(content) + .setContentIntent(pendingIntent) + .setWhen(System.currentTimeMillis()) + .setOngoing(true); + Notification notification=builder.getNotification(); mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); } @Override protected Integer doInBackground(Void... unused) { publishProgess(mContext.getString(R.string.sync_progress_login, NotesPreferenceActivity - .getSyncAccountName(mContext))); - return mTaskManager.sync(mContext, this); + .getSyncAccountName(mContext))); //利用getString,将把 NotesPreferenceActivity.getSyncAccountName(mContext))的字符串内容传进sync_progress_login中 + return mTaskManager.sync(mContext, this); //进行后台同步具体操作 } @Override protected void onProgressUpdate(String... progress) { showNotification(R.string.ticker_syncing, progress[0]); - if (mContext instanceof GTaskSyncService) { + if (mContext instanceof GTaskSyncService) { //instanceof 判断mContext是否是GTaskSyncService的实例 ((GTaskSyncService) mContext).sendBroadcast(progress[0]); } } @Override - protected void onPostExecute(Integer result) { + protected void onPostExecute(Integer result) { //用于在执行完后台任务后更新UI,显示结果 if (result == GTaskManager.STATE_SUCCESS) { showNotification(R.string.ticker_success, mContext.getString( R.string.success_sync_account, mTaskManager.getSyncAccount())); - NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); + NotesPreferenceActivity.setLastSyncTime(mContext, System.currentTimeMillis()); //设置最新同步的时间 } else if (result == GTaskManager.STATE_NETWORK_ERROR) { showNotification(R.string.ticker_fail, mContext.getString(R.string.error_sync_network)); } else if (result == GTaskManager.STATE_INTERNAL_ERROR) { @@ -110,11 +126,11 @@ public class GTaskASyncTask extends AsyncTask { } else if (result == GTaskManager.STATE_SYNC_CANCELLED) { showNotification(R.string.ticker_cancel, mContext .getString(R.string.error_sync_cancelled)); - } + } //几种不同情况下的结果显示 if (mOnCompleteListener != null) { - new Thread(new Runnable() { + new Thread(new Runnable() { //这里好像是方法内的一个线程，但是并不太懂什么意思 - public void run() { + public void run() { //完成后的操作，使用onComplete()将所有值都重新初始化，相当于完成一次操作 mOnCompleteListener.onComplete(); } }).start(); diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 75% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index c67dfdf..93291fd 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskClient.java +++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -61,10 +61,14 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; +/* + * 主要功能：实现GTASK的登录操作，进行GTASK任务的创建，创建任务列表，从网络上获取任务和任务列表的内容 + * 主要使用类或技术：accountManager JSONObject HttpParams authToken Gid + */ public class GTaskClient { private static final String TAG = GTaskClient.class.getSimpleName(); - private static final String GTASK_URL = "https://mail.google.com/tasks/"; + private static final String GTASK_URL = "https://mail.google.com/tasks/";//这个是指定的URL private static final String GTASK_GET_URL = "https://mail.google.com/tasks/ig"; @@ -102,6 +106,10 @@ public class GTaskClient { mUpdateArray = null; } + /*用来获取的实例化对象 + * 使用 getInstance() + * 返回mInstance这个实例化对象 + */ public static synchronized GTaskClient getInstance() { if (mInstance == null) { mInstance = new GTaskClient(); @@ -109,42 +117,49 @@ public class GTaskClient { return mInstance; } + /*用来实现登录操作的函数，传入的参数是一个Activity + * 设置登录操作限制时间，如果超时则需要重新登录 + * 有两种登录方式，使用用户自己的URL登录或者使用谷歌官方的URL登录 + * 返回true或者false，即最后是否登陆成功 + */ public boolean login(Activity activity) { // we suppose that the cookie would expire after 5 minutes // then we need to re-login + //判断距离最后一次登录操作是否超过5分钟 final long interval = 1000 * 60 * 5; if (mLastLoginTime + interval < System.currentTimeMillis()) { mLoggedin = false; } - // need to re-login after account switch + // need to re-login after account switch 重新登录操作 if (mLoggedin && !TextUtils.equals(getSyncAccount().name, NotesPreferenceActivity .getSyncAccountName(activity))) { mLoggedin = false; } - + //如果没有超过时间，则不需要重新登录 if (mLoggedin) { Log.d(TAG, "already logged in"); return true; } - mLastLoginTime = System.currentTimeMillis(); - String authToken = loginGoogleAccount(activity, false); + mLastLoginTime = System.currentTimeMillis();//更新最后登录时间，改为系统当前时间 + String authToken = loginGoogleAccount(activity, false);//判断是否登录到谷歌账户 if (authToken == null) { Log.e(TAG, "login google account failed"); return false; } // login with custom domain if necessary - if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase() + //尝试使用用户自己的域名登录 + if (!(mAccount.name.toLowerCase().endsWith("gmail.com") || mAccount.name.toLowerCase()//将用户账号名改为统一格式（小写）后判断是否为谷歌账号地址 .endsWith("googlemail.com"))) { StringBuilder url = new StringBuilder(GTASK_URL).append("a/"); int index = mAccount.name.indexOf('@') + 1; String suffix = mAccount.name.substring(index); url.append(suffix + "/"); - mGetUrl = url.toString() + "ig"; - mPostUrl = url.toString() + "r/ig"; + mGetUrl = url.toString() + "ig";//设置用户对应的getUrl + mPostUrl = url.toString() + "r/ig";//设置用户对应的postUrl if (tryToLoginGtask(activity, authToken)) { mLoggedin = true; @@ -152,6 +167,7 @@ public class GTaskClient { } // try to login with google official url + //如果用户账户无法登录，则使用谷歌官方的URI进行登录 if (!mLoggedin) { mGetUrl = GTASK_GET_URL; mPostUrl = GTASK_POST_URL; @@ -164,10 +180,15 @@ public class GTaskClient { return true; } + /*具体实现登录谷歌账户的方法 + * 使用令牌机制 + * 使用AccountManager来管理注册账号 + * 返回值是账号的令牌 + */ private String loginGoogleAccount(Activity activity, boolean invalidateToken) { - String authToken; - AccountManager accountManager = AccountManager.get(activity); - Account[] accounts = accountManager.getAccountsByType("com.google"); + String authToken;//令牌，是登录操作保证安全性的一个方法 + AccountManager accountManager = AccountManager.get(activity);//AccountManager这个类给用户提供了集中注册账号的接口 + Account[] accounts = accountManager.getAccountsByType("com.google");//获取全部以com.google结尾的account if (accounts.length == 0) { Log.e(TAG, "there is no available google account"); @@ -176,6 +197,7 @@ public class GTaskClient { String accountName = NotesPreferenceActivity.getSyncAccountName(activity); Account account = null; + //遍历获得的accounts信息，寻找已经记录过的账户信息 for (Account a : accounts) { if (a.name.equals(accountName)) { account = a; @@ -190,11 +212,13 @@ public class GTaskClient { } // get the token now + //获取选中账号的令牌 AccountManagerFuture accountManagerFuture = accountManager.getAuthToken(account, "goanna_mobile", null, activity, null, null); try { Bundle authTokenBundle = accountManagerFuture.getResult(); authToken = authTokenBundle.getString(AccountManager.KEY_AUTHTOKEN); + //如果是invalidateToken，那么需要调用invalidateAuthToken(String, String)方法废除这个无效token if (invalidateToken) { accountManager.invalidateAuthToken("com.google", authToken); loginGoogleAccount(activity, false); @@ -206,11 +230,12 @@ public class GTaskClient { return authToken; } - + //尝试登陆Gtask，这只是一个预先判断令牌是否是有效以及是否能登上GTask的方法,而不是具体实现登陆的方法 private boolean tryToLoginGtask(Activity activity, String authToken) { if (!loginGtask(authToken)) { // maybe the auth token is out of date, now let's invalidate the // token and try again + //删除过一个无效的authToken，申请一个新的后再次尝试登陆 authToken = loginGoogleAccount(activity, true); if (authToken == null) { Log.e(TAG, "login google account failed"); @@ -225,25 +250,27 @@ public class GTaskClient { return true; } + //实现登录GTask的具体操作 private boolean loginGtask(String authToken) { int timeoutConnection = 10000; - int timeoutSocket = 15000; - HttpParams httpParameters = new BasicHttpParams(); - HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection); - HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket); + int timeoutSocket = 15000; //socket是一种通信连接实现数据的交换的端口 + HttpParams httpParameters = new BasicHttpParams(); //实例化一个新的HTTP参数类 + HttpConnectionParams.setConnectionTimeout(httpParameters, timeoutConnection);//设置连接超时时间 + HttpConnectionParams.setSoTimeout(httpParameters, timeoutSocket);//设置设置端口超时时间 mHttpClient = new DefaultHttpClient(httpParameters); - BasicCookieStore localBasicCookieStore = new BasicCookieStore(); + BasicCookieStore localBasicCookieStore = new BasicCookieStore(); //设置本地cookie mHttpClient.setCookieStore(localBasicCookieStore); HttpProtocolParams.setUseExpectContinue(mHttpClient.getParams(), false); // login gtask try { - String loginUrl = mGetUrl + "?auth=" + authToken; - HttpGet httpGet = new HttpGet(loginUrl); + String loginUrl = mGetUrl + "?auth=" + authToken; //设置登录的url + HttpGet httpGet = new HttpGet(loginUrl); //通过登录的uri实例化网页上资源的查找 HttpResponse response = null; response = mHttpClient.execute(httpGet); // get the cookie now + //获取CookieStore里存放的cookie,看如果存有“GTL(不知道什么意思)”，则说明有验证成功的有效的cookie List cookies = mHttpClient.getCookieStore().getCookies(); boolean hasAuthCookie = false; for (Cookie cookie : cookies) { @@ -256,6 +283,7 @@ public class GTaskClient { } // get the client version + //获取client的内容，具体操作是在返回的Content中截取从_setup(开始到)}中间的字符串内容，也就是gtask_url的内容 String resString = getResponseContent(response.getEntity()); String jsBegin = "_setup("; String jsEnd = ")}"; @@ -284,6 +312,10 @@ public class GTaskClient { return mActionId++; } + /*实例化创建一个用于向网络传输数据的对象 + * 使用HttpPost类 + * 返回一个httpPost实例化对象，但里面还没有内容 + */ private HttpPost createHttpPost() { HttpPost httpPost = new HttpPost(mPostUrl); httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); @@ -291,24 +323,28 @@ public class GTaskClient { return httpPost; } + /*通过URL获取响应后返回的数据，也就是网络上的数据和资源 + * 使用getContentEncoding()获取网络上的资源和数据 + * 返回值就是获取到的资源 + */ private String getResponseContent(HttpEntity entity) throws IOException { String contentEncoding = null; - if (entity.getContentEncoding() != null) { + if (entity.getContentEncoding() != null) {//通过URL得到HttpEntity对象，如果不为空则使用getContent（）方法创建一个流将数据从网络都过来 contentEncoding = entity.getContentEncoding().getValue(); Log.d(TAG, "encoding: " + contentEncoding); } InputStream input = entity.getContent(); - if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) { + if (contentEncoding != null && contentEncoding.equalsIgnoreCase("gzip")) {//GZIP是使用DEFLATE进行压缩数据的另一个压缩库 input = new GZIPInputStream(entity.getContent()); - } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) { + } else if (contentEncoding != null && contentEncoding.equalsIgnoreCase("deflate")) {//DEFLATE是一个无专利的压缩算法，它可以实现无损数据压缩 Inflater inflater = new Inflater(true); input = new InflaterInputStream(entity.getContent(), inflater); } try { InputStreamReader isr = new InputStreamReader(input); - BufferedReader br = new BufferedReader(isr); + BufferedReader br = new BufferedReader(isr);//是一个包装类，它可以包装字符流，将字符流放入缓存里，先把字符读到缓存里，到缓存满了时候，再读入内存，是为了提供读的效率而设计的 StringBuilder sb = new StringBuilder(); while (true) { @@ -323,20 +359,28 @@ public class GTaskClient { } } + /*通过JSON发送请求 + * 请求的具体内容在json的实例化对象js中然后传入 + * 利用UrlEncodedFormEntity entity和httpPost.setEntity(entity)方法把js中的内容放置到httpPost中 + * 执行请求后使用getResponseContent方法得到返回的数据和资源 + * 将资源再次放入json后返回 + */ private JSONObject postRequest(JSONObject js) throws NetworkFailureException { - if (!mLoggedin) { + if (!mLoggedin) {//未登录 Log.e(TAG, "please login first"); throw new ActionFailureException("not logged in"); } + //实例化一个httpPost的对象用来向服务器传输数据，在这里就是发送请求，而请求的内容在js里 HttpPost httpPost = createHttpPost(); try { LinkedList list = new LinkedList(); list.add(new BasicNameValuePair("r", js.toString())); - UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); + UrlEncodedFormEntity entity = new UrlEncodedFormEntity(list, "UTF-8"); //UrlEncodedFormEntity()的形式比较单一，是普通的键值对 httpPost.setEntity(entity); // execute the post + //执行这个请求 HttpResponse response = mHttpClient.execute(httpPost); String jsString = getResponseContent(response.getEntity()); return new JSONObject(jsString); @@ -360,6 +404,12 @@ public class GTaskClient { } } + /*创建单个任务 + * 传入参数是一个.gtask.data.Task包里Task类的对象 + * 利用json获取Task里的内容,并且创建相应的jsPost + * 利用postRequest得到任务的返回信息 + * 使用task.setGid设置task的new_ID + */ public void createTask(Task task) throws NetworkFailureException { commitUpdate(); try { @@ -386,6 +436,9 @@ public class GTaskClient { } } + /* + * 创建一个任务列表，与createTask几乎一样，区别就是最后设置的是tasklist的gid + */ public void createTaskList(TaskList tasklist) throws NetworkFailureException { commitUpdate(); try { @@ -412,6 +465,11 @@ public class GTaskClient { } } + /* + * 同步更新操作 + * 使用JSONObject进行数据存储，使用jsPost.put，Put的信息包括UpdateArray和ClientVersion + * 使用postRequest发送这个jspost,进行处理 + */ public void commitUpdate() throws NetworkFailureException { if (mUpdateArray != null) { try { @@ -433,6 +491,10 @@ public class GTaskClient { } } + /* + * 添加更新的事项 + * 调用commitUpdate()实现 + */ public void addUpdateNode(Node node) throws NetworkFailureException { if (node != null) { // too many update items may result in an error @@ -447,6 +509,12 @@ public class GTaskClient { } } + /* + * 移动task,比如讲task移动到不同的task列表中去 + * 通过getGid获取task所属列表的gid + * 通过JSONObject.put(String name, Object value)函数设置移动后的task的相关属性值，从而达到移动的目的 + * 最后还是通过postRequest进行更新后的发送 + */ public void moveTask(Task task, TaskList preParent, TaskList curParent) throws NetworkFailureException { commitUpdate(); @@ -463,15 +531,17 @@ public class GTaskClient { if (preParent == curParent && task.getPriorSibling() != null) { // put prioring_sibing_id only if moving within the tasklist and // it is not the first one + //设置优先级ID，只有当移动是发生在文件中 action.put(GTaskStringUtils.GTASK_JSON_PRIOR_SIBLING_ID, task.getPriorSibling()); } - action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); - action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); + action.put(GTaskStringUtils.GTASK_JSON_SOURCE_LIST, preParent.getGid()); //设置移动前所属列表 + action.put(GTaskStringUtils.GTASK_JSON_DEST_PARENT, curParent.getGid()); //设置当前所属列表 if (preParent != curParent) { // put the dest_list only if moving between tasklists action.put(GTaskStringUtils.GTASK_JSON_DEST_LIST, curParent.getGid()); } actionList.put(action); + //最后将ACTION_LIST加入到jsPost中 jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); // client_version @@ -486,6 +556,11 @@ public class GTaskClient { } } + /* + * 删除操作节点 + * 还是利用JSON + * 删除过后使用postRequest发送删除后的结果 + */ public void deleteNode(Node node) throws NetworkFailureException { commitUpdate(); try { @@ -494,7 +569,7 @@ public class GTaskClient { // action_list node.setDeleted(true); - actionList.put(node.getUpdateAction(getActionId())); + actionList.put(node.getUpdateAction(getActionId())); //这里会获取到删除操作的ID，加入到actionLiast中 jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); // client_version @@ -509,6 +584,11 @@ public class GTaskClient { } } + /* + * 获取任务列表 + * 首先通过GetURI使用getResponseContent从网上获取数据 + * 然后筛选出"_setup("到)}的部分，并且从中获取GTASK_JSON_LISTS的内容返回 + */ public JSONArray getTaskLists() throws NetworkFailureException { if (!mLoggedin) { Log.e(TAG, "please login first"); @@ -521,6 +601,7 @@ public class GTaskClient { response = mHttpClient.execute(httpGet); // get the task list + //筛选工作，把筛选出的字符串放入jsString String resString = getResponseContent(response.getEntity()); String jsBegin = "_setup("; String jsEnd = ")}"; @@ -531,6 +612,7 @@ public class GTaskClient { jsString = resString.substring(begin + jsBegin.length(), end); } JSONObject js = new JSONObject(jsString); + //获取GTASK_JSON_LISTS return js.getJSONObject("t").getJSONArray(GTaskStringUtils.GTASK_JSON_LISTS); } catch (ClientProtocolException e) { Log.e(TAG, e.toString()); @@ -547,6 +629,9 @@ public class GTaskClient { } } + /* + * 通过传入的TASKList的gid,从网络上获取相应属于这个任务列表的任务 + */ public JSONArray getTaskList(String listGid) throws NetworkFailureException { commitUpdate(); try { @@ -558,7 +643,7 @@ public class GTaskClient { action.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_GETALL); action.put(GTaskStringUtils.GTASK_JSON_ACTION_ID, getActionId()); - action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); + action.put(GTaskStringUtils.GTASK_JSON_LIST_ID, listGid); //这里设置为传入的listGid action.put(GTaskStringUtils.GTASK_JSON_GET_DELETED, false); actionList.put(action); jsPost.put(GTaskStringUtils.GTASK_JSON_ACTION_LIST, actionList); @@ -579,7 +664,8 @@ public class GTaskClient { return mAccount; } + //重置更新的内容 public void resetUpdateArray() { mUpdateArray = null; } -} +} \ No newline at end of file diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 76% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java index d2b4082..4f8c491 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskManager.java +++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java @@ -50,70 +50,72 @@ import java.util.Map; public class GTaskManager { private static final String TAG = GTaskManager.class.getSimpleName(); - public static final int STATE_SUCCESS = 0; - public static final int STATE_NETWORK_ERROR = 1; - public static final int STATE_INTERNAL_ERROR = 2; - public static final int STATE_SYNC_IN_PROGRESS = 3; - public static final int STATE_SYNC_CANCELLED = 4; - private static GTaskManager mInstance = null; private Activity mActivity; - private Context mContext; - private ContentResolver mContentResolver; - private boolean mSyncing; - private boolean mCancelled; - private HashMap mGTaskListHashMap; - private HashMap mGTaskHashMap; - private HashMap mMetaHashMap; - private TaskList mMetaList; - private HashSet mLocalDeleteIdMap; - private HashMap mGidToNid; - private HashMap mNidToGid; - private GTaskManager() { - mSyncing = false; - mCancelled = false; - mGTaskListHashMap = new HashMap(); + private GTaskManager() { //对象初始化函数 + mSyncing = false; //正在同步,flase代表未执行 + mCancelled = false; //全局标识，flase代表可以执行 + mGTaskListHashMap = new HashMap(); //<>代表Java的泛型,就是创建一个用类型作为参数的类。 mGTaskHashMap = new HashMap(); mMetaHashMap = new HashMap(); mMetaList = null; mLocalDeleteIdMap = new HashSet(); - mGidToNid = new HashMap(); - mNidToGid = new HashMap(); + mGidToNid = new HashMap(); //GoogleID to NodeID?? + mNidToGid = new HashMap(); //NodeID to GoogleID???通过hashmap散列表建立映射 } - public static synchronized GTaskManager getInstance() { + /** + * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。 + * 功能：类初始化函数 + * @author TTS + * @return GtaskManger + */ + public static synchronized GTaskManager getInstance() { //可能运行在多线程环境下，使用语言级同步--synchronized if (mInstance == null) { mInstance = new GTaskManager(); } return mInstance; } + /** + * 包含关键字synchronized，语言级同步，指明该函数可能运行在多线程的环境下。 + * @author TTS + * @param activity + */ public synchronized void setActivityContext(Activity activity) { - // used for getting authtoken + // used for getting auth token mActivity = activity; } - public int sync(Context context, GTaskASyncTask asyncTask) { + /** + * 核心函数 + * 功能：实现了本地同步操作和远端同步操作 + * @author TTS + * @param context-----获取上下文 + * @param asyncTask-------用于同步的异步操作类 + * @return int + */ + public int sync(Context context, GTaskASyncTask asyncTask) { //核心函数 if (mSyncing) { - Log.d(TAG, "Sync is in progress"); + Log.d(TAG, "Sync is in progress"); //创建日志文件（调试信息），debug return STATE_SYNC_IN_PROGRESS; } mContext = context; @@ -128,8 +130,8 @@ public class GTaskManager { mNidToGid.clear(); try { - GTaskClient client = GTaskClient.getInstance(); - client.resetUpdateArray(); + GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例,client--客户机 + client.resetUpdateArray(); //JSONArray类型，reset即置为NULL // login google task if (!mCancelled) { @@ -140,15 +142,15 @@ public class GTaskManager { // get the task list from google asyncTask.publishProgess(mContext.getString(R.string.sync_progress_init_list)); - initGTaskList(); + initGTaskList(); //获取Google上的JSONtasklist转为本地TaskList // do content sync work asyncTask.publishProgess(mContext.getString(R.string.sync_progress_syncing)); syncContent(); - } catch (NetworkFailureException e) { - Log.e(TAG, e.toString()); + } catch (NetworkFailureException e) { //分为两种异常，此类异常为网络异常 + Log.e(TAG, e.toString()); //创建日志文件（调试信息），error return STATE_NETWORK_ERROR; - } catch (ActionFailureException e) { + } catch (ActionFailureException e) { //此类异常为操作异常 Log.e(TAG, e.toString()); return STATE_INTERNAL_ERROR; } catch (Exception e) { @@ -168,32 +170,41 @@ public class GTaskManager { return mCancelled ? STATE_SYNC_CANCELLED : STATE_SUCCESS; } + /** + *功能：初始化GtaskList，获取Google上的JSONtasklist转为本地TaskList。 + *获得的数据存储在mMetaList，mGTaskListHashMap，mGTaskHashMap + *@author TTS + *@exception NetworkFailureException + *@return void + */ private void initGTaskList() throws NetworkFailureException { if (mCancelled) return; - GTaskClient client = GTaskClient.getInstance(); + GTaskClient client = GTaskClient.getInstance(); //getInstance即为创建一个实例，client应指远端客户机 try { - JSONArray jsTaskLists = client.getTaskLists(); + //Json对象是Name Value对(即子元素)的无序集合，相当于一个Map对象。JsonObject类是bantouyan-json库对Json对象的抽象，提供操纵Json对象的各种方法。 + //其格式为{"key1":value1,"key2",value2....};key 必须是字符串。 + //因为ajax请求不刷新页面，但配合js可以实现局部刷新，因此json常常被用来作为异步请求的返回对象使用。 + JSONArray jsTaskLists = client.getTaskLists(); //原注释为get task list------lists？？？ // init meta list first - mMetaList = null; + mMetaList = null; //TaskList类型 for (int i = 0; i < jsTaskLists.length(); i++) { - JSONObject object = jsTaskLists.getJSONObject(i); + JSONObject object = jsTaskLists.getJSONObject(i); //JSONObject与JSONArray一个为对象，一个为数组。此处取出单个JASONObject String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); - if (name - .equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) { - mMetaList = new TaskList(); - mMetaList.setContentByRemoteJSON(object); + if (name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_META)) { + mMetaList = new TaskList(); //MetaList意为元表,Tasklist类型，此处为初始化 + mMetaList.setContentByRemoteJSON(object); //将JSON中部分数据复制到自己定义的对象中相对应的数据：name->mname... // load meta data - JSONArray jsMetas = client.getTaskList(gid); + JSONArray jsMetas = client.getTaskList(gid); //原注释为get action_list------list？？？ for (int j = 0; j < jsMetas.length(); j++) { object = (JSONObject) jsMetas.getJSONObject(j); - MetaData metaData = new MetaData(); + MetaData metaData = new MetaData(); //继承自Node metaData.setContentByRemoteJSON(object); - if (metaData.isWorthSaving()) { + if (metaData.isWorthSaving()) { //if not worth to save，metadata将不加入mMetaList mMetaList.addChildTask(metaData); if (metaData.getGid() != null) { mMetaHashMap.put(metaData.getRelatedGid(), metaData); @@ -214,16 +225,16 @@ public class GTaskManager { // init task list for (int i = 0; i < jsTaskLists.length(); i++) { JSONObject object = jsTaskLists.getJSONObject(i); - String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); + String gid = object.getString(GTaskStringUtils.GTASK_JSON_ID); //通过getString函数传入本地某个标志数据的名称，获取其在远端的名称。 String name = object.getString(GTaskStringUtils.GTASK_JSON_NAME); if (name.startsWith(GTaskStringUtils.MIUI_FOLDER_PREFFIX) && !name.equals(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_META)) { - TaskList tasklist = new TaskList(); + + GTaskStringUtils.FOLDER_META)) { + TaskList tasklist = new TaskList(); //继承自Node tasklist.setContentByRemoteJSON(object); mGTaskListHashMap.put(gid, tasklist); - mGTaskHashMap.put(gid, tasklist); + mGTaskHashMap.put(gid, tasklist); //为什么加两遍？？？ // load tasks JSONArray jsTasks = client.getTaskList(gid); @@ -247,13 +258,18 @@ public class GTaskManager { } } - private void syncContent() throws NetworkFailureException { + /** + * 功能：本地内容同步操作 + * @throws NetworkFailureException + * @return 无返回值 + */ + private void syncContent() throws NetworkFailureException { //本地内容同步操作 int syncType; - Cursor c = null; - String gid; - Node node; + Cursor c = null; //数据库指针 + String gid; //GoogleID?? + Node node; //Node包含Sync_Action的不同类型 - mLocalDeleteIdMap.clear(); + mLocalDeleteIdMap.clear(); //HashSet类型 if (mCancelled) { return; @@ -301,8 +317,8 @@ public class GTaskManager { node = mGTaskHashMap.get(gid); if (node != null) { mGTaskHashMap.remove(gid); - mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); - mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); + mGidToNid.put(gid, c.getLong(SqlNote.ID_COLUMN)); //通过hashmap建立联系 + mNidToGid.put(c.getLong(SqlNote.ID_COLUMN), gid); //通过hashmap建立联系 syncType = node.getSyncAction(c); } else { if (c.getString(SqlNote.GTASK_ID_COLUMN).trim().length() == 0) { @@ -327,14 +343,14 @@ public class GTaskManager { } // go through remaining items - Iterator> iter = mGTaskHashMap.entrySet().iterator(); + Iterator> iter = mGTaskHashMap.entrySet().iterator(); //Iterator迭代器 while (iter.hasNext()) { Map.Entry entry = iter.next(); node = entry.getValue(); doContentSync(Node.SYNC_ACTION_ADD_LOCAL, node, null); } - // mCancelled can be set by another thread, so we neet to check one by + // mCancelled can be set by another thread, so we neet to check one by //thread----线程 // one // clear local delete table if (!mCancelled) { @@ -351,6 +367,11 @@ public class GTaskManager { } + /** + * 功能： + * @author TTS + * @throws NetworkFailureException + */ private void syncFolder() throws NetworkFailureException { Cursor c = null; String gid; @@ -394,7 +415,7 @@ public class GTaskManager { try { c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(_id=?)", new String[] { - String.valueOf(Notes.ID_CALL_RECORD_FOLDER) + String.valueOf(Notes.ID_CALL_RECORD_FOLDER) }, null); if (c != null) { if (c.moveToNext()) { @@ -476,6 +497,14 @@ public class GTaskManager { GTaskClient.getInstance().commitUpdate(); } + /** + * 功能：syncType分类，addLocalNode，addRemoteNode，deleteNode，updateLocalNode，updateRemoteNode + * @author TTS + * @param syncType + * @param node + * @param c + * @throws NetworkFailureException + */ private void doContentSync(int syncType, Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -522,6 +551,12 @@ public class GTaskManager { } } + /** + * 功能：本地增加Node + * @author TTS + * @param node + * @throws NetworkFailureException + */ private void addLocalNode(Node node) throws NetworkFailureException { if (mCancelled) { return; @@ -596,6 +631,15 @@ public class GTaskManager { updateRemoteMeta(node.getGid(), sqlNote); } + /** + * 功能：update本地node + * @author TTS + * @param node + * ----同步操作的基础数据类型 + * @param c + * ----Cursor + * @throws NetworkFailureException + */ private void updateLocalNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -619,12 +663,22 @@ public class GTaskManager { updateRemoteMeta(node.getGid(), sqlNote); } + /** + * 功能：远程增加Node + * 需要updateRemoteMeta + * @author TTS + * @param node + * ----同步操作的基础数据类型 + * @param c + * --Cursor + * @throws NetworkFailureException + */ private void addRemoteNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; } - SqlNote sqlNote = new SqlNote(mContext, c); + SqlNote sqlNote = new SqlNote(mContext, c); //从本地mContext中获取内容 Node n; // update remotely @@ -634,11 +688,12 @@ public class GTaskManager { String parentGid = mNidToGid.get(sqlNote.getParentId()); if (parentGid == null) { - Log.e(TAG, "cannot find task's parent tasklist"); + Log.e(TAG, "cannot find task's parent tasklist"); //调试信息 throw new ActionFailureException("cannot add remote task"); } - mGTaskListHashMap.get(parentGid).addChildTask(task); + mGTaskListHashMap.get(parentGid).addChildTask(task); //在本地生成的GTaskList中增加子结点 + //登录远程服务器，创建Task GTaskClient.getInstance().createTask(task); n = (Node) task; @@ -656,6 +711,7 @@ public class GTaskManager { else folderName += sqlNote.getSnippet(); + //iterator迭代器，通过统一的接口迭代所有的map元素 Iterator> iter = mGTaskListHashMap.entrySet().iterator(); while (iter.hasNext()) { Map.Entry entry = iter.next(); @@ -687,11 +743,20 @@ public class GTaskManager { sqlNote.resetLocalModified(); sqlNote.commit(true); - // gid-id mapping + // gid-id mapping //创建id间的映射 mGidToNid.put(n.getGid(), sqlNote.getId()); mNidToGid.put(sqlNote.getId(), n.getGid()); } + /** + * 功能：更新远端的Node，包含meta更新(updateRemoteMeta) + * @author TTS + * @param node + * ----同步操作的基础数据类型 + * @param c + * --Cursor + * @throws NetworkFailureException + */ private void updateRemoteNode(Node node, Cursor c) throws NetworkFailureException { if (mCancelled) { return; @@ -701,7 +766,7 @@ public class GTaskManager { // update remotely node.setContentByLocalJSON(sqlNote.getContent()); - GTaskClient.getInstance().addUpdateNode(node); + GTaskClient.getInstance().addUpdateNode(node); //GTaskClient用途为从本地登陆远端服务器 // update meta updateRemoteMeta(node.getGid(), sqlNote); @@ -710,15 +775,19 @@ public class GTaskManager { if (sqlNote.isNoteType()) { Task task = (Task) node; TaskList preParentList = task.getParent(); + //preParentList为通过node获取的父节点列表 String curParentGid = mNidToGid.get(sqlNote.getParentId()); + //curParentGid为通过光标在数据库中找到sqlNote的mParentId，再通过mNidToGid由long类型转为String类型的Gid + if (curParentGid == null) { Log.e(TAG, "cannot find task's parent tasklist"); throw new ActionFailureException("cannot update remote task"); } TaskList curParentList = mGTaskListHashMap.get(curParentGid); + //通过HashMap找到对应Gid的TaskList - if (preParentList != curParentList) { + if (preParentList != curParentList) { //????????????? preParentList.removeChildTask(task); curParentList.addChildTask(task); GTaskClient.getInstance().moveTask(task, preParentList, curParentList); @@ -727,9 +796,19 @@ public class GTaskManager { // clear local modified flag sqlNote.resetLocalModified(); + //commit到本地数据库 sqlNote.commit(true); } + /** + * 功能：升级远程meta。 meta---元数据----计算机文件系统管理数据---管理数据的数据。 + * @author TTS + * @param gid + * ---GoogleID为String类型 + * @param sqlNote + * ---同步前的数据库操作，故使用类SqlNote + * @throws NetworkFailureException + */ private void updateRemoteMeta(String gid, SqlNote sqlNote) throws NetworkFailureException { if (sqlNote != null && sqlNote.isNoteType()) { MetaData metaData = mMetaHashMap.get(gid); @@ -746,12 +825,18 @@ public class GTaskManager { } } + /** + * 功能：刷新本地，给sync的ID对应上最后更改过的对象 + * @author TTS + * @return void + * @throws NetworkFailureException + */ private void refreshLocalSyncId() throws NetworkFailureException { if (mCancelled) { return; } - // get the latest gtask list + // get the latest gtask list //获取最近的（最晚的）gtask list mGTaskHashMap.clear(); mGTaskListHashMap.clear(); mMetaHashMap.clear(); @@ -762,16 +847,16 @@ public class GTaskManager { c = mContentResolver.query(Notes.CONTENT_NOTE_URI, SqlNote.PROJECTION_NOTE, "(type<>? AND parent_id<>?)", new String[] { String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER) - }, NoteColumns.TYPE + " DESC"); + }, NoteColumns.TYPE + " DESC"); //query语句：五个参数，NoteColumns.TYPE + " DESC"-----为按类型递减顺序返回查询结果。new String[] {String.valueOf(Notes.TYPE_SYSTEM), String.valueOf(Notes.ID_TRASH_FOLER)}------为选择参数。"(type<>? AND parent_id<>?)"-------指明返回行过滤器。SqlNote.PROJECTION_NOTE--------应返回的数据列的名字。Notes.CONTENT_NOTE_URI--------contentProvider包含所有数据集所对应的uri if (c != null) { while (c.moveToNext()) { String gid = c.getString(SqlNote.GTASK_ID_COLUMN); Node node = mGTaskHashMap.get(gid); if (node != null) { mGTaskHashMap.remove(gid); - ContentValues values = new ContentValues(); + ContentValues values = new ContentValues(); //在ContentValues中创建键值对。准备通过contentResolver写入数据 values.put(NoteColumns.SYNC_ID, node.getLastModified()); - mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, + mContentResolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, //进行批量更改，选择参数为NULL，应该可以用insert替换，参数分别为表名和需要更新的value对象。 c.getLong(SqlNote.ID_COLUMN)), values, null, null); } else { Log.e(TAG, "something is missed"); @@ -790,11 +875,20 @@ public class GTaskManager { } } + /** + * 功能：获取同步账号,mAccount.name + * @author TTS + * @return String + */ public String getSyncAccount() { return GTaskClient.getInstance().getSyncAccount().name; } + /** + * 功能：取消同步，置mCancelled为true + * @author TTS + */ public void cancelSync() { mCancelled = true; } -} +} \ No newline at end of file diff --git a/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 69% rename from Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java rename to Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java index cca36f7..950b06e 100644 --- a/Notes-master/src/net/micode/notes/gtask/remote/GTaskSyncService.java +++ b/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java @@ -23,6 +23,22 @@ import android.content.Intent; import android.os.Bundle; import android.os.IBinder; +/* + * Service是在一段不定的时间运行在后台，不和用户交互的应用组件 + * 主要方法： + * private void startSync() 启动一个同步工作 + * private void cancelSync() 取消同步 + * public void onCreate() + * public int onStartCommand(Intent intent, int flags, int startId) service生命周期的组成部分，相当于重启service（比如在被暂停之后），而不是创建一个新的service + * public void onLowMemory() 在没有内存的情况下如果存在service则结束掉这的service + * public IBinder onBind() + * public void sendBroadcast(String msg) 发送同步的相关通知 + * public static void startSync(Activity activity) + * public static void cancelSync(Context context) + * public static boolean isSyncing() 判读是否在进行同步 + * public static String getProgressString() 获取当前进度的信息 + */ + public class GTaskSyncService extends Service { public final static String ACTION_STRING_NAME = "sync_action_type"; @@ -42,6 +58,7 @@ public class GTaskSyncService extends Service { private static String mSyncProgress = ""; + //开始一个同步的工作 private void startSync() { if (mSyncTask == null) { mSyncTask = new GTaskASyncTask(this, new GTaskASyncTask.OnCompleteListener() { @@ -52,10 +69,11 @@ public class GTaskSyncService extends Service { } }); sendBroadcast(""); - mSyncTask.execute(); + mSyncTask.execute(); //这个函数让任务是以单线程队列方式或线程池队列方式运行 } } + private void cancelSync() { if (mSyncTask != null) { mSyncTask.cancelSync(); @@ -63,7 +81,7 @@ public class GTaskSyncService extends Service { } @Override - public void onCreate() { + public void onCreate() { //初始化一个service mSyncTask = null; } @@ -72,6 +90,7 @@ public class GTaskSyncService extends Service { Bundle bundle = intent.getExtras(); if (bundle != null && bundle.containsKey(ACTION_STRING_NAME)) { switch (bundle.getInt(ACTION_STRING_NAME, ACTION_INVALID)) { + //两种情况，开始同步或者取消同步 case ACTION_START_SYNC: startSync(); break; @@ -81,7 +100,7 @@ public class GTaskSyncService extends Service { default: break; } - return START_STICKY; + return START_STICKY; //等待新的intent来是这个service继续运行 } return super.onStartCommand(intent, flags, startId); } @@ -93,26 +112,26 @@ public class GTaskSyncService extends Service { } } - public IBinder onBind(Intent intent) { + public IBinder onBind(Intent intent) { //不知道干吗用的 return null; } public void sendBroadcast(String msg) { mSyncProgress = msg; - Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); - intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); + Intent intent = new Intent(GTASK_SERVICE_BROADCAST_NAME); //创建一个新的Intent + intent.putExtra(GTASK_SERVICE_BROADCAST_IS_SYNCING, mSyncTask != null); //附加INTENT中的相应参数的值 intent.putExtra(GTASK_SERVICE_BROADCAST_PROGRESS_MSG, msg); - sendBroadcast(intent); + sendBroadcast(intent); //发送这个通知 } - public static void startSync(Activity activity) { + public static void startSync(Activity activity) {//执行一个service，service的内容里的同步动作就是开始同步 GTaskManager.getInstance().setActivityContext(activity); Intent intent = new Intent(activity, GTaskSyncService.class); intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_START_SYNC); activity.startService(intent); } - public static void cancelSync(Context context) { + public static void cancelSync(Context context) {//执行一个service，service的内容里的同步动作就是取消同步 Intent intent = new Intent(context, GTaskSyncService.class); intent.putExtra(GTaskSyncService.ACTION_STRING_NAME, GTaskSyncService.ACTION_CANCEL_SYNC); context.startService(intent); @@ -125,4 +144,4 @@ public class GTaskSyncService extends Service { public static String getProgressString() { return mSyncProgress; } -} +} \ No newline at end of file diff --git a/Notes-master/src/net/micode/notes/model/Note.java b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java similarity index 81% rename from Notes-master/src/net/micode/notes/model/Note.java rename to Notes-master/app/src/main/java/net/micode/notes/model/Note.java index 6706cf6..62b73cd 100644 --- a/Notes-master/src/net/micode/notes/model/Note.java +++ b/Notes-master/app/src/main/java/net/micode/notes/model/Note.java @@ -15,15 +15,15 @@ */ package net.micode.notes.model; -import android.content.ContentProviderOperation; -import android.content.ContentProviderResult; -import android.content.ContentUris; -import android.content.ContentValues; -import android.content.Context; -import android.content.OperationApplicationException; -import android.net.Uri; -import android.os.RemoteException; -import android.util.Log; +import android.content.ContentProviderOperation;//批量的更新、插入、删除数据。 +import android.content.ContentProviderResult;//操作的结果 +import android.content.ContentUris;//用于添加和获取Uri后面的ID +import android.content.ContentValues;//一种用来存储基本数据类型数据的存储机制 +import android.content.Context;//需要用该类来弄清楚调用者的实例 +import android.content.OperationApplicationException;//操作应用程序容错 +import android.net.Uri;//表示待操作的数据 +import android.os.RemoteException;//远程容错 +import android.util.Log;//输出日志，比如说出错、警告等 import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.CallNote; @@ -49,16 +49,17 @@ public class Note { values.put(NoteColumns.MODIFIED_DATE, createdTime); values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.PARENT_ID, folderId);//将数据写入数据库表格 Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - + //ContentResolver()主要是实现外部应用对ContentProvider中的数据 + //进行添加、删除、修改和查询操作 long noteId = 0; try { noteId = Long.valueOf(uri.getPathSegments().get(1)); } catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); noteId = 0; - } + }//try-catch异常处理 if (noteId == -1) { throw new IllegalStateException("Wrong note id:" + noteId); } @@ -68,37 +69,37 @@ public class Note { public Note() { mNoteDiffValues = new ContentValues(); mNoteData = new NoteData(); - } + }//定义两个变量来存储标签的数据，一个是存储标签的属性，一个是存储标签的内容 public void setNoteValue(String key, String value) { mNoteDiffValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } + }//设置数据库表格的标签属性数据 public void setTextData(String key, String value) { mNoteData.setTextData(key, value); - } + }//设置数据库表格的标签文字内容的数据 public void setTextDataId(long id) { mNoteData.setTextDataId(id); - } + }//设置文本数据的ID public long getTextDataId() { return mNoteData.mTextDataId; - } + }//得到数据文本的ID public void setCallDataId(long id) { mNoteData.setCallDataId(id); - } + }//设置电话号码数据的ID public void setCallData(String key, String value) { mNoteData.setCallData(key, value); - } + }//得到电话号码数据的ID public boolean isLocalModified() { return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); - } + }//判断是否是本地修改 public boolean syncNote(Context context, long noteId) { if (noteId <= 0) { @@ -128,19 +129,19 @@ public class Note { } return true; - } + }//判断数据是否同步 - private class NoteData { + private class NoteData {//定义一个基本的便签内容的数据类，主要包含文本数据和电话号码数据 private long mTextDataId; - private ContentValues mTextDataValues; + private ContentValues mTextDataValues;//文本数据 private long mCallDataId; - private ContentValues mCallDataValues; + private ContentValues mCallDataValues;//电话号码数据 private static final String TAG = "NoteData"; - + //下面是上述几个函数的具体实现 public NoteData() { mTextDataValues = new ContentValues(); mCallDataValues = new ContentValues(); @@ -177,17 +178,17 @@ public class Note { mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); } - + //下面函数的作用是将新的数据通过Uri的操作存储到数据库 Uri pushIntoContentResolver(Context context, long noteId) { /** * Check for safety */ if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); - } + }//判断数据是否合法 ArrayList operationList = new ArrayList(); - ContentProviderOperation.Builder builder = null; + ContentProviderOperation.Builder builder = null;//数据库的操作列表 if(mTextDataValues.size() > 0) { mTextDataValues.put(DataColumns.NOTE_ID, noteId); @@ -209,7 +210,7 @@ public class Note { operationList.add(builder.build()); } mTextDataValues.clear(); - } + }//把文本数据存入DataColumns if(mCallDataValues.size() > 0) { mCallDataValues.put(DataColumns.NOTE_ID, noteId); @@ -231,7 +232,7 @@ public class Note { operationList.add(builder.build()); } mCallDataValues.clear(); - } + }//把电话号码数据存入DataColumns if (operationList.size() > 0) { try { @@ -246,7 +247,7 @@ public class Note { Log.e(TAG, String.format("%s: %s", e.toString(), e.getMessage())); return null; } - } + }//存储过程中的异常处理 return null; } } diff --git a/Notes-master/src/net/micode/notes/model/WorkingNote.java b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 80% rename from Notes-master/src/net/micode/notes/model/WorkingNote.java rename to Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..e625572 100644 --- a/Notes-master/src/net/micode/notes/model/WorkingNote.java +++ b/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -31,7 +31,6 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.TextNote; import net.micode.notes.tool.ResourceParser.NoteBgResources; - public class WorkingNote { // Note for the working note private Note mNote; @@ -43,17 +42,11 @@ public class WorkingNote { private int mMode; private long mAlertDate; - private long mModifiedDate; - private int mBgColorId; - private int mWidgetId; - private int mWidgetType; - private long mFolderId; - private Context mContext; private static final String TAG = "WorkingNote"; @@ -62,6 +55,7 @@ public class WorkingNote { private NoteSettingChangedListener mNoteSettingStatusListener; + // 声明 DATA_PROJECTION字符串数组 public static final String[] DATA_PROJECTION = new String[] { DataColumns.ID, DataColumns.CONTENT, @@ -72,6 +66,7 @@ public class WorkingNote { DataColumns.DATA4, }; + // 声明 NOTE_PROJECTION字符串数组 public static final String[] NOTE_PROJECTION = new String[] { NoteColumns.PARENT_ID, NoteColumns.ALERTED_DATE, @@ -82,27 +77,18 @@ public class WorkingNote { }; private static final int DATA_ID_COLUMN = 0; - private static final int DATA_CONTENT_COLUMN = 1; - private static final int DATA_MIME_TYPE_COLUMN = 2; - private static final int DATA_MODE_COLUMN = 3; - private static final int NOTE_PARENT_ID_COLUMN = 0; - private static final int NOTE_ALERTED_DATE_COLUMN = 1; - private static final int NOTE_BG_COLOR_ID_COLUMN = 2; - private static final int NOTE_WIDGET_ID_COLUMN = 3; - private static final int NOTE_WIDGET_TYPE_COLUMN = 4; - private static final int NOTE_MODIFIED_DATE_COLUMN = 5; // New note construct - private WorkingNote(Context context, long folderId) { + public WorkingNote(Context context, long folderId) { mContext = context; mAlertDate = 0; mModifiedDate = System.currentTimeMillis(); @@ -114,6 +100,7 @@ public class WorkingNote { mWidgetType = Notes.TYPE_WIDGET_INVALIDE; } + // WorkingNote的构造函数 // Existing note construct private WorkingNote(Context context, long noteId, long folderId) { mContext = context; @@ -124,11 +111,14 @@ public class WorkingNote { loadNote(); } + // 加载Note + // 通过数据库调用query函数找到第一个条目 private void loadNote() { Cursor cursor = mContext.getContentResolver().query( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mNoteId), NOTE_PROJECTION, null, null, null); + // 若存在，储存相应信息 if (cursor != null) { if (cursor.moveToFirst()) { mFolderId = cursor.getLong(NOTE_PARENT_ID_COLUMN); @@ -139,6 +129,7 @@ public class WorkingNote { mModifiedDate = cursor.getLong(NOTE_MODIFIED_DATE_COLUMN); } cursor.close(); + // 若不存在，报错 } else { Log.e(TAG, "No note with id:" + mNoteId); throw new IllegalArgumentException("Unable to find note with id " + mNoteId); @@ -146,14 +137,16 @@ public class WorkingNote { loadNoteData(); } + // 加载NoteData private void loadNoteData() { Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { - String.valueOf(mNoteId) + String.valueOf(mNoteId) }, null); if (cursor != null) { - if (cursor.moveToFirst()) { + // 查到信息不为空 + if (cursor.moveToFirst()) { // 查看第一项是否存在 do { String type = cursor.getString(DATA_MIME_TYPE_COLUMN); if (DataConstants.NOTE.equals(type)) { @@ -165,7 +158,7 @@ public class WorkingNote { } else { Log.d(TAG, "Wrong note type with type:" + type); } - } while (cursor.moveToNext()); + } while (cursor.moveToNext());//查阅所有项,直到为空 } cursor.close(); } else { @@ -174,9 +167,12 @@ public class WorkingNote { } } + // 创建空的Note + // 传参：context，文件夹id，widget，背景颜色 public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { + int widgetType, int defaultBgColorId) { WorkingNote note = new WorkingNote(context, folderId); + // 设定相关属性 note.setBgColorId(defaultBgColorId); note.setWidgetId(widgetId); note.setWidgetType(widgetType); @@ -187,9 +183,10 @@ public class WorkingNote { return new WorkingNote(context, id, 0); } + // 保存Note public synchronized boolean saveNote() { - if (isWorthSaving()) { - if (!existInDatabase()) { + if (isWorthSaving()) { //是否值得保存 + if (!existInDatabase()) { // 是否存在数据库中 if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { Log.e(TAG, "Create new note fail with id:" + mNoteId); return false; @@ -212,11 +209,14 @@ public class WorkingNote { } } + // 是否在数据库中存在 public boolean existInDatabase() { return mNoteId > 0; } + // 是否值得保存 private boolean isWorthSaving() { + // 被删除，或（不在数据库中 内容为空），或 本地已保存过 if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) || (existInDatabase() && !mNote.isLocalModified())) { return false; @@ -225,10 +225,14 @@ public class WorkingNote { } } + + // 设置mNoteSettingStatusListener public void setOnSettingStatusChangedListener(NoteSettingChangedListener l) { mNoteSettingStatusListener = l; } + // 设置AlertDate + // 若 mAlertDate与data不同，则更改mAlertDate并设定NoteValue public void setAlertDate(long date, boolean set) { if (date != mAlertDate) { mAlertDate = date; @@ -239,16 +243,20 @@ public class WorkingNote { } } + // 设定删除标记 public void markDeleted(boolean mark) { + // 设定标记 mIsDeleted = mark; if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { - mNoteSettingStatusListener.onWidgetChanged(); + mNoteSettingStatusListener.onWidgetChanged(); + // 调用mNoteSettingStatusListener的 onWidgetChanged方法 } } + // 设定背景颜色 public void setBgColorId(int id) { - if (id != mBgColorId) { + if (id != mBgColorId) { //设定条件 id != mBgColorId mBgColorId = id; if (mNoteSettingStatusListener != null) { mNoteSettingStatusListener.onBackgroundColorChanged(); @@ -257,8 +265,10 @@ public class WorkingNote { } } + // 设定检查列表模式 + // 参数：mode public void setCheckListMode(int mode) { - if (mMode != mode) { + if (mMode != mode) { //设定条件 mMode != mode if (mNoteSettingStatusListener != null) { mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); } @@ -267,81 +277,108 @@ public class WorkingNote { } } + + // 设定WidgetType + // 参数：type public void setWidgetType(int type) { - if (type != mWidgetType) { + if (type != mWidgetType) {//设定条件 type != mWidgetType mWidgetType = type; mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); + // 调用Note的setNoteValue方法更改WidgetType } } + // 设定WidgetId + // 参数：id public void setWidgetId(int id) { - if (id != mWidgetId) { + if (id != mWidgetId) {//设定条件 id != mWidgetId mWidgetId = id; mNote.setNoteValue(NoteColumns.WIDGET_ID, String.valueOf(mWidgetId)); + // 调用Note的setNoteValue方法更改WidgetId } } + // 设定WorkingTex + // 参数：更改的text public void setWorkingText(String text) { - if (!TextUtils.equals(mContent, text)) { + if (!TextUtils.equals(mContent, text)) {//设定条件 mContent, text内容不同 mContent = text; mNote.setTextData(DataColumns.CONTENT, mContent); + // 调用Note的setTextData方法更改WorkingText } } + // 转变mNote的CallData及CallNote信息 + // 参数：String phoneNumber, long callDate public void convertToCallNote(String phoneNumber, long callDate) { mNote.setCallData(CallNote.CALL_DATE, String.valueOf(callDate)); mNote.setCallData(CallNote.PHONE_NUMBER, phoneNumber); mNote.setNoteValue(NoteColumns.PARENT_ID, String.valueOf(Notes.ID_CALL_RECORD_FOLDER)); } + // 判断是否有时钟题型 public boolean hasClockAlert() { return (mAlertDate > 0 ? true : false); } + // 获取Content public String getContent() { return mContent; } + // 获取AlertDate public long getAlertDate() { return mAlertDate; } + // 获取ModifiedDate public long getModifiedDate() { return mModifiedDate; } + // 获取背景颜色来源id public int getBgColorResId() { return NoteBgResources.getNoteBgResource(mBgColorId); } + // 获取背景颜色id public int getBgColorId() { return mBgColorId; } + // 获取标题背景颜色id public int getTitleBgResId() { return NoteBgResources.getNoteTitleBgResource(mBgColorId); } + // 获取CheckListMode public int getCheckListMode() { return mMode; } + // 获取便签id public long getNoteId() { return mNoteId; } + // 获取文件夹id public long getFolderId() { return mFolderId; } + // 获取WidgetId public int getWidgetId() { return mWidgetId; } + // 获取WidgetType public int getWidgetType() { return mWidgetType; } + // 创建接口 NoteSettingChangedListener,便签更新监视 + // 为NoteEditActivity提供接口 + // 提供函数有 public interface NoteSettingChangedListener { /** * Called when the background color of current note has just changed @@ -365,4 +402,4 @@ public class WorkingNote { */ void onCheckListModeChanged(int oldMode, int newMode); } -} +} \ No newline at end of file diff --git a/Notes-master/src/net/micode/notes/tool/BackupUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/BackupUtils.java rename to Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/DataUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/DataUtils.java rename to Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java b/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/GTaskStringUtils.java rename to Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/Notes-master/src/net/micode/notes/tool/ResourceParser.java b/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from Notes-master/src/net/micode/notes/tool/ResourceParser.java rename to Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmAlertActivity.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmInitReceiver.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/AlarmReceiver.java b/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/AlarmReceiver.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePicker.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePicker.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java diff --git a/Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DateTimePickerDialog.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/Notes-master/src/net/micode/notes/ui/DropdownMenu.java b/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/DropdownMenu.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java b/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/FoldersListAdapter.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 94% rename from Notes-master/src/net/micode/notes/ui/NoteEditActivity.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 96a9ff8..13b6f67 100644 --- a/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java +++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -430,7 +430,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -507,49 +507,41 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_note: - createNewNote(); - break; - case R.id.menu_delete: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.menu_font_size: - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - break; - case R.id.menu_list_mode: - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - break; - case R.id.menu_send_to_desktop: - sendToDesktop(); - break; - case R.id.menu_alert: - setReminder(); - break; - case R.id.menu_delete_remind: - mWorkingNote.setAlertDate(0, false); - break; - default: - break; + if(item.getItemId()==R.id.menu_new_note) + createNewNote(); + else if(item.getItemId()==R.id.menu_delete) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_note)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + deleteCurrentNote(); + finish(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + } + else if(item.getItemId()==R.id.menu_font_size) { + mFontSizeSelector.setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + } + else if(item.getItemId()==R.id.menu_list_mode) { + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + } + else if(item.getItemId()==R.id.menu_share) { + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); } + else if(item.getItemId()==R.id.menu_send_to_desktop) + sendToDesktop(); + else if(item.getItemId()==R.id.menu_alert) + setReminder(); + else if(item.getItemId()==R.id.menu_delete_remind) + mWorkingNote.setAlertDate(0, false); return true; } diff --git a/Notes-master/src/net/micode/notes/ui/NoteEditText.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteEditText.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/Notes-master/src/net/micode/notes/ui/NoteItemData.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NoteItemData.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 94% rename from Notes-master/src/net/micode/notes/ui/NotesListActivity.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index e843aec..8d9d2aa 100644 --- a/Notes-master/src/net/micode/notes/ui/NotesListActivity.java +++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -93,7 +93,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private enum ListEditState { NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER - }; + } private ListEditState mState; @@ -121,7 +121,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String TAG = "NotesListActivity"; - public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; + //public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; private NoteItemData mFocusNoteDataItem; @@ -141,7 +141,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt setContentView(R.layout.note_list); initResources(); - /** + /* * Insert an introduction when user firstly use this application */ setAppInfoFromRawRes(); @@ -319,29 +319,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - switch (item.getItemId()) { - case R.id.delete: - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - break; - case R.id.move: - startQueryDestinationFolders(); - break; - default: - return false; + if(item.getItemId()==R.id.delete) { + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + batchDelete(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); } + else if(R.id.move==item.getItemId()) { + startQueryDestinationFolders(); + } + else + return false; return true; } } @@ -558,13 +556,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } public void onClick(View v) { - switch (v.getId()) { - case R.id.btn_new_note: - createNewNote(); - break; - default: - break; - } + if (R.id.btn_new_note==v.getId()) + createNewNote(); } private void showSoftInput() { @@ -780,16 +773,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.menu_new_folder: { + if(item.getItemId()==R.id.menu_new_folder){ showCreateOrModifyFolderDialog(true); - break; } - case R.id.menu_export_text: { + else if(item.getItemId()==R.id.menu_export_text) { exportNoteToText(); - break; } - case R.id.menu_sync: { + else if(item.getItemId()==R.id.menu_sync){ if (isSyncMode()) { if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { GTaskSyncService.startSync(this); @@ -799,22 +789,15 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } else { startPreferenceActivity(); } - break; } - case R.id.menu_setting: { + else if(item.getItemId()==R.id.menu_setting){ startPreferenceActivity(); - break; } - case R.id.menu_new_note: { + else if(item.getItemId()==R.id.menu_new_note){ createNewNote(); - break; } - case R.id.menu_search: + else if(item.getItemId()==R.id.menu_search) onSearchRequested(); - break; - default: - break; - } return true; } diff --git a/Notes-master/src/net/micode/notes/ui/NotesListAdapter.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListAdapter.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesListItem.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from Notes-master/src/net/micode/notes/ui/NotesListItem.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 99% rename from Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java rename to Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java index 07c5f7e..139d8d4 100644 --- a/Notes-master/src/net/micode/notes/ui/NotesPreferenceActivity.java +++ b/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java @@ -18,7 +18,7 @@ package net.micode.notes.ui; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActionBar; +//import android.app.ActionBar; import android.app.AlertDialog; import android.content.BroadcastReceiver; import android.content.ContentValues; @@ -35,7 +35,7 @@ import android.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; -import android.view.Menu; +//import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider.java rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java b/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from Notes-master/src/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/Notes-master/app/src/main/res/.DS_Store b/Notes-master/app/src/main/res/.DS_Store new file mode 100644 index 0000000..96fe2db Binary files /dev/null and b/Notes-master/app/src/main/res/.DS_Store differ diff --git a/Notes-master/app/src/main/res/color/primary_text_dark.xml b/Notes-master/app/src/main/res/color/primary_text_dark.xml new file mode 100644 index 0000000..8ad98e3 --- /dev/null +++ b/Notes-master/app/src/main/res/color/primary_text_dark.xml @@ -0,0 +1,22 @@ + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/color/secondary_text_dark.xml b/Notes-master/app/src/main/res/color/secondary_text_dark.xml new file mode 100644 index 0000000..9cf8a1a --- /dev/null +++ b/Notes-master/app/src/main/res/color/secondary_text_dark.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png b/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png new file mode 100644 index 0000000..5eb5d44 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png b/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png new file mode 100644 index 0000000..100db77 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/call_record.png b/Notes-master/app/src/main/res/drawable-hdpi/call_record.png new file mode 100644 index 0000000..fb88ca4 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/call_record.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/clock.png b/Notes-master/app/src/main/res/drawable-hdpi/clock.png new file mode 100644 index 0000000..5f2ae9a Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/clock.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/delete.png b/Notes-master/app/src/main/res/drawable-hdpi/delete.png new file mode 100644 index 0000000..643de3e Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/delete.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png b/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png new file mode 100644 index 0000000..5525025 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png new file mode 100644 index 0000000..55a1856 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png new file mode 100644 index 0000000..2cb2d60 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png new file mode 100644 index 0000000..bae944a Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png new file mode 100644 index 0000000..96e6092 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png new file mode 100644 index 0000000..08d8644 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png new file mode 100644 index 0000000..9c430e5 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png new file mode 100644 index 0000000..19e8d95 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png new file mode 100644 index 0000000..bf8f580 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png new file mode 100644 index 0000000..918f7a6 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png b/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png new file mode 100644 index 0000000..10cb642 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/font_large.png b/Notes-master/app/src/main/res/drawable-hdpi/font_large.png new file mode 100644 index 0000000..78cf2e6 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/font_large.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png b/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png new file mode 100644 index 0000000..9de7ced Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png new file mode 100644 index 0000000..be8e64c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/font_small.png b/Notes-master/app/src/main/res/drawable-hdpi/font_small.png new file mode 100644 index 0000000..d3ff104 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/font_small.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/font_super.png b/Notes-master/app/src/main/res/drawable-hdpi/font_super.png new file mode 100644 index 0000000..85b13a1 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/font_super.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png b/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png new file mode 100644 index 0000000..418aadc Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_background.png b/Notes-master/app/src/main/res/drawable-hdpi/list_background.png new file mode 100644 index 0000000..087e1f9 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_background.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png new file mode 100644 index 0000000..b88eebf Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png new file mode 100644 index 0000000..96b1c8b Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png new file mode 100644 index 0000000..d7e7206 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png new file mode 100644 index 0000000..632e88c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png new file mode 100644 index 0000000..829f61b Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png new file mode 100644 index 0000000..5325c25 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png new file mode 100644 index 0000000..64a39d9 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png new file mode 100644 index 0000000..897325a Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png new file mode 100644 index 0000000..c83405f Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png new file mode 100644 index 0000000..141f9e1 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png new file mode 100644 index 0000000..4224309 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png new file mode 100644 index 0000000..9988f17 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png new file mode 100644 index 0000000..587c348 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png new file mode 100644 index 0000000..46b4757 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png new file mode 100644 index 0000000..29f9d8c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png new file mode 100644 index 0000000..77a4ab4 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png new file mode 100644 index 0000000..3e79189 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png new file mode 100644 index 0000000..e23cd5c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png new file mode 100644 index 0000000..31cfc1e Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png new file mode 100644 index 0000000..b6549b2 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png new file mode 100644 index 0000000..3faf507 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_single.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png new file mode 100644 index 0000000..4ae791c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_up.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png b/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png new file mode 100644 index 0000000..ccdfc4b Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/menu_delete.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png b/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png new file mode 100644 index 0000000..1140b71 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/menu_move.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png b/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png new file mode 100644 index 0000000..e24e0d1 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/new_note_normal.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png b/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png new file mode 100644 index 0000000..c748936 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/new_note_pressed.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png b/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png new file mode 100644 index 0000000..fc49552 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/notification.png b/Notes-master/app/src/main/res/drawable-hdpi/notification.png new file mode 100644 index 0000000..b13ab4a Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/notification.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/search_result.png b/Notes-master/app/src/main/res/drawable-hdpi/search_result.png new file mode 100644 index 0000000..ff2befd Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/search_result.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/selected.png b/Notes-master/app/src/main/res/drawable-hdpi/selected.png new file mode 100644 index 0000000..b889bef Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/selected.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png b/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png new file mode 100644 index 0000000..544ee9c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/title_alert.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png b/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png new file mode 100644 index 0000000..eb6bff0 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/title_bar_bg.9.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png new file mode 100644 index 0000000..a1707f4 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_blue.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png new file mode 100644 index 0000000..f86886c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_green.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png new file mode 100644 index 0000000..0e66c29 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_red.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png new file mode 100644 index 0000000..5f0619a Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_white.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png new file mode 100644 index 0000000..12d1c2b Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_2x_yellow.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png new file mode 100644 index 0000000..9183738 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_blue.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png new file mode 100644 index 0000000..fa8b452 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_green.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png new file mode 100644 index 0000000..62de074 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_red.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png new file mode 100644 index 0000000..a37d67c Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_white.png differ diff --git a/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png new file mode 100644 index 0000000..d7c5fa4 Binary files /dev/null and b/Notes-master/app/src/main/res/drawable-hdpi/widget_4x_yellow.png differ diff --git a/Notes-master/app/src/main/res/drawable/new_note.xml b/Notes-master/app/src/main/res/drawable/new_note.xml new file mode 100644 index 0000000..2154ebc --- /dev/null +++ b/Notes-master/app/src/main/res/drawable/new_note.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/Notes-master/app/src/main/res/layout/account_dialog_title.xml b/Notes-master/app/src/main/res/layout/account_dialog_title.xml new file mode 100644 index 0000000..7717112 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/account_dialog_title.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/layout/add_account_text.xml b/Notes-master/app/src/main/res/layout/add_account_text.xml new file mode 100644 index 0000000..c799178 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/add_account_text.xml @@ -0,0 +1,32 @@ + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/layout/datetime_picker.xml b/Notes-master/app/src/main/res/layout/datetime_picker.xml new file mode 100644 index 0000000..f10d592 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/datetime_picker.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/layout/dialog_edit_text.xml b/Notes-master/app/src/main/res/layout/dialog_edit_text.xml new file mode 100644 index 0000000..361b39a --- /dev/null +++ b/Notes-master/app/src/main/res/layout/dialog_edit_text.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/layout/folder_list_item.xml b/Notes-master/app/src/main/res/layout/folder_list_item.xml new file mode 100644 index 0000000..77e8148 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/folder_list_item.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/Notes-master/app/src/main/res/layout/note_edit.xml b/Notes-master/app/src/main/res/layout/note_edit.xml new file mode 100644 index 0000000..10b2aa7 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/note_edit.xml @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Notes-master/app/src/main/res/layout/note_edit_list_item.xml b/Notes-master/app/src/main/res/layout/note_edit_list_item.xml new file mode 100644 index 0000000..a885f9c --- /dev/null +++ b/Notes-master/app/src/main/res/layout/note_edit_list_item.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/Notes-master/app/src/main/res/layout/note_item.xml b/Notes-master/app/src/main/res/layout/note_item.xml new file mode 100644 index 0000000..d541f6a --- /dev/null +++ b/Notes-master/app/src/main/res/layout/note_item.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Notes-master/app/src/main/res/layout/note_list.xml b/Notes-master/app/src/main/res/layout/note_list.xml new file mode 100644 index 0000000..6b25d38 --- /dev/null +++ b/Notes-master/app/src/main/res/layout/note_list.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + +