diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7df8dff..0000000 --- a/.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/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock index c090fb4..92ceae8 100644 Binary files a/.gradle/8.0/checksums/checksums.lock and b/.gradle/8.0/checksums/checksums.lock differ diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin index 6baaa6f..01a874e 100644 Binary files a/.gradle/8.0/checksums/md5-checksums.bin and b/.gradle/8.0/checksums/md5-checksums.bin differ diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin index 48b8171..2a873fe 100644 Binary files a/.gradle/8.0/checksums/sha1-checksums.bin and b/.gradle/8.0/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock index 007624e..3329914 100644 Binary files a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock and b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin index e9d804d..a8cb902 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and b/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.0/executionHistory/executionHistory.bin.LOCAL.bin b/.gradle/8.0/executionHistory/executionHistory.bin.LOCAL.bin deleted file mode 100644 index 2aaf24b..0000000 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin.LOCAL.bin and /dev/null differ diff --git a/.gradle/8.0/executionHistory/executionHistory.bin.REMOTE.bin b/.gradle/8.0/executionHistory/executionHistory.bin.REMOTE.bin deleted file mode 100644 index b949e6e..0000000 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin.REMOTE.bin and /dev/null differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index f2fe3bb..1ebb908 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and b/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index 2ab8368..dcf5fd2 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index a4a61ae..310f51a 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index 7f92757..df24b06 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d431e29..4910526 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index 2e9473b..edcfe79 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Nov 06 16:29:40 CST 2023 +#Tue Nov 07 10:47:33 CST 2023 gradle.version=8.0 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 8c47272..c6776ec 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index be09094..0407cdd 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 22fd288..0ad17cb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + - + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/AndroidManifest.xml b/AndroidManifest.xml deleted file mode 100644 index e5c7d47..0000000 --- a/AndroidManifest.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 9a54521..0000000 --- a/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/README b/README deleted file mode 100644 index fc0d824..0000000 --- a/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/README.md b/README.md deleted file mode 100644 index 0cb64d3..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# git-test-se - diff --git a/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json b/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json deleted file mode 100644 index 9e26dfe..0000000 --- a/app/build/intermediates/annotation_processor_list/release/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk new file mode 100644 index 0000000..8fbda97 Binary files /dev/null and b/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/outputs/apk/release/output-metadata.json b/app/build/intermediates/apk/debug/output-metadata.json similarity index 79% rename from app/build/outputs/apk/release/output-metadata.json rename to app/build/intermediates/apk/debug/output-metadata.json index 2b4ecc0..b2231b9 100644 --- a/app/build/outputs/apk/release/output-metadata.json +++ b/app/build/intermediates/apk/debug/output-metadata.json @@ -5,7 +5,7 @@ "kind": "Directory" }, "applicationId": "net.micode.notes", - "variantName": "release", + "variantName": "debug", "elements": [ { "type": "SINGLE", @@ -13,7 +13,7 @@ "attributes": [], "versionCode": 1, "versionName": "0.1", - "outputFile": "app-release-unsigned.apk" + "outputFile": "app-debug.apk" } ], "elementType": "File" diff --git a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt index 66652a5..46dacc6 100644 --- a/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ b/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt @@ -1,2 +1,2 @@ #- File Locator - -listingFile=../../../outputs/apk/debug/output-metadata.json +listingFile=../../apk/debug/output-metadata.json diff --git a/app/build/intermediates/apk_ide_redirect_file/release/redirect.txt b/app/build/intermediates/apk_ide_redirect_file/release/redirect.txt deleted file mode 100644 index 3716790..0000000 --- a/app/build/intermediates/apk_ide_redirect_file/release/redirect.txt +++ /dev/null @@ -1,2 +0,0 @@ -#- File Locator - -listingFile=../../../outputs/apk/release/output-metadata.json diff --git a/app/build/intermediates/app_metadata/release/app-metadata.properties b/app/build/intermediates/app_metadata/release/app-metadata.properties deleted file mode 100644 index 59d2906..0000000 --- a/app/build/intermediates/app_metadata/release/app-metadata.properties +++ /dev/null @@ -1,2 +0,0 @@ -appMetadataVersion=1.1 -androidGradlePluginVersion=8.1.2 diff --git a/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json b/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json deleted file mode 100644 index 53f799b..0000000 --- a/app/build/intermediates/compatible_screen_manifest/release/output-metadata.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "COMPATIBLE_SCREEN_MANIFEST", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "release", - "elements": [] -} \ No newline at end of file diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index cc5830a..4cde184 100644 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar deleted file mode 100644 index b894c6e..0000000 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/release/R.jar and /dev/null differ diff --git a/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index 5df4f94..18c1bde 100644 Binary files a/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 deleted file mode 100644 index de0b268..0000000 --- a/app/build/intermediates/default_proguard_files/global/proguard-android-optimize.txt-8.1.2 +++ /dev/null @@ -1,117 +0,0 @@ -# This is a configuration file for ProGuard. -# http://proguard.sourceforge.net/index.html#manual/usage.html -# -# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with -# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and -# will be ignored by new version of the Android plugin for Gradle. - -# Optimizations: If you don't want to optimize, use the proguard-android.txt configuration file -# instead of this one, which turns off the optimization flags. -# Adding optimization introduces certain risks, since for example not all optimizations performed by -# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations -# known to have issues, but the list may not be complete or up to date. (The "arithmetic" -# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test -# thoroughly if you go this route. --optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* --optimizationpasses 5 --allowaccessmodification - --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - -# Preserve some attributes that may be required for reflection. --keepattributes AnnotationDefault, - EnclosingMethod, - InnerClasses, - RuntimeVisibleAnnotations, - RuntimeVisibleParameterAnnotations, - RuntimeVisibleTypeAnnotations, - Signature - --keep public class com.google.vending.licensing.ILicensingService --keep public class com.android.vending.licensing.ILicensingService --keep public class com.google.android.vending.licensing.ILicensingService --dontnote com.android.vending.licensing.ILicensingService --dontnote com.google.vending.licensing.ILicensingService --dontnote com.google.android.vending.licensing.ILicensingService - -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames,includedescriptorclasses class * { - native ; -} - -# Keep setters in Views so that animations can still work. --keepclassmembers public class * extends android.view.View { - void set*(***); - *** get*(); -} - -# We want to keep methods in Activity that could be used in the XML attribute onClick. --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keepclassmembers class * implements android.os.Parcelable { - public static final ** CREATOR; -} - -# Preserve annotated Javascript interface methods. --keepclassmembers class * { - @android.webkit.JavascriptInterface ; -} - -# The support libraries contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontnote android.support.** --dontnote androidx.** --dontwarn android.support.** --dontwarn androidx.** - -# This class is deprecated, but remains for backward compatibility. --dontwarn android.util.FloatMath - -# Understand the @Keep support annotation. --keep class android.support.annotation.Keep --keep class androidx.annotation.Keep - --keep @android.support.annotation.Keep class * {*;} --keep @androidx.annotation.Keep class * {*;} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep (...); -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep (...); -} - -# These classes are duplicated between android.jar and org.apache.http.legacy.jar. --dontnote org.apache.http.** --dontnote android.net.http.** - -# These classes are duplicated between android.jar and core-lambda-stubs.jar. --dontnote java.lang.invoke.** diff --git a/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 deleted file mode 100644 index 3ca0d03..0000000 --- a/app/build/intermediates/default_proguard_files/global/proguard-android.txt-8.1.2 +++ /dev/null @@ -1,116 +0,0 @@ -# This is a configuration file for ProGuard. -# http://proguard.sourceforge.net/index.html#manual/usage.html -# -# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with -# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and -# will be ignored by new version of the Android plugin for Gradle. - -# Optimization is turned off by default. Dex does not like code run -# through the ProGuard optimize steps (and performs some -# of these optimizations on its own). -# Note that if you want to enable optimization, you cannot just -# include optimization flags in your own project configuration file; -# instead you will need to point to the -# "proguard-android-optimize.txt" file instead of this one from your -# project.properties file. --dontoptimize - --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - -# Preserve some attributes that may be required for reflection. --keepattributes AnnotationDefault, - EnclosingMethod, - InnerClasses, - RuntimeVisibleAnnotations, - RuntimeVisibleParameterAnnotations, - RuntimeVisibleTypeAnnotations, - Signature - --keep public class com.google.vending.licensing.ILicensingService --keep public class com.android.vending.licensing.ILicensingService --keep public class com.google.android.vending.licensing.ILicensingService --dontnote com.android.vending.licensing.ILicensingService --dontnote com.google.vending.licensing.ILicensingService --dontnote com.google.android.vending.licensing.ILicensingService - -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames,includedescriptorclasses class * { - native ; -} - -# Keep setters in Views so that animations can still work. --keepclassmembers public class * extends android.view.View { - void set*(***); - *** get*(); -} - -# We want to keep methods in Activity that could be used in the XML attribute onClick. --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keepclassmembers class * implements android.os.Parcelable { - public static final ** CREATOR; -} - -# Preserve annotated Javascript interface methods. --keepclassmembers class * { - @android.webkit.JavascriptInterface ; -} - -# The support libraries contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontnote android.support.** --dontnote androidx.** --dontwarn android.support.** --dontwarn androidx.** - -# This class is deprecated, but remains for backward compatibility. --dontwarn android.util.FloatMath - -# Understand the @Keep support annotation. --keep class android.support.annotation.Keep --keep class androidx.annotation.Keep - --keep @android.support.annotation.Keep class * {*;} --keep @androidx.annotation.Keep class * {*;} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep (...); -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep (...); -} - -# These classes are duplicated between android.jar and org.apache.http.legacy.jar. --dontnote org.apache.http.** --dontnote android.net.http.** - -# These classes are duplicated between android.jar and core-lambda-stubs.jar. --dontnote java.lang.invoke.** diff --git a/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 b/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 deleted file mode 100644 index 5fea5b5..0000000 --- a/app/build/intermediates/default_proguard_files/global/proguard-defaults.txt-8.1.2 +++ /dev/null @@ -1,117 +0,0 @@ -# This is a configuration file for ProGuard. -# http://proguard.sourceforge.net/index.html#manual/usage.html -# -# Starting with version 2.2 of the Android plugin for Gradle, this file is distributed together with -# the plugin and unpacked at build-time. The files in $ANDROID_HOME are no longer maintained and -# will be ignored by new version of the Android plugin for Gradle. - -# Optimizations can be turned on and off in the 'postProcessing' DSL block. -# The configuration below is applied if optimizations are enabled. -# Adding optimization introduces certain risks, since for example not all optimizations performed by -# ProGuard works on all versions of Dalvik. The following flags turn off various optimizations -# known to have issues, but the list may not be complete or up to date. (The "arithmetic" -# optimization can be used if you are only targeting Android 2.0 or later.) Make sure you test -# thoroughly if you go this route. --optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/* --optimizationpasses 5 --allowaccessmodification - --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - -# Preserve some attributes that may be required for reflection. --keepattributes AnnotationDefault, - EnclosingMethod, - InnerClasses, - RuntimeVisibleAnnotations, - RuntimeVisibleParameterAnnotations, - RuntimeVisibleTypeAnnotations, - Signature - --keep public class com.google.vending.licensing.ILicensingService --keep public class com.android.vending.licensing.ILicensingService --keep public class com.google.android.vending.licensing.ILicensingService --dontnote com.android.vending.licensing.ILicensingService --dontnote com.google.vending.licensing.ILicensingService --dontnote com.google.android.vending.licensing.ILicensingService - -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames,includedescriptorclasses class * { - native ; -} - -# Keep setters in Views so that animations can still work. --keepclassmembers public class * extends android.view.View { - void set*(***); - *** get*(); -} - -# We want to keep methods in Activity that could be used in the XML attribute onClick. --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keepclassmembers class * implements android.os.Parcelable { - public static final ** CREATOR; -} - -# Preserve annotated Javascript interface methods. --keepclassmembers class * { - @android.webkit.JavascriptInterface ; -} - -# The support libraries contains references to newer platform versions. -# Don't warn about those in case this app is linking against an older -# platform version. We know about them, and they are safe. --dontnote android.support.** --dontnote androidx.** --dontwarn android.support.** --dontwarn androidx.** - -# This class is deprecated, but remains for backward compatibility. --dontwarn android.util.FloatMath - -# Understand the @Keep support annotation. --keep class android.support.annotation.Keep --keep class androidx.annotation.Keep - --keep @android.support.annotation.Keep class * {*;} --keep @androidx.annotation.Keep class * {*;} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep ; -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - --keepclasseswithmembers class * { - @android.support.annotation.Keep (...); -} - --keepclasseswithmembers class * { - @androidx.annotation.Keep (...); -} - -# These classes are duplicated between android.jar and org.apache.http.legacy.jar. --dontnote org.apache.http.** --dontnote android.net.http.** - -# These classes are duplicated between android.jar and core-lambda-stubs.jar. --dontnote java.lang.invoke.** diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 5c5b5ce..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 7b160e4..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index a64ba9e..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 51d8fb9..601f245 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_0/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_0/graph.bin rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_0/graph.bin diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_1/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_1/graph.bin rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_1/graph.bin diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_2/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_2/graph.bin rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_2/graph.bin diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_3/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_9f70ea842297d459ee95d6d64a9fec828890c610d53d5ef5f583409bc29544f3_bucket_3/graph.bin rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4d14e5908edb20cebdd59b3b3d1f7f950547cb522ed30f11f7ea041205a79ae1_bucket_3/graph.bin diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_0/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_0/graph.bin rename to app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_0/graph.bin diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_1/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_1/graph.bin rename to app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_1/graph.bin diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_2/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_2/graph.bin rename to app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_2/graph.bin diff --git a/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_3/graph.bin similarity index 100% rename from app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_d1527a2007ed8fb8585477a545a3f946bb685174562f278aaebaaa9c73423d6d_bucket_3/graph.bin rename to app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_6ac34f89ee7bb451b7256989cf5f90a15ea8a79583f32ba557baf01411884448_bucket_3/graph.bin diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 0d0cb4d..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index b3d71bb..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_2/graph.bin deleted file mode 100644 index d26e672..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_3/graph.bin deleted file mode 100644 index 96d9a27..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/release/out/currentProject/jar_2119678cd458dd3bbe7da8ce0f5d9f1a61e6fa1359e6dff7255ff3d7988c6386_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index f657f58..586555e 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex/release/mergeDexRelease/classes.dex b/app/build/intermediates/dex/release/mergeDexRelease/classes.dex deleted file mode 100644 index aed008c..0000000 Binary files a/app/build/intermediates/dex/release/mergeDexRelease/classes.dex and /dev/null differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 9c8e9e0..564bb70 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out index 5c6bbf9..f2bcdef 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/release/out b/app/build/intermediates/dex_archive_input_jar_hashes/release/out deleted file mode 100644 index 1b6f4b5..0000000 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/release/out and /dev/null differ diff --git a/app/build/intermediates/dex_number_of_buckets_file/release/out b/app/build/intermediates/dex_number_of_buckets_file/release/out deleted file mode 100644 index bf0d87a..0000000 --- a/app/build/intermediates/dex_number_of_buckets_file/release/out +++ /dev/null @@ -1 +0,0 @@ -4 \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index bb6f966..025c146 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,98 +1,120 @@ -#Wed Jan 03 15:26:13 CST 2024 -net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/grassland.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_grassland.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/water.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_water.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-6\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +#Thu Jan 04 08:20:34 CST 2024 +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention0.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention0.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention1.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention1.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention2.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention2.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention3.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention3.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention4.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention4.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/attention5.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_attention5.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/cancel.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_cancel.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/grassland.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_grassland.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/lock.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/water.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_water.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/drawable/selector_grid.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable_selector_grid.xml.flat +net.micode.notes.app-main-6\:/drawable/selector_key_del.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\drawable_selector_key_del.xml.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/layout/current_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_current_password_head.xml.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/homepage.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_homepage.xml.flat +net.micode.notes.app-main-6\:/layout/item_grid.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_item_grid.xml.flat +net.micode.notes.app-main-6\:/layout/layout.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_layout.xml.flat +net.micode.notes.app-main-6\:/layout/layout2.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_layout2.xml.flat +net.micode.notes.app-main-6\:/layout/new_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_new_password_head.xml.flat +net.micode.notes.app-main-6\:/layout/note_decryption.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_decryption.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_encryption.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption.xml.flat +net.micode.notes.app-main-6\:/layout/note_encryption_repeat.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_encryption_repeat.xml.flat +net.micode.notes.app-main-6\:/layout/note_importance.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_importance.xml.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/password_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_password_item.xml.flat +net.micode.notes.app-main-6\:/layout/repeat_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_repeat_password_head.xml.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/raw/introduction=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index d65e0cc..62b59b7 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -7,10 +7,17 @@ %1$s 条符合“%2$s”的搜索结果 + 密码输入正确，即将进入便签 + 密码输入错误，请重新输入 确认删除文件夹及所包含的便签吗？ 确认要删除该条便签吗? 确认要删除所选的 %d 条便签吗? + 便签访问密码设置成功， 密码是 %s + 便签访问密码设置成功，两次密码输入不一致 + 解除便签访问密码成功 删除 + 密码提示 + 设置重要性 便签 便签2x2 便签4x4 @@ -39,6 +46,7 @@ 新建文件夹 删除 取消全选 + 设置密码 导出文本 修改文件夹名称 刪除文件夹 @@ -52,12 +60,14 @@ 移动到文件夹 上一级文件夹 退出清单模式 + 解除密码 删除提醒 搜索 全选 没有选中项，操作无效 选中了 %d 项 发送到桌面 + 设置便签重要性 设置 分享 同步 diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index 8229fb7..d34d55e 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -21,10 +21,17 @@ %1$s results for \"%2$s\" + Decrypt note successfully + Decrypt note unsuccessfully, password is wrong Confirm to delete folder and its notes? Confirm to delete this note? Confirm to delete the selected %d notes? + Encrypt note successfully, password is %s + Encrypt note unsuccessfully, password input is not same + Remove encryption successfully Delete selected notes + Encryption + Set Importance Notes Notes 2x2 Notes 4x4 @@ -56,6 +63,7 @@ New Folder Delete Deselect all + Encrypt note Export text Change folder name Delete folder @@ -70,12 +78,14 @@ Move to folder Parent folder Leave check list + Delete encryption Delete reminder Search Select all Nothing selected, the operation is invalid %d selected Send to home + Set importance Settings Share Sync @@ -134,7 +144,7 @@ @color/secondary_text_dark + 短信 邮件 - 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒设置密码解除密码设置便签重要性选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？密码提示便签访问密码设置成功， 密码是 %s便签访问密码设置成功，两次密码输入不一致密码输入正确，即将进入便签密码输入错误，请重新输入解除便签访问密码成功设置重要性已将所选 %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”的搜索结果 - + 短信 郵件 - 便簽便簽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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index ab78475..6af7690 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,98 +1,120 @@ -#Wed Jan 03 15:26:14 CST 2024 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/grassland.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\grassland.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/water.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\water.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\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=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +#Thu Jan 04 08:20:34 CST 2024 +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/drawable-hdpi/attention0.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention0.png +net.micode.notes.app-main-5\:/drawable-hdpi/attention1.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention1.png +net.micode.notes.app-main-5\:/drawable-hdpi/attention2.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention2.png +net.micode.notes.app-main-5\:/drawable-hdpi/attention3.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention3.png +net.micode.notes.app-main-5\:/drawable-hdpi/attention4.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention4.png +net.micode.notes.app-main-5\:/drawable-hdpi/attention5.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\attention5.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/drawable-hdpi/cancel.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\cancel.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/grassland.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\grassland.png +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/lock.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\lock.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/water.png=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\water.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\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=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/drawable/selector_grid.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_grid.xml +net.micode.notes.app-main-5\:/drawable/selector_key_del.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\selector_key_del.xml +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/layout/current_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\current_password_head.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/layout/homepage.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\homepage.xml +net.micode.notes.app-main-5\:/layout/item_grid.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\item_grid.xml +net.micode.notes.app-main-5\:/layout/layout.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\layout.xml +net.micode.notes.app-main-5\:/layout/layout2.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\layout2.xml +net.micode.notes.app-main-5\:/layout/new_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\new_password_head.xml +net.micode.notes.app-main-5\:/layout/note_decryption.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_decryption.xml +net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/layout/note_encryption.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_encryption.xml +net.micode.notes.app-main-5\:/layout/note_encryption_repeat.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_encryption_repeat.xml +net.micode.notes.app-main-5\:/layout/note_importance.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_importance.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/layout/password_item.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\password_item.xml +net.micode.notes.app-main-5\:/layout/repeat_password_head.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\repeat_password_head.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/raw/introduction=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml index d65e0cc..62b59b7 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -7,10 +7,17 @@ %1$s 条符合“%2$s”的搜索结果 + 密码输入正确，即将进入便签 + 密码输入错误，请重新输入 确认删除文件夹及所包含的便签吗？ 确认要删除该条便签吗? 确认要删除所选的 %d 条便签吗? + 便签访问密码设置成功， 密码是 %s + 便签访问密码设置成功，两次密码输入不一致 + 解除便签访问密码成功 删除 + 密码提示 + 设置重要性 便签 便签2x2 便签4x4 @@ -39,6 +46,7 @@ 新建文件夹 删除 取消全选 + 设置密码 导出文本 修改文件夹名称 刪除文件夹 @@ -52,12 +60,14 @@ 移动到文件夹 上一级文件夹 退出清单模式 + 解除密码 删除提醒 搜索 全选 没有选中项，操作无效 选中了 %d 项 发送到桌面 + 设置便签重要性 设置 分享 同步 diff --git a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml index 8229fb7..d34d55e 100644 --- a/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml +++ b/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml @@ -21,10 +21,17 @@ %1$s results for \"%2$s\" + Decrypt note successfully + Decrypt note unsuccessfully, password is wrong Confirm to delete folder and its notes? Confirm to delete this note? Confirm to delete the selected %d notes? + Encrypt note successfully, password is %s + Encrypt note unsuccessfully, password input is not same + Remove encryption successfully Delete selected notes + Encryption + Set Importance Notes Notes 2x2 Notes 4x4 @@ -56,6 +63,7 @@ New Folder Delete Deselect all + Encrypt note Export text Change folder name Delete folder @@ -70,12 +78,14 @@ Move to folder Parent folder Leave check list + Delete encryption Delete reminder Search Select all Nothing selected, the operation is invalid %d selected Send to home + Set importance Settings Share Sync @@ -134,7 +144,7 @@ @color/secondary_text_dark + 短信 邮件 - 便签便签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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒设置密码解除密码设置便签重要性选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？密码提示便签访问密码设置成功， 密码是 %s便签访问密码设置成功，两次密码输入不一致密码输入正确，即将进入便签密码输入错误，请重新输入解除便签访问密码成功设置重要性已将所选 %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”的搜索结果 - + 短信 郵件 - 便簽便簽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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties index 0dd4e5e..819e204 100644 --- a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties @@ -1 +1 @@ -#Wed Jan 03 15:29:14 CST 2024 +#Tue Jan 02 21:32:03 CST 2024 diff --git a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml index ea43532..a21c69c 100644 --- a/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml +++ b/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml b/app/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml deleted file mode 100644 index 134bf4a..0000000 --- a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml b/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml deleted file mode 100644 index 5b724e2..0000000 --- a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-libraries.xml b/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-libraries.xml deleted file mode 100644 index 8a67860..0000000 --- a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-libraries.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release.xml b/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release.xml deleted file mode 100644 index e01ba78..0000000 --- a/app/build/intermediates/incremental/lintVitalAnalyzeRelease/release.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/app/build/intermediates/incremental/lintVitalReportRelease/module.xml b/app/build/intermediates/incremental/lintVitalReportRelease/module.xml deleted file mode 100644 index 134bf4a..0000000 --- a/app/build/intermediates/incremental/lintVitalReportRelease/module.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - diff --git a/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-dependencies.xml b/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-dependencies.xml deleted file mode 100644 index 5b724e2..0000000 --- a/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-dependencies.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-libraries.xml b/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-libraries.xml deleted file mode 100644 index 8a67860..0000000 --- a/app/build/intermediates/incremental/lintVitalReportRelease/release-mainArtifact-libraries.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app/build/intermediates/incremental/lintVitalReportRelease/release.xml b/app/build/intermediates/incremental/lintVitalReportRelease/release.xml deleted file mode 100644 index 4836bee..0000000 --- a/app/build/intermediates/incremental/lintVitalReportRelease/release.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml index 390a131..00d059e 100644 --- a/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml index 55a54ed..8380ec0 100644 --- a/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml index 61c3e4a..42bb619 100644 --- a/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index ebdc876..6f95e05 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index bd5fedf..1850b91 100644 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 1e58de3..bafaec7 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml b/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml deleted file mode 100644 index 2f4f1bc..0000000 --- a/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml deleted file mode 100644 index 7a8dd19..0000000 --- a/app/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml deleted file mode 100644 index 09602eb..0000000 --- a/app/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 45b2077..9daafcf 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Jan 03 15:26:25 CST 2024 -base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Jan 04 08:20:55 CST 2024 +base.0=D\:\\software gongcheng\\maomaonote\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 6d6b557..760b703 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt index f962926..9e631ed 100644 --- a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Wed Jan 03 15:29:16 CST 2024 -base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex -path.0=classes.dex +#Tue Jan 02 21:37:45 CST 2024 +base.0=D\:\\rjgc\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex renamed.0=classes.dex +path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageRelease/tmp/release/dex-renamer-state.txt b/app/build/intermediates/incremental/packageRelease/tmp/release/dex-renamer-state.txt deleted file mode 100644 index 6ba1563..0000000 --- a/app/build/intermediates/incremental/packageRelease/tmp/release/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Jan 03 08:41:17 CST 2024 -base.0=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\dex\\release\\mergeDexRelease\\classes.dex -path.0=classes.dex -renamed.0=classes.dex diff --git a/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/androidResources b/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/androidResources deleted file mode 100644 index aed06d2..0000000 Binary files a/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/androidResources and /dev/null differ diff --git a/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/javaResources0 b/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/javaResources0 deleted file mode 100644 index 945a7c5..0000000 Binary files a/app/build/intermediates/incremental/packageRelease/tmp/release/zip-cache/javaResources0 and /dev/null differ diff --git a/app/build/intermediates/incremental/release-mergeJavaRes/merge-state b/app/build/intermediates/incremental/release-mergeJavaRes/merge-state deleted file mode 100644 index 1c983fc..0000000 Binary files a/app/build/intermediates/incremental/release-mergeJavaRes/merge-state and /dev/null differ diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties b/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties deleted file mode 100644 index 892420d..0000000 --- a/app/build/intermediates/incremental/release/mergeReleaseResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Wed Jan 03 08:41:02 CST 2024 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\drawable_new_note.xml.flat -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_add_account_text.xml.flat -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit.xml.flat -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_item.xml.flat -net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list.xml.flat -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_settings_header.xml.flat -net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_2x.xml.flat -net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\layout_widget_4x.xml.flat -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_edit.xml.flat -net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list.xml.flat -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_note_list_options.xml.flat -net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\menu_sub_folder.xml.flat -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-5\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\raw_introduction.flat -net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_preferences.xml.flat -net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_searchable.xml.flat -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\merged_res\\release\\xml_widget_4x_info.xml.flat diff --git a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %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/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %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/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml deleted file mode 100644 index d66f9de..0000000 --- a/app/build/intermediates/incremental/release/mergeReleaseResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%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/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml b/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml deleted file mode 100644 index 4e667e2..0000000 --- a/app/build/intermediates/incremental/release/mergeReleaseResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 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\" - - 短信 - 邮件 - 便签便签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”的搜索结果 - - 短信 - 郵件 - 便簽便簽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“的搜尋結果 - \ No newline at end of file diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties deleted file mode 100644 index b4e5ba7..0000000 --- a/app/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Wed Jan 03 08:41:03 CST 2024 -net.micode.notes.app-main-4\:/color/primary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\color\\primary_text_dark.xml -net.micode.notes.app-main-4\:/color/secondary_text_dark.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\color\\secondary_text_dark.xml -net.micode.notes.app-main-4\:/drawable-hdpi/bg_btn_set_color.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-4\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-4\:/drawable-hdpi/call_record.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-4\:/drawable-hdpi/clock.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-4\:/drawable-hdpi/delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-4\:/drawable-hdpi/dropdown_icon.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_blue.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_green.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_red.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_white.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/edit_yellow.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/font_large.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-4\:/drawable-hdpi/font_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-4\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/font_small.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-4\:/drawable-hdpi/font_super.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-4\:/drawable-hdpi/icon_app.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_background.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_blue_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_folder.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_footer_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_green_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_green_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_green_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_green_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_red_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_red_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_red_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_red_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_white_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_white_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_white_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_white_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_down.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_single.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/list_yellow_up.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/menu_delete.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-4\:/drawable-hdpi/menu_move.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-4\:/drawable-hdpi/new_note_normal.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-4\:/drawable-hdpi/new_note_pressed.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-4\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-4\:/drawable-hdpi/notification.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-4\:/drawable-hdpi/search_result.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-4\:/drawable-hdpi/selected.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-4\:/drawable-hdpi/title_alert.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-4\:/drawable-hdpi/title_bar_bg.9.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_2x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_blue.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_green.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_red.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_white.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-4\:/drawable-hdpi/widget_4x_yellow.png=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-4\:/drawable/new_note.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\drawable\\new_note.xml -net.micode.notes.app-main-4\:/layout/account_dialog_title.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\account_dialog_title.xml -net.micode.notes.app-main-4\:/layout/add_account_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\add_account_text.xml -net.micode.notes.app-main-4\:/layout/datetime_picker.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\datetime_picker.xml -net.micode.notes.app-main-4\:/layout/dialog_edit_text.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-4\:/layout/folder_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\folder_list_item.xml -net.micode.notes.app-main-4\:/layout/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_edit.xml -net.micode.notes.app-main-4\:/layout/note_edit_list_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-4\:/layout/note_item.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_item.xml -net.micode.notes.app-main-4\:/layout/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list.xml -net.micode.notes.app-main-4\:/layout/note_list_dropdown_menu.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-4\:/layout/note_list_footer.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\note_list_footer.xml -net.micode.notes.app-main-4\:/layout/settings_header.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\settings_header.xml -net.micode.notes.app-main-4\:/layout/widget_2x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\widget_2x.xml -net.micode.notes.app-main-4\:/layout/widget_4x.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\layout\\widget_4x.xml -net.micode.notes.app-main-4\:/menu/call_note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\call_note_edit.xml -net.micode.notes.app-main-4\:/menu/call_record_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\call_record_folder.xml -net.micode.notes.app-main-4\:/menu/note_edit.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_edit.xml -net.micode.notes.app-main-4\:/menu/note_list.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list.xml -net.micode.notes.app-main-4\:/menu/note_list_dropdown.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-4\:/menu/note_list_options.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\note_list_options.xml -net.micode.notes.app-main-4\:/menu/sub_folder.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\menu\\sub_folder.xml -net.micode.notes.app-main-4\:/raw-zh-rCN/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\raw-zh-rCN\\introduction -net.micode.notes.app-main-4\:/raw/introduction=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\raw\\introduction -net.micode.notes.app-main-4\:/xml/preferences.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\preferences.xml -net.micode.notes.app-main-4\:/xml/searchable.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\searchable.xml -net.micode.notes.app-main-4\:/xml/widget_2x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\widget_2x_info.xml -net.micode.notes.app-main-4\:/xml/widget_4x_info.xml=D\:\\GITwork\\Notes-master\\app\\build\\intermediates\\packaged_res\\release\\xml\\widget_4x_info.xml diff --git a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %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/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %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/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml deleted file mode 100644 index d66f9de..0000000 --- a/app/build/intermediates/incremental/release/packageReleaseResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%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/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml deleted file mode 100644 index 4e667e2..0000000 --- a/app/build/intermediates/incremental/release/packageReleaseResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 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\" - - 短信 - 邮件 - 便签便签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”的搜索结果 - - 短信 - 郵件 - 便簽便簽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“的搜尋結果 - \ No newline at end of file diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 42394b7..c7c17ff 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class index 36c8d49..52eca88 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 42461a2..c895fb0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 0b075b4..509ee79 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index c40e945..f208d3a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index d2041cc..e77f07b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index df71afc..5450f74 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index 415e755..76632e0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 71e5215..4e9abab 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index ddd74fd..7c91e67 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 54e7df6..edac9e7 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index fad3442..ee7a9f8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 023f716..a99161c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 5416cd3..114a402 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class new file mode 100644 index 0000000..7db1cb9 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$10.class differ diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId8 b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class similarity index 53% rename from app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId8 rename to app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class index bb9f786..b74ada1 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$2.class.uniqueId8 and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$11.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class similarity index 61% rename from app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$3.class rename to app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class index 961f2f4..d2e1063 100644 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$12.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class new file mode 100644 index 0000000..b8abb80 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index bb9f786..043cd50 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 961f2f4..d27d6f6 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId34 b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class similarity index 61% rename from app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId34 rename to app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 5416cd3..bbb5146 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NoteEditActivity$1.class.uniqueId34 and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class new file mode 100644 index 0000000..b4476fe Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class new file mode 100644 index 0000000..a75e559 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class new file mode 100644 index 0000000..5233447 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class new file mode 100644 index 0000000..87171b5 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class new file mode 100644 index 0000000..c33fe0d Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class new file mode 100644 index 0000000..56c2d67 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8e1f0bf..7285b59 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class new file mode 100644 index 0000000..d9228bb Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class new file mode 100644 index 0000000..610488a Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$RatingBarLayout.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 7d0a456..00e13fe 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index 2040186..fbeff49 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 3a19d3b..e0eea60 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class index 771aa91..30945a9 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 14805a4..7e8ab9f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index f452595..555e10f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index ac00dce..fa03692 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 49a0a54..6ec9127 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index c192db7..11f13f8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index e4866ff..bc414a3 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 13d127c..8473298 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index bc20ccf..e090061 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 47dabba..8f35f1e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 2b3227b..aa43949 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 6e4ee29..6b4f61a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 4596834..91b527f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class new file mode 100644 index 0000000..006dde2 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/OnPasswordInputFinish.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class new file mode 100644 index 0000000..22a362d Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class new file mode 100644 index 0000000..0f2145c Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class new file mode 100644 index 0000000..c1fa846 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class new file mode 100644 index 0000000..c830df2 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView$ViewHolder.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class new file mode 100644 index 0000000..9c020b4 Binary files /dev/null and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/PasswordView.class differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class deleted file mode 100644 index a7948fd..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Contact.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class deleted file mode 100644 index 42394b7..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class deleted file mode 100644 index 569dbdc..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class deleted file mode 100644 index 76ef96e..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class deleted file mode 100644 index 36c8d49..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class deleted file mode 100644 index 42461a2..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class deleted file mode 100644 index 413745e..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/Notes.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class deleted file mode 100644 index 64fe9eb..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class b/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class deleted file mode 100644 index 0b075b4..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class deleted file mode 100644 index 20ff3f7..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class deleted file mode 100644 index 5236c5e..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class deleted file mode 100644 index 099f3ba..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class deleted file mode 100644 index 2783ae3..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class deleted file mode 100644 index 5aaf1d4..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class deleted file mode 100644 index 359609e..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class deleted file mode 100644 index 1a059ce..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class deleted file mode 100644 index 75665c2..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class deleted file mode 100644 index 7be3b8a..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskClient.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class deleted file mode 100644 index f246eb8..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class deleted file mode 100644 index 18da491..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class deleted file mode 100644 index c40e945..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class deleted file mode 100644 index d2041cc..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/model/Note.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class deleted file mode 100644 index 15f1f77..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class deleted file mode 100644 index df71afc..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class deleted file mode 100644 index 6af3200..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class b/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class deleted file mode 100644 index d320e3e..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class deleted file mode 100644 index a1d202d..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class deleted file mode 100644 index a41b775..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class deleted file mode 100644 index 415e755..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class deleted file mode 100644 index fad3442..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class deleted file mode 100644 index 8e1f0bf..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index 7d0a456..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class deleted file mode 100644 index 2040186..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class deleted file mode 100644 index 3a19d3b..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteItemData.class deleted file mode 100644 index 771aa91..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$1.class deleted file mode 100644 index f1ba220..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$5.class deleted file mode 100644 index 54fa572..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$6.class deleted file mode 100644 index 062ecb5..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$8.class deleted file mode 100644 index d3dbb60..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class deleted file mode 100644 index 3d4e8b1..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity.class deleted file mode 100644 index 83dc6c8..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class deleted file mode 100644 index 2bdb58b..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class deleted file mode 100644 index 5e432e9..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListItem.class deleted file mode 100644 index 4596834..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class deleted file mode 100644 index 043e410..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ diff --git a/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class deleted file mode 100644 index ee3fd40..0000000 Binary files a/app/build/intermediates/javac/release/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ diff --git a/app/build/intermediates/lint-cache/lint-cache-version.txt b/app/build/intermediates/lint-cache/lint-cache-version.txt deleted file mode 100644 index 5ece786..0000000 --- a/app/build/intermediates/lint-cache/lint-cache-version.txt +++ /dev/null @@ -1 +0,0 @@ -Cache for Android Lint31.1.2 diff --git a/app/build/intermediates/lint_vital_intermediate_text_report/release/lint-results-release.txt b/app/build/intermediates/lint_vital_intermediate_text_report/release/lint-results-release.txt deleted file mode 100644 index 5414988..0000000 --- a/app/build/intermediates/lint_vital_intermediate_text_report/release/lint-results-release.txt +++ /dev/null @@ -1,23 +0,0 @@ -D:\GITwork\Notes-master\app\build.gradle:12: Error: Google Play requires that apps target API level 31 or higher. - [ExpiredTargetSdkVersion] - targetSdkVersion 14 - ~~~~~~~~~~~~~~~~~~~ - - Explanation for issues of type "ExpiredTargetSdkVersion": - As of the second half of 2018, Google Play requires that new apps and app - updates target API level 26 or higher. - - Configuring your app to target a recent API level ensures that users - benefit from significant security and performance improvements, while still - allowing your app to run on older Android versions (down to the - minSdkVersion). - - To update your targetSdkVersion, follow the steps from "Meeting Google Play - requirements for target API level", - https://developer.android.com/distribute/best-practices/develop/target-sdk. - html - - https://support.google.com/googleplay/android-developer/answer/113469#targetsdk - https://developer.android.com/distribute/best-practices/develop/target-sdk.html - -1 errors, 0 warnings diff --git a/app/build/intermediates/lint_vital_partial_results/release/out/lint-provisional-release.xml b/app/build/intermediates/lint_vital_partial_results/release/out/lint-provisional-release.xml deleted file mode 100644 index 6473638..0000000 --- a/app/build/intermediates/lint_vital_partial_results/release/out/lint-provisional-release.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/build/intermediates/lint_vital_return_value/release/return-value-release.txt b/app/build/intermediates/lint_vital_return_value/release/return-value-release.txt deleted file mode 100644 index 56a6051..0000000 --- a/app/build/intermediates/lint_vital_return_value/release/return-value-release.txt +++ /dev/null @@ -1 +0,0 @@ -1 \ No newline at end of file diff --git a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt index b9cb18c..1eea1a3 100644 --- a/app/build/intermediates/local_only_symbol_list/debug/R-def.txt +++ b/app/build/intermediates/local_only_symbol_list/debug/R-def.txt @@ -10,9 +10,16 @@ dimen text_font_size_medium dimen text_font_size_normal dimen text_font_size_small dimen text_font_size_super +drawable attention0 +drawable attention1 +drawable attention2 +drawable attention3 +drawable attention4 +drawable attention5 drawable bg_btn_set_color drawable bg_color_btn_mask drawable call_record +drawable cancel drawable clock drawable delete drawable dropdown_icon @@ -56,6 +63,7 @@ drawable list_yellow_down drawable list_yellow_middle drawable list_yellow_single drawable list_yellow_up +drawable lock drawable menu_delete drawable menu_move drawable new_note @@ -65,6 +73,8 @@ drawable note_edit_color_selector_panel drawable notification drawable search_result drawable selected +drawable selector_grid +drawable selector_key_del drawable title_alert drawable title_bar_bg drawable water @@ -78,10 +88,24 @@ drawable widget_4x_green drawable widget_4x_red drawable widget_4x_white drawable widget_4x_yellow +id Blue +id Button01 +id Button02 +id Button03 +id Button04 +id Button06 +id Button07 +id Button08 +id ButtonR +id Green +id Red +id TableLayout01 +id TableLayout02 id account_dialog_subtitle id account_dialog_title id action_select_all id amPm +id btn_keys id btn_new_note id btn_set_bg_color id cb_edit_item @@ -90,7 +114,9 @@ id delete id et_edit_text id et_foler_name id font_size_selector +id gv_keyboard id hour +id img_cancel id iv_alert_icon id iv_bg_blue id iv_bg_blue_select @@ -102,25 +128,31 @@ id iv_bg_white id iv_bg_white_select id iv_bg_yellow id iv_bg_yellow_select +id iv_importance id iv_large_select +id iv_lock_icon id iv_medium_select id iv_small_select id iv_super_select +id linear_pass 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_encrypt id menu_delete_remind +id menu_encrypt id menu_export_text id menu_font_size -id menu_grass +id menu_grassland id menu_list_mode id menu_new_folder id menu_new_note id menu_search id menu_send_to_desktop +id menu_set_importance id menu_setting id menu_share id menu_sync @@ -129,6 +161,7 @@ id minute id move id navigation_bar id note_bg_color_selector +id note_decryption id note_edit_list id note_edit_view id note_item @@ -136,12 +169,18 @@ id note_title id notes_list id prefenerece_sync_status_textview id preference_sync_button +id ratingBar id selection_menu id sv_note_edit +id textCount id tv_alert_date id tv_folder_name id tv_modified_date id tv_name +id tv_pass1 +id tv_pass2 +id tv_pass3 +id tv_pass4 id tv_time id tv_title id tv_title_bar @@ -149,15 +188,27 @@ id widget_bg_image id widget_text layout account_dialog_title layout add_account_text +layout current_password_head layout datetime_picker layout dialog_edit_text layout folder_list_item +layout homepage +layout item_grid +layout layout +layout layout2 +layout new_password_head +layout note_decryption layout note_edit layout note_edit_list_item +layout note_encryption +layout note_encryption_repeat +layout note_importance layout note_item layout note_list layout note_list_dropdown_menu layout note_list_footer +layout password_item +layout repeat_password_head layout settings_header layout widget_2x layout widget_4x @@ -170,10 +221,17 @@ menu note_list_options menu sub_folder plurals search_results_title raw introduction +string alert_message_decrypt +string alert_message_decrypt_error string alert_message_delete_folder string alert_message_delete_note string alert_message_delete_notes +string alert_message_encrypt +string alert_message_encrypt_error +string alert_message_remove_encrypt string alert_title_delete +string alert_title_encrypt +string alert_title_importance string app_name string app_widget2x2 string app_widget4x4 @@ -205,6 +263,7 @@ string menu_alert string menu_create_folder string menu_delete string menu_deselect_all +string menu_encrypt string menu_export_text string menu_folder_change_name string menu_folder_delete @@ -219,12 +278,14 @@ string menu_list_mode string menu_move string menu_move_parent_folder string menu_normal_mode +string menu_remove_encrypt 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_set_importance string menu_setting string menu_share string menu_sync diff --git a/app/build/intermediates/local_only_symbol_list/release/R-def.txt b/app/build/intermediates/local_only_symbol_list/release/R-def.txt deleted file mode 100644 index 5bec0cd..0000000 --- a/app/build/intermediates/local_only_symbol_list/release/R-def.txt +++ /dev/null @@ -1,285 +0,0 @@ -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/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 382f59f..7ed9173 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,253 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> 25 26 -26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:extractNativeLibs="true" 39 android:icon="@drawable/icon_app" -39-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -40 android:label="@string/app_name" > -40-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -41 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 -42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -44 android:label="@string/app_name" -44-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -45 android:launchMode="singleTop" -45-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -46 android:theme="@style/NoteTheme" -46-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +39-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:36:9-42 +40 android:label="@string/app_name" +40-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:37:9-41 +41 android:testOnly="true" > +42 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:38:9-51:20 +43 android:name="net.micode.notes.ui.NotesListActivity" +43-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:39:13-49 +44 android:configChanges="keyboardHidden|orientation|screenSize" +44-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:40:13-74 +45 android:label="@string/app_name" +45-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:41:13-45 +46 android:launchMode="singleTop" +46-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:42:13-43 +47 android:theme="@style/NoteTheme" +47-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:43:13-45 +48 android:uiOptions="splitActionBarWhenNarrow" +48-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:44:13-57 +49 android:windowSoftInputMode="adjustPan" > +49-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:45:13-52 +50 +50-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:47:13-50:29 +51 +51-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:48:17-69 +51-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:48:25-66 +52 +53 +53-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:49:17-77 +53-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:49:27-74 +54 +55 +56 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:53:9-81:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:54:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:55:13-74 +59 android:launchMode="singleTop" +59-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:56:13-43 +60 android:theme="@style/NoteTheme" > +60-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:57:13-45 +61 +61-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:59:13-64:29 +62 +62-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:60:17-69 +62-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:60:25-66 +63 +64 +64-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:17-76 +64-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:27-73 +65 +66 +66-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:23-75 +67 +67-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:17-78 +67-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:23-75 +68 +69 +69-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:66:13-71:29 +70 +70-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:67:17-79 +70-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:67:25-76 +71 +72 +72-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:17-76 +72-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:27-73 +73 +74 +74-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:23-75 +75 +75-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:17-78 +75-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:62:23-75 +76 +77 +77-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:73:13-76:29 +78 +78-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:74:17-71 +78-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:74:25-68 +79 +80 +80-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:17-76 +80-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:61:27-73 +81 +82 +83 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:78:13-80:54 +84 android:name="android.app.searchable" +84-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:79:17-54 +85 android:resource="@xml/searchable" /> +85-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:80:17-51 +86 +87 +88 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:83:9-86:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:84:13-63 +90 android:authorities="micode_notes" +90-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:85:13-47 +91 android:multiprocess="true" /> +91-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:86:13-40 +92 +93 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:88:9-100:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:89:13-57 +95 android:label="@string/app_widget2x2" > +95-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:90:13-50 +96 +96-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:91:13-95:29 +97 +97-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:92:17-84 +97-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:92:25-81 +98 +98-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:93:17-85 +98-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:93:25-82 +99 +99-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:94:17-85 +99-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:94:25-82 +100 +101 +102 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:97:13-99:58 +103 android:name="android.appwidget.provider" +103-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:98:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:99:17-55 +105 +106 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:101:9-114:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:102:13-57 +108 android:label="@string/app_widget4x4" > +108-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:103:13-50 +109 +109-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:91:13-95:29 +110 +110-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:92:17-84 +110-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:92:25-81 +111 +111-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:93:17-85 +111-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:93:25-82 +112 +112-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:94:17-85 +112-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:94:25-82 +113 +114 +115 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:97:13-99:58 +116 android:name="android.appwidget.provider" +116-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:98:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:99:17-55 +118 +119 +119-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:116:9-120:20 +119-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:116:19-55 +120 +120-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:117:13-119:29 +121 +121-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:118:17-79 +121-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:118:25-76 +122 +123 +124 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:122:9-125:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:123:13-61 +126 android:process=":remote" > +126-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:124:13-38 +127 +128 +129 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:127:9-132:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:128:13-50 +131 android:label="@string/app_name" +131-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:129:13-45 +132 android:launchMode="singleInstance" +132-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:130:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:131:13-75 +134 +135 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:134:9-139:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:135:13-71 +137 android:label="@string/preferences_title" +137-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:136:13-54 +138 android:launchMode="singleTop" +138-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:137:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:138:13-60 +140 +141 +142 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:141:9-144:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:142:13-74 +144 android:exported="false" > +144-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:143:13-37 +145 +146 +147 D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:146:9-148:52 +148 android:name="android.app.default_searchable" +148-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:147:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->D:\software gongcheng\maomaonote\app\src\main\AndroidManifest.xml:148:13-49 +150 +151 +152 diff --git a/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt index a51d473..cccaa42 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt @@ -3,32 +3,32 @@ 3 package="net.micode.notes.test" > 4 5 D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:5:5-74 +5-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:5-74 6 android:minSdkVersion="14" -6-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:5:15-41 +6-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:15-41 7 android:targetSdkVersion="14" /> -7-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:5:42-71 +7-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:5:42-71 8 9 D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:11:5-15:66 +9-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:11:5-15:66 10 android:name="android.test.InstrumentationTestRunner" -10-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:11:22-75 +10-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:11:22-75 11 android:functionalTest="false" -11-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:14:22-52 +11-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:14:22-52 12 android:handleProfiling="false" -12-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:13:22-53 +12-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:13:22-53 13 android:label="Tests for net.micode.notes" -13-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:15:22-64 +13-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:15:22-64 14 android:targetPackage="net.micode.notes" /> -14-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:12:22-62 +14-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:12:22-62 15 16 D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:7:5-9:19 +16-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:7:5-9:19 17 android:debuggable="true" 18 android:extractNativeLibs="true" > 19 -19-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:8:9-60 -19-->D:\GITwork\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17721235776499190415.xml:8:23-57 +19-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:8:9-60 +19-->D:\rjgc\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest5181895404383965369.xml:8:23-57 20 21 22 diff --git a/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt b/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt deleted file mode 100644 index 69e9fcf..0000000 --- a/app/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt +++ /dev/null @@ -1,271 +0,0 @@ -1 -2 -17 -21 -22 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -25 -26 -26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:extractNativeLibs="true" -38 android:icon="@drawable/icon_app" -38-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:36:9-42 -39 android:label="@string/app_name" > -39-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:37:9-41 -40 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20 -41 android:name="net.micode.notes.ui.NotesListActivity" -41-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:39:13-49 -42 android:configChanges="keyboardHidden|orientation|screenSize" -42-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:40:13-74 -43 android:label="@string/app_name" -43-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:41:13-45 -44 android:launchMode="singleTop" -44-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:42:13-43 -45 android:theme="@style/NoteTheme" -45-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:43:13-45 -46 android:uiOptions="splitActionBarWhenNarrow" -46-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:44:13-57 -47 android:windowSoftInputMode="adjustPan" > -47-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:45:13-52 -48 -48-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29 -49 -49-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:17-69 -49-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:48:25-66 -50 -51 -51-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:17-77 -51-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:49:27-74 -52 -53 -54 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20 -55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:54:13-48 -56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:55:13-74 -57 android:launchMode="singleTop" -57-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:56:13-43 -58 android:theme="@style/NoteTheme" > -58-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:57:13-45 -59 -59-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29 -60 -60-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:17-69 -60-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:60:25-66 -61 -62 -62-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -62-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -63 -64 -64-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -64-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -65 -65-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -66 -67 -67-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29 -68 -68-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:17-79 -68-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:67:25-76 -69 -70 -70-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -70-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -71 -72 -72-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -72-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -73 -73-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:62:23-75 -74 -75 -75-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29 -76 -76-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:17-71 -76-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:74:25-68 -77 -78 -78-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:17-76 -78-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:61:27-73 -79 -80 -81 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54 -82 android:name="android.app.searchable" -82-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:79:17-54 -83 android:resource="@xml/searchable" /> -83-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:80:17-51 -84 -85 -86 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43 -87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:84:13-63 -88 android:authorities="micode_notes" -88-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:85:13-47 -89 android:multiprocess="true" /> -89-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:86:13-40 -90 -91 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20 -92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:89:13-57 -93 android:label="@string/app_widget2x2" > -93-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:90:13-50 -94 -94-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -95 -95-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -95-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -96 -96-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -96-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -97 -97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -97-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -98 -99 -100 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -101 android:name="android.appwidget.provider" -101-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -102 android:resource="@xml/widget_2x_info" /> -102-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -103 -104 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20 -105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:102:13-57 -106 android:label="@string/app_widget4x4" > -106-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:103:13-50 -107 -107-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29 -108 -108-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:17-84 -108-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:92:25-81 -109 -109-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:17-85 -109-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:93:25-82 -110 -110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:17-85 -110-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:94:25-82 -111 -112 -113 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58 -114 android:name="android.appwidget.provider" -114-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:98:17-58 -115 android:resource="@xml/widget_4x_info" /> -115-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:99:17-55 -116 -117 -117-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20 -117-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:116:19-55 -118 -118-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29 -119 -119-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:17-79 -119-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:118:25-76 -120 -121 -122 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20 -123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:123:13-61 -124 android:process=":remote" > -124-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:124:13-38 -125 -126 -127 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20 -128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:128:13-50 -129 android:label="@string/app_name" -129-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:129:13-45 -130 android:launchMode="singleInstance" -130-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:130:13-48 -131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:131:13-75 -132 -133 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20 -134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:135:13-71 -135 android:label="@string/preferences_title" -135-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:136:13-54 -136 android:launchMode="singleTop" -136-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:137:13-43 -137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:138:13-60 -138 -139 -140 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19 -141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:142:13-74 -142 android:exported="false" > -142-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:143:13-37 -143 -144 -145 D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52 -146 android:name="android.app.default_searchable" -146-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:147:13-58 -147 android:value=".ui.NoteEditActivity" /> -147-->D:\GITwork\Notes-master\app\src\main\AndroidManifest.xml:148:13-49 -148 -149 -150 diff --git a/app/build/intermediates/merged_java_res/release/base.jar b/app/build/intermediates/merged_java_res/release/base.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/app/build/intermediates/merged_java_res/release/base.jar and /dev/null differ diff --git a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 7092c0d..9e8d8ca 100644 --- a/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -37,7 +37,8 @@ android:debuggable="true" android:extractNativeLibs="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" > + android:label="@string/app_name" + android:testOnly="true" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 7092c0d..9e8d8ca 100644 --- a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -37,7 +37,8 @@ android:debuggable="true" android:extractNativeLibs="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" > + android:label="@string/app_name" + android:testOnly="true" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/merged_manifests/release/output-metadata.json b/app/build/intermediates/merged_manifests/release/output-metadata.json deleted file mode 100644 index dba4e33..0000000 --- a/app/build/intermediates/merged_manifests/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "MERGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat new file mode 100644 index 0000000..42569ae Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention0.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat new file mode 100644 index 0000000..5f5ac00 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention1.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat new file mode 100644 index 0000000..f2902aa Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention2.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat new file mode 100644 index 0000000..ae9effe Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention3.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat new file mode 100644 index 0000000..f39e40a Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention4.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat new file mode 100644 index 0000000..8eda800 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_attention5.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat new file mode 100644 index 0000000..0575146 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_cancel.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat b/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat new file mode 100644 index 0000000..3c23d85 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable-hdpi_lock.png.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat b/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat new file mode 100644 index 0000000..eb5b9b5 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable_selector_grid.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat b/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat new file mode 100644 index 0000000..d9fb1d5 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/drawable_selector_key_del.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat index 1bbe3ab..8524c9a 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and b/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat new file mode 100644 index 0000000..4fa0b00 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_current_password_head.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat b/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat new file mode 100644 index 0000000..6d0ce29 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_homepage.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat b/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat new file mode 100644 index 0000000..768661c Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_item_grid.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_layout.xml.flat b/app/build/intermediates/merged_res/debug/layout_layout.xml.flat new file mode 100644 index 0000000..be91098 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_layout.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat b/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat new file mode 100644 index 0000000..e30271e Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_layout2.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat new file mode 100644 index 0000000..a7ded6e Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_new_password_head.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat new file mode 100644 index 0000000..b038695 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_decryption.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 6c97e3d..a1c9d31 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat new file mode 100644 index 0000000..1c265bf Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_encryption.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat new file mode 100644 index 0000000..cf0f91d Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_encryption_repeat.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat new file mode 100644 index 0000000..4761e49 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_note_importance.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat index 1c3342f..3e715de 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index 0dd3545..4f0f76d 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat b/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat new file mode 100644 index 0000000..ed11ce6 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_password_item.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat b/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat new file mode 100644 index 0000000..d9c5bf0 Binary files /dev/null and b/app/build/intermediates/merged_res/debug/layout_repeat_password_head.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index c025a60..ab91948 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index be64492..f976c04 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 4e7bd33..3042a03 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat index c3a2160..fd29e9b 100644 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat b/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat deleted file mode 100644 index 09dc5b0..0000000 Binary files a/app/build/intermediates/merged_res/release/color_primary_text_dark.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat b/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat deleted file mode 100644 index bc8b7af..0000000 Binary files a/app/build/intermediates/merged_res/release/color_secondary_text_dark.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat deleted file mode 100644 index a7d837b..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_btn_set_color.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat deleted file mode 100644 index 69cfe20..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat deleted file mode 100644 index 1cb89c8..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_call_record.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat deleted file mode 100644 index 903fa9f..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_clock.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat deleted file mode 100644 index bf6fec8..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_delete.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat deleted file mode 100644 index 53bcfe6..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat deleted file mode 100644 index 6fd9daf..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_blue.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat deleted file mode 100644 index c89911f..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_green.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat deleted file mode 100644 index 606c528..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_red.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat deleted file mode 100644 index 271d052..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_blue.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat deleted file mode 100644 index 6cef9fb..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_green.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat deleted file mode 100644 index aca0b6c..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_red.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat deleted file mode 100644 index 812e4bc..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_white.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat deleted file mode 100644 index 651cff3..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_title_yellow.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat deleted file mode 100644 index aa28ab0..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_white.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat deleted file mode 100644 index 0a50ba8..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_edit_yellow.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat deleted file mode 100644 index 05f1bf5..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_font_large.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat deleted file mode 100644 index c521631..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_font_normal.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat deleted file mode 100644 index 0fdf7d0..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_font_size_selector_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat deleted file mode 100644 index 7b9f6a7..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_font_small.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat deleted file mode 100644 index ef33d65..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_font_super.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat deleted file mode 100644 index c61e324..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_icon_app.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat deleted file mode 100644 index c5efc7d..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat deleted file mode 100644 index 3fdb17f..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat deleted file mode 100644 index de5f5da..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat deleted file mode 100644 index 75706ad..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat deleted file mode 100644 index 2e766eb..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat deleted file mode 100644 index a0fb8a5..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_folder.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat deleted file mode 100644 index 231e936..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat deleted file mode 100644 index 6f5265d..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat deleted file mode 100644 index fc2bf65..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat deleted file mode 100644 index de3ea7d..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat deleted file mode 100644 index 5526e5e..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_green_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat deleted file mode 100644 index cb5e538..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat deleted file mode 100644 index 82ba754..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat deleted file mode 100644 index dbca84a..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat deleted file mode 100644 index 86965b6..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat deleted file mode 100644 index 058d82d..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat deleted file mode 100644 index e3a147e..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat deleted file mode 100644 index c333255..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat deleted file mode 100644 index 72519be..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat deleted file mode 100644 index 3fc3613..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_down.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat deleted file mode 100644 index b383538..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat deleted file mode 100644 index 6658a57..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_single.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat deleted file mode 100644 index 994f569..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat deleted file mode 100644 index 23d8db7..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_delete.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat deleted file mode 100644 index 1567f7a..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_menu_move.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat deleted file mode 100644 index b91b1b1..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_normal.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat deleted file mode 100644 index 9569f82..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_new_note_pressed.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat deleted file mode 100644 index ea74af3..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_note_edit_color_selector_panel.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat deleted file mode 100644 index c8d29c6..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_notification.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat deleted file mode 100644 index e91f2b4..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_search_result.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat deleted file mode 100644 index 6401daf..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_selected.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat deleted file mode 100644 index d4ae4b3..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_title_alert.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat deleted file mode 100644 index 306285d..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_title_bar_bg.9.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat deleted file mode 100644 index 2aae1b4..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_blue.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat deleted file mode 100644 index 95051b6..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_green.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat deleted file mode 100644 index dbb656c..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_red.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat deleted file mode 100644 index 8d8fb50..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_white.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat deleted file mode 100644 index d8705ff..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_2x_yellow.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat deleted file mode 100644 index 34753c8..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_blue.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat deleted file mode 100644 index 9de275e..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_green.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat deleted file mode 100644 index 52ad11c..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_red.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat deleted file mode 100644 index 416fdf4..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_white.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat b/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat deleted file mode 100644 index d490371..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable-hdpi_widget_4x_yellow.png.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat b/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat deleted file mode 100644 index c58dd7b..0000000 Binary files a/app/build/intermediates/merged_res/release/drawable_new_note.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat b/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat deleted file mode 100644 index 632d158..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_account_dialog_title.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat b/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat deleted file mode 100644 index b46effa..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_add_account_text.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat b/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat deleted file mode 100644 index fec097a..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_datetime_picker.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat b/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat deleted file mode 100644 index 2e36f8d..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_dialog_edit_text.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat b/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat deleted file mode 100644 index aff30cb..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_folder_list_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat deleted file mode 100644 index 194cc1c..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat b/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat deleted file mode 100644 index 0d7b135..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_edit_list_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_item.xml.flat b/app/build/intermediates/merged_res/release/layout_note_item.xml.flat deleted file mode 100644 index 474a99d..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_item.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list.xml.flat deleted file mode 100644 index c8d2db1..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_list.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat deleted file mode 100644 index 16ac32d..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_list_dropdown_menu.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat b/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat deleted file mode 100644 index 68ed15e..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_note_list_footer.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat b/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat deleted file mode 100644 index f342efb..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_settings_header.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat b/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat deleted file mode 100644 index c84d1a5..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_widget_2x.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat b/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat deleted file mode 100644 index 56b5316..0000000 Binary files a/app/build/intermediates/merged_res/release/layout_widget_4x.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat b/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat deleted file mode 100644 index e57f250..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_call_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat b/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat deleted file mode 100644 index 5577464..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_call_record_folder.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat deleted file mode 100644 index a479e9f..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_note_edit.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list.xml.flat deleted file mode 100644 index fd103b4..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_note_list.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat deleted file mode 100644 index b0dd5d6..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_note_list_dropdown.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat b/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat deleted file mode 100644 index 2fc1a54..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_note_list_options.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat b/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat deleted file mode 100644 index c33c990..0000000 Binary files a/app/build/intermediates/merged_res/release/menu_sub_folder.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat b/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat deleted file mode 100644 index daec094..0000000 Binary files a/app/build/intermediates/merged_res/release/raw-zh-rCN_introduction.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/raw_introduction.flat b/app/build/intermediates/merged_res/release/raw_introduction.flat deleted file mode 100644 index 0a653fe..0000000 Binary files a/app/build/intermediates/merged_res/release/raw_introduction.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat deleted file mode 100644 index cb82be6..0000000 Binary files a/app/build/intermediates/merged_res/release/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat deleted file mode 100644 index 169c9c9..0000000 Binary files a/app/build/intermediates/merged_res/release/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/values_values.arsc.flat b/app/build/intermediates/merged_res/release/values_values.arsc.flat deleted file mode 100644 index 00a9b75..0000000 Binary files a/app/build/intermediates/merged_res/release/values_values.arsc.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/xml_preferences.xml.flat b/app/build/intermediates/merged_res/release/xml_preferences.xml.flat deleted file mode 100644 index 7018ede..0000000 Binary files a/app/build/intermediates/merged_res/release/xml_preferences.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/xml_searchable.xml.flat b/app/build/intermediates/merged_res/release/xml_searchable.xml.flat deleted file mode 100644 index caf109f..0000000 Binary files a/app/build/intermediates/merged_res/release/xml_searchable.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat b/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat deleted file mode 100644 index ae846cd..0000000 Binary files a/app/build/intermediates/merged_res/release/xml_widget_2x_info.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat b/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat deleted file mode 100644 index 4ead2b1..0000000 Binary files a/app/build/intermediates/merged_res/release/xml_widget_4x_info.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index dc10246..e629c25 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,22 +23,22 @@ } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\software gongcheng\\maomaonote\\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" + "startLines": "136,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,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,4,4,4,4,4,4", + "startOffsets": "7681,4303,4368,3926,3859,3785,4155,4225,4438,3734,4101,4509,846,887,936,7223,7269,7626,7575,1225,4966,5035,4906,4840,4776,5710,5649,5585,5169,2937,1398,1452,5224,4668,7327,3674,3097,1836,2123,2374,3295,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3614,2717,3342,3141,2079,2326,2269,2213,3041,3396,2034,2998,1941,1983,3554,1346,1657,1755,1609,1707,1561,1515,1173,1119,6092,6032,6235,7148,6551,6481,6616,6695,6880,6806,6168,6425,6293,6359,5982,6985,7069,7536,7427,7378,7473,1288,5113,5525,5825,5766,5893,5476,5430,5381,5329,985,1052", + "endLines": "138,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23", + "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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": "7855,4362,4432,3994,3920,3853,4219,4297,4501,3779,4149,4561,881,930,979,7263,7321,7675,7620,1282,5029,5107,4960,4900,4834,5760,5704,5643,5218,2992,1446,1509,5304,4744,7372,3728,3135,1884,2161,2420,3336,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3668,2764,3390,3188,2117,2368,2320,2263,3091,3447,2073,3035,1977,2028,3608,1392,1701,1799,1651,1749,1603,1555,1219,1167,6162,6086,6287,7217,6610,6545,6689,6800,6979,6874,6229,6475,6353,6419,6026,7063,7142,7569,7467,7421,7530,1340,5163,5579,5887,5819,5950,5519,5470,5424,5375,1046,1113" }, "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" + "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,107,108,109,110,111,112,113,114,115,116", + "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,4,4,4,4,4,4", + "startOffsets": "215,384,448,517,590,656,729,798,875,943,993,1046,1103,1143,1191,1239,1284,1341,1395,1445,1507,1575,1652,1711,1776,1839,1894,1954,2017,2071,2131,2184,2246,2331,2412,2462,2521,2564,2617,2660,2711,2757,2807,2867,2920,2971,3017,3065,3113,3159,3206,3256,3301,3360,3412,3465,3517,3560,3607,3663,3718,3773,3829,3873,3915,3956,4006,4065,4116,4165,4214,4261,4308,4355,4400,4451,4504,4579,4638,4695,4769,4833,4902,4980,5090,5194,5267,5333,5388,5453,5518,5567,5650,5728,5766,5811,5859,5921,5978,6033,6092,6159,6217,6279,6327,6372,6420,6471,6537", + "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,107,108,109,110,111,112,113,114,115,116", + "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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,443,512,585,651,724,793,870,938,988,1041,1098,1138,1186,1234,1279,1336,1390,1440,1502,1570,1647,1706,1771,1834,1889,1949,2012,2066,2126,2179,2241,2326,2407,2457,2516,2559,2612,2655,2706,2752,2802,2862,2915,2966,3012,3060,3108,3154,3201,3251,3296,3355,3407,3460,3512,3555,3602,3658,3713,3768,3824,3868,3910,3951,4001,4060,4111,4160,4209,4256,4303,4350,4395,4446,4499,4574,4633,4690,4764,4828,4897,4975,5085,5189,5262,5328,5383,5448,5513,5562,5645,5723,5761,5806,5854,5916,5973,6028,6087,6154,6212,6274,6322,6367,6415,6466,6532,6598" } } ] @@ -47,26 +47,26 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\arrays.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,2861,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "to": { - "startLines": "127,131,135,139,142,146,150,154,158,162,166", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8244,8448,8659,8832,8992,9175,9360,9545,9748,9954,10137", - "endLines": "130,134,138,141,145,149,153,157,161,165,169", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8443,8654,8827,8987,9170,9355,9540,9743,9949,10132,10333" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -83,45 +83,45 @@ } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "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,2853,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "137,141,145,149,152,156,160,164,168,172,176", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "9023,9227,9438,9608,9768,9951,10136,10321,10524,10730,10913", + "endLines": "140,144,148,151,155,159,163,167,171,175,179", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9222,9433,9603,9763,9946,10131,10316,10519,10725,10908,11109" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,4,4", - "startOffsets": "8155,4045,4306,4210,4141,827,870,922,7653,7702,8097,8046,1282,4760,4854,4689,4605,4522,5721,5638,5536,5030,2004,1953,3544,1486,1539,5091,2244,4389,7765,3974,3729,2303,2618,2919,2361,3473,3412,3355,3133,3081,2978,3031,3183,2146,3233,2665,3908,3293,3778,2571,2864,2776,2718,3667,2521,3622,2418,2461,3841,2090,1431,1750,1858,1703,1805,1647,1599,1227,1174,6177,6110,6418,7556,6782,6701,6856,6945,7187,7108,6261,6336,6642,6482,6562,6055,7331,7453,8005,7878,7821,7931,1366,4962,5450,5856,5787,5936,5391,5336,5274,5214,974,1084", - "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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": "8559,4136,4384,4301,4205,865,917,969,7697,7760,8150,8092,1361,4849,4957,4755,4684,4600,5782,5716,5633,5086,2061,1999,3617,1534,1594,5191,2298,4486,7815,4040,3773,2356,2660,2973,2413,3539,3468,3407,3178,3128,3026,3076,3228,2205,3288,2713,3969,3350,3836,2613,2914,2859,2771,3724,2566,3662,2456,2516,3903,2141,1481,1800,1906,1745,1853,1698,1642,1277,1222,6256,6172,6477,7647,6851,6777,6940,7103,7326,7182,6331,6413,6696,6557,6637,6105,7448,7551,8041,7926,7873,8000,1426,5025,5531,5931,5851,6025,5445,5386,5331,5269,1079,1169" + "startLines": "151,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,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,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "9502,5244,5321,4529,4793,4696,5038,5131,5425,4626,4978,5516,846,890,943,8990,9040,9443,9391,1308,6060,6155,5988,5903,5819,7034,6950,6847,6333,2043,1991,3630,1515,1569,6395,2307,5684,9104,4457,3818,2367,2688,2994,4033,2426,3558,3496,3438,3212,3159,3054,3108,3263,2206,3314,2736,4390,3375,4088,3868,2640,2938,2849,2790,3755,4157,2589,3709,2484,2528,4322,2149,1459,1784,1894,1736,1840,1679,1630,1252,1198,7497,7429,7741,8891,8110,8028,8185,8275,8519,8439,7582,7658,7968,7806,7887,7373,8664,8787,9349,9220,9162,9274,1393,6264,6760,7171,7101,7252,6700,6644,6581,6520,996,1107", + "endLines": "155,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23", + "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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": "9910,5315,5419,4620,4871,4787,5125,5238,5508,4690,5032,5577,884,937,990,9034,9098,9496,9437,1387,6149,6258,6054,5982,5897,7095,7028,6944,6389,2100,2037,3703,1563,1624,6495,2361,5781,9154,4523,3862,2420,2730,3048,4082,2478,3624,3552,3490,3257,3206,3102,3153,3308,2265,3369,2784,4451,3432,4149,3926,2682,2988,2932,2843,3812,4215,2634,3749,2522,2583,4384,2200,1509,1834,1942,1778,1888,1730,1673,1302,1246,7576,7491,7800,8982,8179,8104,8269,8433,8658,8513,7652,7735,8022,7881,7962,7423,8781,8885,9385,9268,9214,9343,1453,6327,6841,7246,7165,7341,6754,6694,6638,6575,1101,1192" }, "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,125,126", - "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,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,4114,4174,4227,4293,4355,4418,4465,4520,4608,4666,4728,4778,4823,4866,4926,4993,5049,5104,5159,5212,5259,5312,5368,5416,5471,5524,5608,5675,5739,5835,5909,5990,6079,6242,6386,6465,6540,6622,6681,6761,6841,6896,7018,7121,7162,7215,7272,7346,7411,7479,7565,7645,7714,7808,7867,7922,7984,8044,8154", - "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,125,126", - "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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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,4109,4169,4222,4288,4350,4413,4460,4515,4603,4661,4723,4773,4818,4861,4921,4988,5044,5099,5154,5207,5254,5307,5363,5411,5466,5519,5603,5670,5734,5830,5904,5985,6074,6237,6381,6460,6535,6617,6676,6756,6836,6891,7013,7116,7157,7210,7267,7341,7406,7474,7560,7640,7709,7803,7862,7917,7979,8039,8149,8239" + "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,125,126,127,128,129,130,131,132,133,134,135,136", + "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,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1168,1271,1367,1450,1546,1638,1750,1838,1907,1966,2032,2075,2127,2179,2228,2291,2349,2400,2484,2578,2686,2757,2841,2924,2990,3073,3175,3236,3298,3349,3427,3480,3540,3645,3704,3806,3861,3932,3981,4039,4086,4145,4199,4256,4327,4388,4445,4495,4547,4600,4650,4700,4764,4824,4877,4943,5005,5071,5134,5181,5236,5324,5382,5444,5507,5557,5602,5645,5705,5772,5828,5883,5938,5991,6038,6091,6147,6195,6250,6303,6387,6454,6518,6614,6688,6769,6858,7021,7165,7244,7319,7401,7460,7540,7620,7675,7797,7900,7941,7994,8051,8125,8190,8258,8344,8424,8493,8587,8646,8701,8763,8823,8933", + "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,125,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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,1163,1266,1362,1445,1541,1633,1745,1833,1902,1961,2027,2070,2122,2174,2223,2286,2344,2395,2479,2573,2681,2752,2836,2919,2985,3068,3170,3231,3293,3344,3422,3475,3535,3640,3699,3801,3856,3927,3976,4034,4081,4140,4194,4251,4322,4383,4440,4490,4542,4595,4645,4695,4759,4819,4872,4938,5000,5066,5129,5176,5231,5319,5377,5439,5502,5552,5597,5640,5700,5767,5823,5878,5933,5986,6033,6086,6142,6190,6245,6298,6382,6449,6513,6609,6683,6764,6853,7016,7160,7239,7314,7396,7455,7535,7615,7670,7792,7895,7936,7989,8046,8120,8185,8253,8339,8419,8488,8582,8641,8696,8758,8818,8928,9018" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -143,26 +143,7 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\GITwork\\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" - } - }, - { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -179,6 +160,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\software gongcheng\\maomaonote\\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" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index aa64649..551fea2 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,22 +23,22 @@ } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\software gongcheng\\maomaonote\\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" + "startLines": "136,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,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,4,4,4,4,4,4", + "startOffsets": "7681,4303,4368,3926,3859,3785,4155,4225,4438,3734,4101,4509,846,887,936,7223,7269,7626,7575,1225,4966,5035,4906,4840,4776,5710,5649,5585,5169,2937,1398,1452,5224,4668,7327,3674,3097,1836,2123,2374,3295,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3614,2717,3342,3141,2079,2326,2269,2213,3041,3396,2034,2998,1941,1983,3554,1346,1657,1755,1609,1707,1561,1515,1173,1119,6092,6032,6235,7148,6551,6481,6616,6695,6880,6806,6168,6425,6293,6359,5982,6985,7069,7536,7427,7378,7473,1288,5113,5525,5825,5766,5893,5476,5430,5381,5329,985,1052", + "endLines": "138,81,82,76,75,74,79,80,83,73,78,85,19,20,21,127,128,135,134,26,92,93,91,90,89,105,104,103,95,60,29,30,96,87,129,72,63,38,44,49,66,39,59,58,57,53,52,50,51,54,55,45,71,56,67,64,43,48,47,46,62,68,42,61,40,41,70,28,34,36,33,35,32,31,25,24,112,111,114,126,119,118,120,121,123,122,113,117,115,116,110,124,125,133,131,130,132,27,94,102,107,106,108,101,100,99,98,22,23", + "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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": "7855,4362,4432,3994,3920,3853,4219,4297,4501,3779,4149,4561,881,930,979,7263,7321,7675,7620,1282,5029,5107,4960,4900,4834,5760,5704,5643,5218,2992,1446,1509,5304,4744,7372,3728,3135,1884,2161,2420,3336,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3668,2764,3390,3188,2117,2368,2320,2263,3091,3447,2073,3035,1977,2028,3608,1392,1701,1799,1651,1749,1603,1555,1219,1167,6162,6086,6287,7217,6610,6545,6689,6800,6979,6874,6229,6475,6353,6419,6026,7063,7142,7569,7467,7421,7530,1340,5163,5579,5887,5819,5950,5519,5470,5424,5375,1046,1113" }, "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" + "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,107,108,109,110,111,112,113,114,115,116", + "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,4,4,4,4,4,4", + "startOffsets": "215,384,448,517,590,656,729,798,875,943,993,1046,1103,1143,1191,1239,1284,1341,1395,1445,1507,1575,1652,1711,1776,1839,1894,1954,2017,2071,2131,2184,2246,2331,2412,2462,2521,2564,2617,2660,2711,2757,2807,2867,2920,2971,3017,3065,3113,3159,3206,3256,3301,3360,3412,3465,3517,3560,3607,3663,3718,3773,3829,3873,3915,3956,4006,4065,4116,4165,4214,4261,4308,4355,4400,4451,4504,4579,4638,4695,4769,4833,4902,4980,5090,5194,5267,5333,5388,5453,5518,5567,5650,5728,5766,5811,5859,5921,5978,6033,6092,6159,6217,6279,6327,6372,6420,6471,6537", + "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,107,108,109,110,111,112,113,114,115,116", + "endColumns": "14,63,68,72,65,72,68,76,67,49,52,56,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,45,49,59,52,50,45,47,47,45,46,49,44,58,51,52,51,42,46,55,54,54,55,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,443,512,585,651,724,793,870,938,988,1041,1098,1138,1186,1234,1279,1336,1390,1440,1502,1570,1647,1706,1771,1834,1889,1949,2012,2066,2126,2179,2241,2326,2407,2457,2516,2559,2612,2655,2706,2752,2802,2862,2915,2966,3012,3060,3108,3154,3201,3251,3296,3355,3407,3460,3512,3555,3602,3658,3713,3768,3824,3868,3910,3951,4001,4060,4111,4160,4209,4256,4303,4350,4395,4446,4499,4574,4633,4690,4764,4828,4897,4975,5085,5189,5262,5328,5383,5448,5513,5562,5645,5723,5761,5806,5854,5916,5973,6028,6087,6154,6212,6274,6322,6367,6415,6466,6532,6598" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 7247bfb..99aea24 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\GITwork\\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" - } - }, - { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\software gongcheng\\maomaonote\\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" + } } ] } diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 4b7e147..9108461 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,26 +4,26 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\arrays.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,2861,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "to": { - "startLines": "127,131,135,139,142,146,150,154,158,162,166", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8244,8448,8659,8832,8992,9175,9360,9545,9748,9954,10137", - "endLines": "130,134,138,141,145,149,153,157,161,165,169", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8443,8654,8827,8987,9170,9355,9540,9743,9949,10132,10333" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,45 +40,45 @@ } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "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,2853,2634,1073,1258,1443,1647,1854,890,2056" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "137,141,145,149,152,156,160,164,168,172,176", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "9023,9227,9438,9608,9768,9951,10136,10321,10524,10730,10913", + "endLines": "140,144,148,151,155,159,163,167,171,175,179", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "9222,9433,9603,9763,9946,10131,10316,10519,10725,10908,11109" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,4,4", - "startOffsets": "8155,4045,4306,4210,4141,827,870,922,7653,7702,8097,8046,1282,4760,4854,4689,4605,4522,5721,5638,5536,5030,2004,1953,3544,1486,1539,5091,2244,4389,7765,3974,3729,2303,2618,2919,2361,3473,3412,3355,3133,3081,2978,3031,3183,2146,3233,2665,3908,3293,3778,2571,2864,2776,2718,3667,2521,3622,2418,2461,3841,2090,1431,1750,1858,1703,1805,1647,1599,1227,1174,6177,6110,6418,7556,6782,6701,6856,6945,7187,7108,6261,6336,6642,6482,6562,6055,7331,7453,8005,7878,7821,7931,1366,4962,5450,5856,5787,5936,5391,5336,5274,5214,974,1084", - "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,42,65,55,76,66,74,53,58,57,56,72,52,71,50,51,75,41,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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": "8559,4136,4384,4301,4205,865,917,969,7697,7760,8150,8092,1361,4849,4957,4755,4684,4600,5782,5716,5633,5086,2061,1999,3617,1534,1594,5191,2298,4486,7815,4040,3773,2356,2660,2973,2413,3539,3468,3407,3178,3128,3026,3076,3228,2205,3288,2713,3969,3350,3836,2613,2914,2859,2771,3724,2566,3662,2456,2516,3903,2141,1481,1800,1906,1745,1853,1698,1642,1277,1222,6256,6172,6477,7647,6851,6777,6940,7103,7326,7182,6331,6413,6696,6557,6637,6105,7448,7551,8041,7926,7873,8000,1426,5025,5531,5931,5851,6025,5445,5386,5331,5269,1079,1169" + "startLines": "151,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,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,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "9502,5244,5321,4529,4793,4696,5038,5131,5425,4626,4978,5516,846,890,943,8990,9040,9443,9391,1308,6060,6155,5988,5903,5819,7034,6950,6847,6333,2043,1991,3630,1515,1569,6395,2307,5684,9104,4457,3818,2367,2688,2994,4033,2426,3558,3496,3438,3212,3159,3054,3108,3263,2206,3314,2736,4390,3375,4088,3868,2640,2938,2849,2790,3755,4157,2589,3709,2484,2528,4322,2149,1459,1784,1894,1736,1840,1679,1630,1252,1198,7497,7429,7741,8891,8110,8028,8185,8275,8519,8439,7582,7658,7968,7806,7887,7373,8664,8787,9349,9220,9162,9274,1393,6264,6760,7171,7101,7252,6700,6644,6581,6520,996,1107", + "endLines": "155,93,94,85,88,87,91,92,95,86,90,97,19,20,21,141,142,150,149,26,104,105,103,102,101,117,116,115,107,39,38,71,29,30,108,48,99,143,84,74,49,55,60,77,50,70,69,68,64,63,61,62,65,44,66,56,83,67,78,75,54,59,58,57,73,80,53,72,51,52,82,43,28,34,36,33,35,32,31,25,24,124,123,127,139,132,131,133,134,136,135,125,126,130,128,129,122,137,138,148,146,145,147,27,106,114,119,118,120,113,112,111,110,22,23", + "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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": "9910,5315,5419,4620,4871,4787,5125,5238,5508,4690,5032,5577,884,937,990,9034,9098,9496,9437,1387,6149,6258,6054,5982,5897,7095,7028,6944,6389,2100,2037,3703,1563,1624,6495,2361,5781,9154,4523,3862,2420,2730,3048,4082,2478,3624,3552,3490,3257,3206,3102,3153,3308,2265,3369,2784,4451,3432,4149,3926,2682,2988,2932,2843,3812,4215,2634,3749,2522,2583,4384,2200,1509,1834,1942,1778,1888,1730,1673,1302,1246,7576,7491,7800,8982,8179,8104,8269,8433,8658,8513,7652,7735,8022,7881,7962,7423,8781,8885,9385,9268,9214,9343,1453,6327,6841,7246,7165,7341,6754,6694,6638,6575,1101,1192" }, "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,125,126", - "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,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,4114,4174,4227,4293,4355,4418,4465,4520,4608,4666,4728,4778,4823,4866,4926,4993,5049,5104,5159,5212,5259,5312,5368,5416,5471,5524,5608,5675,5739,5835,5909,5990,6079,6242,6386,6465,6540,6622,6681,6761,6841,6896,7018,7121,7162,7215,7272,7346,7411,7479,7565,7645,7714,7808,7867,7922,7984,8044,8154", - "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,125,126", - "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,63,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,55,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,4109,4169,4222,4288,4350,4413,4460,4515,4603,4661,4723,4773,4818,4861,4921,4988,5044,5099,5154,5207,5254,5307,5363,5411,5466,5519,5603,5670,5734,5830,5904,5985,6074,6237,6381,6460,6535,6617,6676,6756,6836,6891,7013,7116,7157,7210,7267,7341,7406,7474,7560,7640,7709,7803,7862,7917,7979,8039,8149,8239" + "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,125,126,127,128,129,130,131,132,133,134,135,136", + "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,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1168,1271,1367,1450,1546,1638,1750,1838,1907,1966,2032,2075,2127,2179,2228,2291,2349,2400,2484,2578,2686,2757,2841,2924,2990,3073,3175,3236,3298,3349,3427,3480,3540,3645,3704,3806,3861,3932,3981,4039,4086,4145,4199,4256,4327,4388,4445,4495,4547,4600,4650,4700,4764,4824,4877,4943,5005,5071,5134,5181,5236,5324,5382,5444,5507,5557,5602,5645,5705,5772,5828,5883,5938,5991,6038,6091,6147,6195,6250,6303,6387,6454,6518,6614,6688,6769,6858,7021,7165,7244,7319,7401,7460,7540,7620,7675,7797,7900,7941,7994,8051,8125,8190,8258,8344,8424,8493,8587,8646,8701,8763,8823,8933", + "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,125,126,127,128,129,130,131,132,133,134,135,136", + "endColumns": "14,75,102,95,82,95,91,111,87,68,58,65,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,53,56,70,60,56,49,51,52,49,49,63,59,52,65,61,65,62,46,54,87,57,61,62,49,44,42,59,66,55,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,1163,1266,1362,1445,1541,1633,1745,1833,1902,1961,2027,2070,2122,2174,2223,2286,2344,2395,2479,2573,2681,2752,2836,2919,2985,3068,3170,3231,3293,3344,3422,3475,3535,3640,3699,3801,3856,3927,3976,4034,4081,4140,4194,4251,4322,4383,4440,4490,4542,4595,4645,4695,4759,4819,4872,4938,5000,5066,5129,5176,5231,5319,5377,5439,5502,5552,5597,5640,5700,5767,5823,5878,5933,5986,6033,6086,6142,6190,6245,6298,6382,6449,6513,6609,6683,6764,6853,7016,7160,7239,7314,7396,7455,7535,7615,7670,7792,7895,7936,7989,8046,8120,8185,8253,8339,8419,8488,8582,8641,8696,8758,8818,8928,9018" } }, { - "source": "D:\\GITwork\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\software gongcheng\\maomaonote\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index e5e8e10..f0999fb 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -11,6 +11,10 @@ "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:/drawable-hdpi_attention4.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention4.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" @@ -71,6 +75,10 @@ "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:/layout_new_password_head.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/new_password_head.xml" + }, { "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" @@ -87,6 +95,26 @@ "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:/layout_homepage.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/homepage.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_attention3.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention3.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_cancel.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/cancel.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_lock.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/lock.png" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_repeat_password_head.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/repeat_password_head.xml" + }, { "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", "source": "net.micode.notes.app-main-6:/layout/note_list.xml" @@ -99,6 +127,10 @@ "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:/layout_layout.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/layout.xml" + }, { "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" @@ -127,10 +159,18 @@ "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_attention2.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention2.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_selector_key_del.xml.flat", + "source": "net.micode.notes.app-main-6:/drawable/selector_key_del.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" @@ -159,6 +199,10 @@ "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_attention5.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention5.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" @@ -183,6 +227,10 @@ "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:/layout_current_password_head.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/current_password_head.xml" + }, { "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", "source": "net.micode.notes.app-main-6:/drawable/new_note.xml" @@ -231,6 +279,10 @@ "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:/drawable-hdpi_attention0.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention0.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" @@ -263,10 +315,26 @@ "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_selector_grid.xml.flat", + "source": "net.micode.notes.app-main-6:/drawable/selector_grid.xml" + }, { "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:/layout_item_grid.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/item_grid.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_password_item.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/password_item.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_encryption.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_encryption.xml" + }, { "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" @@ -327,6 +395,10 @@ "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:/layout_layout2.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/layout2.xml" + }, { "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" @@ -359,10 +431,22 @@ "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:/layout_note_encryption_repeat.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_encryption_repeat.xml" + }, { "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:/layout_note_decryption.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_decryption.xml" + }, + { + "merged": "net.micode.notes.app-merged_res-4:/layout_note_importance.xml.flat", + "source": "net.micode.notes.app-main-6:/layout/note_importance.xml" + }, { "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" @@ -379,6 +463,10 @@ "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-hdpi_attention1.png.flat", + "source": "net.micode.notes.app-main-6:/drawable-hdpi/attention1.png" + }, { "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" diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json deleted file mode 100644 index 55eb456..0000000 --- a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/release.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\GITwork\\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": "D:\\GITwork\\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": "D:\\GITwork\\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,2861,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,8712,8872,9055,9240,9425,9628,9834,10017", - "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,8707,8867,9050,9235,9420,9623,9829,10012,10213" - } - }, - { - "source": "D:\\GITwork\\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": "D:\\GITwork\\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": "D:\\GITwork\\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": "D:\\GITwork\\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" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\GITwork\\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" - } - }, - { - "source": "D:\\GITwork\\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" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 7bf300e..0000000 --- a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "D:\\GITwork\\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": "D:\\GITwork\\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/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index ae6b5fb..0000000 --- a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "D:\\GITwork\\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" - } - }, - { - "source": "D:\\GITwork\\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" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json deleted file mode 100644 index 09e18a8..0000000 --- a/app/build/intermediates/merged_res_blame_folder/release/out/multi-v2/values.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeReleaseResources-2:/values/values.xml", - "map": [ - { - "source": "D:\\GITwork\\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,2861,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,8712,8872,9055,9240,9425,9628,9834,10017", - "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,8707,8867,9050,9235,9420,9623,9829,10012,10213" - } - }, - { - "source": "D:\\GITwork\\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": "D:\\GITwork\\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": "D:\\GITwork\\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": "D:\\GITwork\\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" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json b/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json deleted file mode 100644 index f91cfdb..0000000 --- a/app/build/intermediates/merged_res_blame_folder/release/out/single/release.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/drawable-hdpi/list_background.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/menu/note_list_dropdown.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-5:/layout/note_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-5:/xml/searchable.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/drawable-hdpi/title_alert.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-5:/drawable-hdpi/notification.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/layout/widget_2x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/xml/preferences.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/layout/datetime_picker.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", - "source": "net.micode.notes.app-main-5:/raw/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/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-5:/layout/account_dialog_title.xml" - } -] \ No newline at end of file diff --git a/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb b/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb deleted file mode 100644 index b5e0f98..0000000 --- a/app/build/intermediates/metadata_library_dependencies_report/release/dependencies.pb +++ /dev/null @@ -1,6 +0,0 @@ - -base" - -https://jcenter.bintray.com/", -* -(https://dl.google.com/dl/android/maven2/ \ No newline at end of file diff --git a/app/build/intermediates/navigation_json/release/navigation.json b/app/build/intermediates/navigation_json/release/navigation.json deleted file mode 100644 index 0637a08..0000000 --- a/app/build/intermediates/navigation_json/release/navigation.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/app/build/intermediates/optimized_processed_res/release/output-metadata.json b/app/build/intermediates/optimized_processed_res/release/output-metadata.json deleted file mode 100644 index 9277522..0000000 --- a/app/build/intermediates/optimized_processed_res/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "OPTIMIZED_PROCESSED_RES", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "resources-release-optimize.ap_" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_ b/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_ deleted file mode 100644 index af38931..0000000 Binary files a/app/build/intermediates/optimized_processed_res/release/resources-release-optimize.ap_ and /dev/null differ diff --git a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 7092c0d..9e8d8ca 100644 --- a/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -37,7 +37,8 @@ android:debuggable="true" android:extractNativeLibs="true" android:icon="@drawable/icon_app" - android:label="@string/app_name" > + android:label="@string/app_name" + android:testOnly="true" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/build/intermediates/packaged_manifests/release/output-metadata.json b/app/build/intermediates/packaged_manifests/release/output-metadata.json deleted file mode 100644 index a6b664d..0000000 --- a/app/build/intermediates/packaged_manifests/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PACKAGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png new file mode 100644 index 0000000..64c25b6 Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention0.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png new file mode 100644 index 0000000..e559a95 Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention1.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png new file mode 100644 index 0000000..f29288a Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention2.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png new file mode 100644 index 0000000..460d1d4 Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention3.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png new file mode 100644 index 0000000..983e48e Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention4.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png new file mode 100644 index 0000000..c43d0b4 Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/attention5.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png new file mode 100644 index 0000000..96463e5 Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/cancel.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png new file mode 100644 index 0000000..d19b9ac Binary files /dev/null and b/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/lock.png differ diff --git a/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml b/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml new file mode 100644 index 0000000..e2d3f48 --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/drawable/selector_grid.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml b/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml new file mode 100644 index 0000000..91e8c4d --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/drawable/selector_key_del.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml b/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml index 7717112..0b72974 100644 --- a/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml +++ b/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml @@ -15,29 +15,27 @@ limitations under the License. --> - + + android:singleLine="true" /> + android:layout_marginTop="5dip" + android:gravity="center" /> \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml b/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml new file mode 100644 index 0000000..6979527 --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/layout/current_password_head.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/debug/layout/homepage.xml b/app/build/intermediates/packaged_res/debug/layout/homepage.xml new file mode 100644 index 0000000..0159f78 --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/layout/homepage.xml @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/app/build/intermediates/packaged_res/debug/layout/item_grid.xml b/app/build/intermediates/packaged_res/debug/layout/item_grid.xml new file mode 100644 index 0000000..6e4189d --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/layout/item_grid.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/packaged_res/debug/layout/layout.xml b/app/build/intermediates/packaged_res/debug/layout/layout.xml new file mode 100644 index 0000000..ebe748a --- /dev/null +++ b/app/build/intermediates/packaged_res/debug/layout/layout.xml @@ -0,0 +1,90 @@ + + + + + + + +