diff --git a/doc/~$软件泛读、标注和维护报告.docx b/doc/~$软件泛读、标注和维护报告.docx new file mode 100644 index 0000000..f0cd488 Binary files /dev/null and b/doc/~$软件泛读、标注和维护报告.docx differ diff --git a/doc/~$软件的质量分析报告.docx b/doc/~$软件的质量分析报告.docx new file mode 100644 index 0000000..c5d9766 Binary files /dev/null and b/doc/~$软件的质量分析报告.docx differ diff --git a/doc/开源软件泛读、标注和维护报告.docx b/doc/开源软件泛读、标注和维护报告.docx index 3300d99..f5f4fbc 100644 Binary files a/doc/开源软件泛读、标注和维护报告.docx and b/doc/开源软件泛读、标注和维护报告.docx differ diff --git a/doc/开源软件的质量分析报告.docx b/doc/开源软件的质量分析报告.docx index ec6ff85..5df5452 100644 Binary files a/doc/开源软件的质量分析报告.docx and b/doc/开源软件的质量分析报告.docx differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock index 48a419b..67e7823 100644 Binary files a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock and b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin index b62fcb9..43b24d6 100644 Binary files a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin and b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin index 64b0ebc..3bdf9ac 100644 Binary files a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin and b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin index d76711e..b96acb1 100644 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock index 52b1814..86773c0 100644 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin index 5bb4336..75feee8 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock index 7b76ed5..8cac89a 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin index 752140f..4d52080 100644 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b9f3fe9..57b9b1c 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index dc3263e..e49aa91 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index 7634488..a7d126b 100644 Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/.idea/.name b/src/Notes-master1/.idea/.name deleted file mode 100644 index 7efc0ae..0000000 --- a/src/Notes-master1/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Notes-master \ No newline at end of file diff --git a/src/Notes-master1/.idea/compiler.xml b/src/Notes-master1/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/src/Notes-master1/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/gradle.xml b/src/Notes-master1/.idea/gradle.xml new file mode 100644 index 0000000..87c386d --- /dev/null +++ b/src/Notes-master1/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/jarRepositories.xml b/src/Notes-master1/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/src/Notes-master1/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml index 9eeb5ee..22fd288 100644 --- a/src/Notes-master1/.idea/misc.xml +++ b/src/Notes-master1/.idea/misc.xml @@ -1,5 +1,6 @@ - + + diff --git a/src/Notes-master1/.idea/modules/Notes-master1.iml b/src/Notes-master1/.idea/modules/Notes-master1.iml new file mode 100644 index 0000000..350a1bb --- /dev/null +++ b/src/Notes-master1/.idea/modules/Notes-master1.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/modules/app/Notes-master1.app.androidTest.iml b/src/Notes-master1/.idea/modules/app/Notes-master1.app.androidTest.iml new file mode 100644 index 0000000..3f85566 --- /dev/null +++ b/src/Notes-master1/.idea/modules/app/Notes-master1.app.androidTest.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml b/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml new file mode 100644 index 0000000..09b90e8 --- /dev/null +++ b/src/Notes-master1/.idea/modules/app/Notes-master1.app.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/modules/app/Notes-master1.app.main.iml b/src/Notes-master1/.idea/modules/app/Notes-master1.app.main.iml new file mode 100644 index 0000000..0b4d635 --- /dev/null +++ b/src/Notes-master1/.idea/modules/app/Notes-master1.app.main.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/modules/app/Notes-master1.app.unitTest.iml b/src/Notes-master1/.idea/modules/app/Notes-master1.app.unitTest.iml new file mode 100644 index 0000000..3c6acbb --- /dev/null +++ b/src/Notes-master1/.idea/modules/app/Notes-master1.app.unitTest.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 b/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 new file mode 100644 index 0000000..0f8826a --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/3/e/3e688be40dc69cfd1062f41d0fc27fe261a26710 @@ -0,0 +1,28 @@ + + +AYy_MCIrhZ96u27hlWQ- +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(۫81J$78cabe33-fdec-4896-8858-3dffb6cd43cf + +AYy_MCIrhZ96u27hlWRA +java:S1874k"2Remove this use of "isScreenOn"; it is deprecated.(81J$410b8e61-a445-42fd-8cf5-d1166e448af0 + +AYy_MCIrhZ96u27hlWRB +java:S2147"ECombine this catch with the one at line 132, which has the same body.(81J$7be415e1-cf85-4720-a46d-a2cd48ed1f97 + +AYy_MCIrhZ96u27hlWRC +java:S2147"ECombine this catch with the one at line 137, which has the same body.(81J$73b3af7a-20b7-4c0e-ac45-e13ef2eca0cf + +AYy_MCIrhZ96u27hlWRD +java:S2147"ECombine this catch with the one at line 140, which has the same body.(ﭣ81J$dcfb4ffe-1c9b-4150-a752-cbe71645d21b + +AYy_MCIrhZ96u27hlWRF +java:S1135"2Complete the task associated to this TODO comment.(̐81J$0be5205d-8857-42c6-a649-7460bec089be + +AYy_MCIrhZ96u27hlWRH +java:S1135"2Complete the task associated to this TODO comment.(̐81J$c97bb94a-2f85-411c-be5d-bfc901863045 + +AYy_MCIrhZ96u27hlWRJ +java:S1135"2Complete the task associated to this TODO comment.(̐81J$a193ac8d-8c9b-489f-80a6-f2dcb710677c + +AYy_MCIrhZ96u27hlWRL +java:S1135"2Complete the task associated to this TODO comment.(̐81J$bbdc6931-e361-4731-86f8-73f60aed0a45 \ No newline at end of file diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 b/src/Notes-master1/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master1/.idea/sonarlint/issuestore/index.pb b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..0173990 --- /dev/null +++ b/src/Notes-master1/.idea/sonarlint/issuestore/index.pb @@ -0,0 +1,19 @@ + +h +8app/src/main/java/net/micode/notes/tool/BackupUtils.java,a\4\a446c87b1013132f8adaf83656b582028e8809af +m +=app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java,3\e\3e688be40dc69cfd1062f41d0fc27fe261a26710 +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +< + build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 +l + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle index b09d561..6a8710a 100644 --- a/src/Notes-master1/app/build.gradle +++ b/src/Notes-master1/app/build.gradle @@ -4,7 +4,7 @@ android { namespace "net.micode.notes" compileSdkVersion 22 buildToolsVersion "34.0.0" - useLibrary'org.apache.http.legacy' + defaultConfig { applicationId "net.micode.notes" @@ -19,3 +19,10 @@ android { } } } + +apply plugin: 'org.sonarqube' +sonarqube { + properties { + property "sonar.sources", "src/main/java" + } +} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk index d5f9ef3..8530d4b 100644 Binary files a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5e274974114d425fbd86d75b72b93ec7fb732e5f5aaed2177ada26104cbc53ca_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 9d744e1..bb5f917 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index b67bee5..f5cb4dc 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index fa42419..6705a3e 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sat Dec 02 10:38:54 CST 2023 -net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-6\:/raw/introduction=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +#Sun Dec 31 17:23:39 CST 2023 +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-6\:/raw/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 9df6a76..fa01dcf 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ 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 + #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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 0aebc2a..5558880 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Sat Dec 02 10:38:56 CST 2023 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\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\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +#Sun Dec 31 17:23:40 CST 2023 +net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png +net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png +net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml +net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png +net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png +net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml +net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml +net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png +net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\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\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png +net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml +net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Android\\MiNote\\src\\Notes-master1\\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\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png +net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml +net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml +net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction +net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png +net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png +net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml +net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml +net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png +net.micode.notes.app-main-5\:/raw/introduction=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction +net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png +net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png +net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml +net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml +net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml +net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png +net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png +net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png +net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml +net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png +net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml +net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png +net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml +net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml +net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml +net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png +net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml +net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml +net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png +net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png +net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml +net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png +net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml +net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml index 9df6a76..fa01dcf 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ 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 + #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新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签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新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽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/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index de63f42..a93361f 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/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/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index bb3f39a..601109b 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/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/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 58b70ec..133e628 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/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/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index c0f4fc2..5235945 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sat Dec 02 10:43:26 CST 2023 -base.0=D\:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Wed Jan 03 11:09:55 CST 2024 +base.0=D\:\\Android\\MiNote\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex path.0=classes.dex renamed.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index cfa6488..ee4873f 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index 5aaf1d4..9b2d85c 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 359609e..d3c2e41 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 63e7f9c..eb10de2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index 6a86737..ed15dfa 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 98353eb..62966db 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class index a1d202d..6b270bb 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class index a41b775..eeec214 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class index 029286f..909a321 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class index e65c35c..bbd5303 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class index de51bad..d6def6d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class index d04cbe7..a418b42 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 400d289..2829c59 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class index 415e755..238d2a8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 71e5215..7b6af7f 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class index ddd74fd..7dd1e34 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 54e7df6..4c39e11 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index fad3442..4689013 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 023f716..0c394b2 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 5416cd3..690ee05 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index bb9f786..5dfccb8 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 961f2f4..d7f2b7e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 8e1f0bf..7011069 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 7d0a456..6bf1d0a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index f1ba220..abb2cdd 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 76c0c9d..a5525b1 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index 0fd6977..c04be49 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 0468652..3f55dfc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 54fa572..8e75a2e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 062ecb5..696cf5b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index c217873..b9e480e 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d3dbb60..030b495 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 8f0a21b..9d1a9a7 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 127437f..e0dd8a4 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 3981f16..7926ed3 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 99e161f..3d71132 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index f249e33..862adcf 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 81f06d3..3301a16 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index 3d4e8b1..72d3c56 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 83dc6c8..47cc249 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 9ccd78a..440f2f1 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 68b46ae..00291c5 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 1375379..74a44ee 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "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" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,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", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -47,51 +47,13 @@ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "map": [ { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\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:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "783,836,890,944,730", "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "endOffsets": "830,884,938,991,777" }, "to": { "startLines": "13,14,15,16,17", @@ -102,14 +64,14 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", "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" + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,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", @@ -121,13 +83,13 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -136,40 +98,59 @@ "endColumns": "56", "endOffsets": "472" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ + }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" + "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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "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": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ + { + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "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" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,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", @@ -179,6 +160,25 @@ "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:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 64c257d..c14e1a2 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "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" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,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", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index ba6ba94..a0c1836 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,33 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "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" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,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", @@ -40,6 +21,25 @@ "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:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index b7d1834..fc95104 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,51 +4,13 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "map": [ { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\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:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "783,836,890,944,730", "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "endOffsets": "830,884,938,991,777" }, "to": { "startLines": "13,14,15,16,17", @@ -59,14 +21,14 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", "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" + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,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", @@ -78,13 +40,13 @@ } }, { - "source": "D:\\Android\\AndroidStudioProjects\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -93,6 +55,44 @@ "endColumns": "56", "endOffsets": "472" } + }, + { + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\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": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "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": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + } + }, + { + "source": "D:\\Android\\MiNote\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index cec6ad0..c2f3271 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 137bd02..28f0054 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 82a15e2..99fda12 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 4ec8e86..f44b683 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index d474cc6..d138de6 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index fe16853..9a7b06d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex index 07ef22e..0292b25 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex index 9278ab0..07bdff5 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex index eed3350..60e35c3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex index 88dead1..d94b016 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex index afad0e0..ed11914 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex index 01e1c18..2e2a40a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index e1205dd..47493ef 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex index 2c10036..f7d7c0a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 5bba515..3376279 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex index 49a8b16..d3405df 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 92250f2..8482ff7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 1f9408f..0fbd340 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index cce08c4..9a99dd9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 1edfd0a..56fa57a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index bc46bd9..3072bb3 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 6e54685..828e07a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 3a9b0bf..1d1ec6b 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 16b7373..b7c1a80 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index c95399d..0921bd5 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 79c670f..9274ac4 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index ad34861..bf85766 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index a0a58e1..e74b05c 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index b419ff2..9143214 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 8e51dd7..b759436 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 1519f8d..f398e07 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 09676c5..6cd30f7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 79b3edd..f5a1e7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 2b33a92..676f85d 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 5be9167..521732f 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index a062b8d..6307982 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 9463e10..998c399 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index dff3aea..4f2519b 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index 39389fd..cfad8af 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 0f4a76c..311983a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt index 0e3d40e..3233259 100644 --- a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,7 +1,7 @@ -net.micode.notes.app-pngs-0 D:\Android\AndroidStudioProjects\Notes-master1\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Android\AndroidStudioProjects\Notes-master1\app\build\generated\res\resValues\debug -net.micode.notes.app-packageDebugResources-2 D:\Android\AndroidStudioProjects\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -net.micode.notes.app-packageDebugResources-3 D:\Android\AndroidStudioProjects\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -net.micode.notes.app-merged_res-4 D:\Android\AndroidStudioProjects\Notes-master1\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-5 D:\Android\AndroidStudioProjects\Notes-master1\app\src\debug\res -net.micode.notes.app-main-6 D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\res +net.micode.notes.app-pngs-0 D:\Android\MiNote\src\Notes-master1\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\Android\MiNote\src\Notes-master1\app\build\generated\res\resValues\debug +net.micode.notes.app-packageDebugResources-2 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir +net.micode.notes.app-packageDebugResources-3 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir +net.micode.notes.app-merged_res-4 D:\Android\MiNote\src\Notes-master1\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-5 D:\Android\MiNote\src\Notes-master1\app\src\debug\res +net.micode.notes.app-main-6 D:\Android\MiNote\src\Notes-master1\app\src\main\res diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt index 10efea9..fc46af0 100644 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\Android\AndroidStudioProjects\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\Android\MiNote\src\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 54ac520..fabff09 100644 Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java index 6a19454..145de5c 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java @@ -178,12 +178,18 @@ public class Task extends Node { public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) || !js.has(GTaskStringUtils.META_HEAD_DATA)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); + Log.w(TAG, "setContentByLocalJSON: nothing is available"); + return; } try { - JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); - JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); + JSONObject note = js.optJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONArray dataArray = js.optJSONArray(GTaskStringUtils.META_HEAD_DATA); + + if (note == null || dataArray == null) { + Log.w(TAG, "setContentByLocalJSON: note or dataArray is null"); + return; + } if (note.getInt(NoteColumns.TYPE) != Notes.TYPE_NOTE) { Log.e(TAG, "invalid type"); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java index 4ea21c5..5cc6b57 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java @@ -131,21 +131,30 @@ public class TaskList extends Node { public void setContentByLocalJSON(JSONObject js) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { - Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); + Log.w(TAG, "setContentByLocalJSON: nothing is available"); + return; } try { - JSONObject folder = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); + JSONObject folder = js.optJSONObject(GTaskStringUtils.META_HEAD_NOTE); - if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_FOLDER) { + if (folder == null) { + Log.w(TAG, "setContentByLocalJSON: folder is null"); + return; + } + + int folderType = folder.getInt(NoteColumns.TYPE); + + if (folderType == Notes.TYPE_FOLDER) { String name = folder.getString(NoteColumns.SNIPPET); setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + name); - } else if (folder.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { - if (folder.getLong(NoteColumns.ID) == Notes.ID_ROOT_FOLDER) + } else if (folderType == Notes.TYPE_SYSTEM) { + long folderId = folder.getLong(NoteColumns.ID); + + if (folderId == Notes.ID_ROOT_FOLDER) setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_DEFAULT); - else if (folder.getLong(NoteColumns.ID) == Notes.ID_CALL_RECORD_FOLDER) - setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX - + GTaskStringUtils.FOLDER_CALL_NOTE); + else if (folderId == Notes.ID_CALL_RECORD_FOLDER) + setName(GTaskStringUtils.MIUI_FOLDER_PREFFIX + GTaskStringUtils.FOLDER_CALL_NOTE); else Log.e(TAG, "invalid system folder"); } else { @@ -157,6 +166,7 @@ public class TaskList extends Node { } } + public JSONObject getLocalJSONFromContent() { try { JSONObject js = new JSONObject(); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java index c67dfdf..501bb6d 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java @@ -112,7 +112,7 @@ public class GTaskClient { public boolean login(Activity activity) { // we suppose that the cookie would expire after 5 minutes // then we need to re-login - final long interval = 1000 * 60 * 5; + final long interval = 1000 * 60 * 5L; if (mLastLoginTime + interval < System.currentTimeMillis()) { mLoggedin = false; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec4..c5a6050 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -284,28 +284,27 @@ public class BackupUtils { /** * Get a print stream pointed to the file {@generateExportedTextFile} + * 生成一个用于输出到文本文件的PrintStream对象，并将生成的文件名和文件路径保存在mFileName和mFileDirectory变量中。如果生成文件失败，则返回一个空的PrintStream对象。 */ private PrintStream getExportToTextPrintStream() { - File file = generateFileMountedOnSDcard(mContext, R.string.file_path, - R.string.file_name_txt_format); + File file = generateFileMountedOnSDcard(mContext, R.string.file_path, R.string.file_name_txt_format); if (file == null) { Log.e(TAG, "create file to exported failed"); return null; } mFileName = file.getName(); mFileDirectory = mContext.getString(R.string.file_path); - PrintStream ps = null; - try { - FileOutputStream fos = new FileOutputStream(file); - ps = new PrintStream(fos); + + try (FileOutputStream fos = new FileOutputStream(file); + PrintStream ps = new PrintStream(fos)) { + return ps; } catch (FileNotFoundException e) { e.printStackTrace(); - return null; - } catch (NullPointerException e) { + } catch (NullPointerException | IOException e) { e.printStackTrace(); - return null; } - return ps; + + return null; } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java index 3605b50..a2747dd 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -44,9 +44,9 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD private String mSnippet; //闹钟提示时出现的文本片段 private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; - + @Override - protected void onCreate(Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的 //onsaveInstanceState方法是用来保存Activity的状态的 @@ -54,24 +54,24 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD requestWindowFeature(Window.FEATURE_NO_TITLE); // 请求无标题的窗口特性 - + final Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); - + // 如果屏幕关闭，添加一些窗口标志，以保持屏幕开启 if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON - //保持窗体点亮 + //保持窗体点亮 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON //将窗体点亮 | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON //允许窗体点亮时锁屏 | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); }//在手机锁屏后如果到了闹钟提示时间，点亮屏幕 - + Intent intent = getIntent(); //获取传递给活动的Intent - + try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); //从Intent中提取文本的ID号 @@ -86,7 +86,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD e.printStackTrace(); return; } - + // 创建MediaPlayer实例 mPlayer = new MediaPlayer(); // 如果文本在数据库中可见，则显示对话框并播放闹钟声音 @@ -100,20 +100,20 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD //完成闹钟动作 } } - - + + private boolean isScreenOn() { PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); }//判断屏幕是否锁屏，调用系统函数判断，最后返回值是布尔类型 - + private void playAlarmSound() { - //闹钟提示音激发 + //闹钟提示音激发 Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); //调用系统的铃声管理URI，得到闹钟提示音,获取静音模式下受影响的音频流 int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - + // 设置MediaPlayer的音频流类型 if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { mPlayer.setAudioStreamType(silentModeStreams); @@ -145,7 +145,7 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD e.printStackTrace(); } } - + // 显示操作对话框 private void showActionDialog() { AlertDialog.Builder dialog = new AlertDialog.Builder(this); @@ -165,12 +165,12 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD dialog.show().setOnDismissListener(this); // 显示对话框并设置对话框的Dismiss监听器 } - + public void onClick(DialogInterface dialog, int which) { switch (which) { - //用which来选择click后下一步的操作 + //用which来选择click后下一步的操作 case DialogInterface.BUTTON_NEGATIVE: - //这是取消操作 + //这是取消操作 Intent intent = new Intent(this, NoteEditActivity.class); //实现两个类间的数据传输，启动NoteEditActivity以编辑文本 intent.setAction(Intent.ACTION_VIEW); @@ -182,19 +182,19 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD //开始动作 break; default: - //这是确定操作 + //这是确定操作 break; }// 对话框按钮点击事件处理 } - + public void onDismiss(DialogInterface dialog) { - //忽略 + //忽略 stopAlarmSound(); //停止闹钟声音 finish(); //完成该动作 }// 对话框Dismiss事件处理 - + private void stopAlarmSound() { if (mPlayer != null) { mPlayer.stop(); @@ -203,4 +203,5 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD //释放MediaPlayer对象 mPlayer = null; } - }// 停止播放闹钟声音 \ No newline at end of file + }// 停止播放闹钟声音 +} \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java index 00a2409..58ab008 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java @@ -83,13 +83,13 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) { mOnDateTimeSetListener = callBack; }//将时间日期滚动选择控件实例化 - + private void updateTitle(long date) { int flag = DateUtils.FORMAT_SHOW_YEAR | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_TIME; - flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR; + flag |= DateUtils.FORMAT_24HOUR; setTitle(DateUtils.formatDateTime(this.getContext(), date, flag)); }//android开发中常见日期管理工具类（API）——DateUtils：按照上下午显示时间 diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 00dfb3a..4a4e54b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -14,7 +14,6 @@ * limitations under the License. */ - package net.micode.notes.ui; import android.app.Activity; @@ -460,7 +459,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (id == R.id.btn_set_bg_color) { mNoteBgColorSelector.setVisibility(View.VISIBLE); findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( - - View.VISIBLE); + View.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -543,70 +542,51 @@ public class NoteEditActivity extends Activity implements OnClickListener, * 函数实现：如下注释 */ public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - //根据菜单的id来编剧相关项目 - case R.id.menu_new_note: - //创建一个新的便签 - createNewNote(); - break; - case R.id.menu_delete: - //删除便签 - AlertDialog.Builder builder = new AlertDialog.Builder(this); - //创建关于删除操作的对话框 - builder.setTitle(getString(R.string.alert_title_delete)); - // 设置标签的标题为alert_title_delete - builder.setIcon(android.R.drawable.ic_dialog_alert); - //设置对话框图标 - builder.setMessage(getString(R.string.alert_message_delete_note)); - //设置对话框内容 - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - //建立按键监听器 - public void onClick(DialogInterface dialog, int which) { - //点击所触发事件 - deleteCurrentNote(); - // 删除单签便签 - finish(); - } - }); - //添加“YES”按钮 - builder.setNegativeButton(android.R.string.cancel, null); - //添加“NO”的按钮 - builder.show(); - //显示对话框 - break; - case R.id.menu_font_size: - //字体大小的编辑 - mFontSizeSelector.setVisibility(View.VISIBLE); + int itemId = item.getItemId();//根据菜单的id来编辑相关项目 + if (itemId == R.id.menu_new_note) {//创建一个新的便签 + createNewNote(); + } else if (itemId == R.id.menu_delete) {//删除便签 + AlertDialog.Builder builder = new AlertDialog.Builder(this); + //创建关于删除操作的对话框 + builder.setTitle(getString(R.string.alert_title_delete)); + // 设置标签的标题为alert_title_delete + builder.setIcon(android.R.drawable.ic_dialog_alert); + //设置对话框图标 + builder.setMessage(getString(R.string.alert_message_delete_note)); + //设置对话框内容 + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + //建立按键监听器 + public void onClick(DialogInterface dialog, int which) { + //点击所触发事件 + deleteCurrentNote(); + // 删除单签便签 + finish(); + } + }); + //添加“YES”按钮 + builder.setNegativeButton(android.R.string.cancel, null); + //添加“NO”的按钮 + builder.show(); + //显示对话框 + } else if (itemId == R.id.menu_font_size) {//字体大小的编辑 + mFontSizeSelector.setVisibility(View.VISIBLE); // 将字体选择器置为可见 - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); // 通过id找到相应的大小 - break; - case R.id.menu_list_mode: - //选择列表模式 - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - break; - case R.id.menu_share: - //菜单共享 - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - // 用sendto函数将运行文本发送到遍历的本文内 - break; - case R.id.menu_send_to_desktop: - //发送到桌面 - sendToDesktop(); - break; - case R.id.menu_alert: - //创建提醒器 - setReminder(); - break; - case R.id.menu_delete_remind: - //删除日期提醒 - mWorkingNote.setAlertDate(0, false); - break; - default: - break; + } else if (itemId == R.id.menu_list_mode) {//选择列表模式 + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + } else if (itemId == R.id.menu_share) {//菜单共享 + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + // 用sendto函数将运行文本发送到遍历的本文内 + } else if (itemId == R.id.menu_send_to_desktop) {//发送到桌面 + sendToDesktop(); + } else if (itemId == R.id.menu_alert) {//创建提醒器 + setReminder(); + } else if (itemId == R.id.menu_delete_remind) {//删除日期提醒 + mWorkingNote.setAlertDate(0, false); } return true; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 6db3761..5efccd9 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -161,33 +161,18 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) { StringBuilder sb = new StringBuilder(); - InputStream in = null; - try { - in = getResources().openRawResource(R.raw.introduction); - if (in != null) { - InputStreamReader isr = new InputStreamReader(in); - BufferedReader br = new BufferedReader(isr); - char [] buf = new char[1024]; - int len = 0; - while ((len = br.read(buf)) > 0) { - sb.append(buf, 0, len); - } - } else { - Log.e(TAG, "Read introduction file error"); - return; + try (InputStream in = getResources().openRawResource(R.raw.introduction); + InputStreamReader isr = new InputStreamReader(in); + BufferedReader br = new BufferedReader(isr)) { + + char[] buf = new char[1024]; + int len = 0; + while ((len = br.read(buf)) > 0) { + sb.append(buf, 0, len); } } catch (IOException e) { e.printStackTrace(); return; - } finally { - if(in != null) { - try { - in.close(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } } WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER, diff --git a/src/Notes-master1/build.gradle b/src/Notes-master1/build.gradle index 170b4c1..d173b85 100644 --- a/src/Notes-master1/build.gradle +++ b/src/Notes-master1/build.gradle @@ -9,9 +9,14 @@ buildscript { } } +plugins { + id "org.sonarqube" version "4.4.1.3373" +} +apply plugin: 'org.sonarqube' + allprojects { repositories { jcenter() google() } -} +} \ No newline at end of file