diff --git a/Doc/小米便签.docx b/Doc/小米便签.docx index 3a78696..d02891b 100644 Binary files a/Doc/小米便签.docx and b/Doc/小米便签.docx differ diff --git a/Doc/小米便签的质量分析报告文档 .docx b/Doc/小米便签的质量分析报告文档 .docx new file mode 100644 index 0000000..6db0f89 Binary files /dev/null and b/Doc/小米便签的质量分析报告文档 .docx differ diff --git a/Src/.gradle/7.5/checksums/checksums.lock b/Src/.gradle/7.5/checksums/checksums.lock index 1acaf8b..90feb6d 100644 Binary files a/Src/.gradle/7.5/checksums/checksums.lock and b/Src/.gradle/7.5/checksums/checksums.lock differ diff --git a/Src/.gradle/7.5/checksums/md5-checksums.bin b/Src/.gradle/7.5/checksums/md5-checksums.bin index 2d15507..99480df 100644 Binary files a/Src/.gradle/7.5/checksums/md5-checksums.bin and b/Src/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/Src/.gradle/7.5/checksums/sha1-checksums.bin b/Src/.gradle/7.5/checksums/sha1-checksums.bin index bf36d73..2908e37 100644 Binary files a/Src/.gradle/7.5/checksums/sha1-checksums.bin and b/Src/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.bin b/Src/.gradle/7.5/executionHistory/executionHistory.bin index aa77335..b049d5c 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.bin and b/Src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.lock b/Src/.gradle/7.5/executionHistory/executionHistory.lock index c4ed3e2..58af3e7 100644 Binary files a/Src/.gradle/7.5/executionHistory/executionHistory.lock and b/Src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.bin b/Src/.gradle/7.5/fileHashes/fileHashes.bin index d148d6f..5f3c22e 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.bin and b/Src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/Src/.gradle/7.5/fileHashes/fileHashes.lock b/Src/.gradle/7.5/fileHashes/fileHashes.lock index b0fffd7..814a9a1 100644 Binary files a/Src/.gradle/7.5/fileHashes/fileHashes.lock and b/Src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin b/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin index dd0fae3..2321f71 100644 Binary files a/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/Src/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6fe3abd..b457b67 100644 Binary files a/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Src/.gradle/buildOutputCleanup/outputFiles.bin b/Src/.gradle/buildOutputCleanup/outputFiles.bin index 83e4a48..6351dd7 100644 Binary files a/Src/.gradle/buildOutputCleanup/outputFiles.bin and b/Src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/Src/.gradle/file-system.probe b/Src/.gradle/file-system.probe index 29f14ce..30487a8 100644 Binary files a/Src/.gradle/file-system.probe and b/Src/.gradle/file-system.probe differ diff --git a/Src/.idea/misc.xml b/Src/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/Src/.idea/misc.xml +++ b/Src/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/Src/.idea/vcs.xml b/Src/.idea/vcs.xml index 94a25f7..288b36b 100644 --- a/Src/.idea/vcs.xml +++ b/Src/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/Src/.vscode/settings.json b/Src/.vscode/settings.json new file mode 100644 index 0000000..120329c --- /dev/null +++ b/Src/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "modelbox.modelboxPath": "C:\\Users\\zjb\\.modelbox" +} \ No newline at end of file diff --git a/Src/app/build/intermediates/apk/debug/app-debug.apk b/Src/app/build/intermediates/apk/debug/app-debug.apk index 2e22a84..682fc1d 100644 Binary files a/Src/app/build/intermediates/apk/debug/app-debug.apk and b/Src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index a54964f..4a942de 100644 Binary files a/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/Src/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_0/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_0/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_0/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_0/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_1/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_1/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_1/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_1/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_2/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_2/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_2/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_2/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_3/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_3/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_3/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_3/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_4/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_4/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_4/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_4/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_5/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_5/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_5/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_5/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_6/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_6/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_6/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_6/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_7/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_7/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_7/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_7/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_8/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_8/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_8/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_8/graph.bin diff --git a/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_9/graph.bin b/Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_9/graph.bin similarity index 100% rename from Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_e3365ef6b7400f46865136742882ee8e320a2aacd2f3664132a0623836b34150_bucket_9/graph.bin rename to Src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6f295579341b6476c4a0cb142abf36fa87453c4286edaf45c0a67d3ca4b21d4b_bucket_9/graph.bin diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex index 1e123d0..bd56980 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex index 1497a2d..69a89a2 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex index 82968e7..ff7f276 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/13/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex index e197811..6a6e52e 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex index 64a8523..d235de6 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex index 2fe5ef2..6e28ae8 100644 Binary files a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/5/classes.dex differ diff --git a/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex new file mode 100644 index 0000000..ac36ded Binary files /dev/null and b/Src/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex differ diff --git a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 2d09eee..c21f051 100644 Binary files a/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 6599c76..9066275 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,98 @@ -#Tue Oct 15 08:27:37 CST 2024 -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Notes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +#Mon Dec 23 12:36:51 CST 2024 +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/layout/activity_login.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_login.xml.flat +net.micode.notes.app-main-7\:/layout/activity_register.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_register.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index a9cf5ee..0000000 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index c16ca6b..388a928 100644 --- a/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/Src/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\" - + + visible + 短信 邮件 - 便签便签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/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 4874e9c..82f5968 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/Src/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/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 3f17526..eb9178d 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/Src/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/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index a702034..4bd4fb6 100644 --- a/Src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/Src/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/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 2259379..fb0c1b4 100644 --- a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,11 +1,12 @@ -#Tue Oct 15 08:27:46 CST 2024 -base.0=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex -base.1=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex -base.2=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex -base.3=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex -base.4=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex -base.5=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex -base.6=D\:\\Notes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +#Mon Dec 23 14:54:49 CST 2024 +base.0=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex +base.1=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex +base.2=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex +base.3=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex +base.4=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex +base.5=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex +base.6=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex +base.7=D\:\\github\\XiaoMiNote\\Src\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\8\\classes.dex path.0=0/classes.dex path.1=11/classes.dex path.2=12/classes.dex @@ -13,6 +14,7 @@ path.3=13/classes.dex path.4=15/classes.dex path.5=4/classes.dex path.6=5/classes.dex +path.7=8/classes.dex renamed.0=classes.dex renamed.1=classes2.dex renamed.2=classes3.dex @@ -20,3 +22,4 @@ renamed.3=classes4.dex renamed.4=classes5.dex renamed.5=classes6.dex renamed.6=classes7.dex +renamed.7=classes8.dex diff --git a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 87f5c60..bb9666d 100644 Binary files a/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/Src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 70158fb..286e686 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index c40a8f9..da0b7b9 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index 6bb9e91..bf082d0 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index 8488382..4bfa98f 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index e916136..e3a6b1f 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class index 64fe9eb..4be696a 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index a327029..0ef6262 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class new file mode 100644 index 0000000..484d5c9 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/UserDao.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index 62a3f51..40baac0 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class index e68c5fa..044303e 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index 61126e7..77635be 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class index 8336b28..2d65e49 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class index b8e4f50..b5e6770 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 7d648c4..ec662d4 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class index 1e86ebe..af01044 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class index 076f573..8062132 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class index 2b887d3..50f3c77 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 287af5c..8c28474 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class new file mode 100644 index 0000000..d232e12 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/LoginActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class new file mode 100644 index 0000000..3be4143 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/login/RegisterActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index c4c0e52..299f9a1 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index 3bdb89b..6cc7740 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index ac28d86..047a334 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index ad86e98..1c2af93 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 1871ddd..884f02e 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 26ebe5c..c2d5b46 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index e65f4dd..a467d26 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index dd5e8c2..356f74e 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class new file mode 100644 index 0000000..ef3d8e5 Binary files /dev/null and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index ece883c..d0b8ade 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 06f3508..0017e6c 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 95e896f..a8a5767 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 86a5aa4..2f25f41 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 59b7eb7..ace5aab 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 24d3c68..22fa131 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 57be69e..30cd3b7 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index f7be182..62b17c6 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index 2313ce1..494f3ad 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index e7ff5a9..29b2462 100644 Binary files a/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class differ diff --git a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index ff8a716..e5519dd 100644 --- a/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/Src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -1,277 +1,259 @@ 1 -2 -3 -4 -8 D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -9 android:minSdkVersion="21" -9-->D:\Notes\app\src\main\AndroidManifest.xml:11:15-41 -10 android:targetSdkVersion="21" /> -10-->D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -11 -12 -13 -13-->D:\Notes\app\src\main\AndroidManifest.xml:14:5-81 -13-->D:\Notes\app\src\main\AndroidManifest.xml:14:22-78 -14 -14-->D:\Notes\app\src\main\AndroidManifest.xml:15:5-88 -14-->D:\Notes\app\src\main\AndroidManifest.xml:15:22-85 -15 -15-->D:\Notes\app\src\main\AndroidManifest.xml:16:5-67 -15-->D:\Notes\app\src\main\AndroidManifest.xml:16:22-64 -16 -16-->D:\Notes\app\src\main\AndroidManifest.xml:17:5-72 -16-->D:\Notes\app\src\main\AndroidManifest.xml:17:22-69 -17 -17-->D:\Notes\app\src\main\AndroidManifest.xml:18:5-74 -17-->D:\Notes\app\src\main\AndroidManifest.xml:18:22-71 -18 -18-->D:\Notes\app\src\main\AndroidManifest.xml:19:5-80 -18-->D:\Notes\app\src\main\AndroidManifest.xml:19:22-77 -19 -19-->D:\Notes\app\src\main\AndroidManifest.xml:20:5-71 -19-->D:\Notes\app\src\main\AndroidManifest.xml:20:22-68 -20 -20-->D:\Notes\app\src\main\AndroidManifest.xml:21:5-74 -20-->D:\Notes\app\src\main\AndroidManifest.xml:21:22-71 -21 -21-->D:\Notes\app\src\main\AndroidManifest.xml:22:5-81 -21-->D:\Notes\app\src\main\AndroidManifest.xml:22:22-78 -22 -23 D:\Notes\app\src\main\AndroidManifest.xml:25:5-146:19 -24 android:debuggable="true" -25 android:icon="@drawable/icon_app" -25-->D:\Notes\app\src\main\AndroidManifest.xml:26:9-42 -26 android:label="@string/app_name" -26-->D:\Notes\app\src\main\AndroidManifest.xml:27:9-41 -27 android:testOnly="true" > -28 -29 -30 D:\Notes\app\src\main\AndroidManifest.xml:29:9-41:20 -31 android:name="net.micode.notes.ui.NotesListActivity" -31-->D:\Notes\app\src\main\AndroidManifest.xml:30:13-49 -32 android:configChanges="keyboardHidden|orientation|screenSize" -32-->D:\Notes\app\src\main\AndroidManifest.xml:31:13-74 -33 android:label="@string/app_name" -33-->D:\Notes\app\src\main\AndroidManifest.xml:32:13-45 -34 android:launchMode="singleTop" -34-->D:\Notes\app\src\main\AndroidManifest.xml:33:13-43 -35 android:theme="@style/NoteTheme" -35-->D:\Notes\app\src\main\AndroidManifest.xml:34:13-45 -36 android:uiOptions="splitActionBarWhenNarrow" -36-->D:\Notes\app\src\main\AndroidManifest.xml:35:13-57 -37 android:windowSoftInputMode="adjustPan" > -37-->D:\Notes\app\src\main\AndroidManifest.xml:36:13-52 -38 -38-->D:\Notes\app\src\main\AndroidManifest.xml:37:13-40:29 -39 -39-->D:\Notes\app\src\main\AndroidManifest.xml:38:17-69 -39-->D:\Notes\app\src\main\AndroidManifest.xml:38:25-66 -40 -41 -41-->D:\Notes\app\src\main\AndroidManifest.xml:39:17-77 -41-->D:\Notes\app\src\main\AndroidManifest.xml:39:27-74 -42 -43 +2 +6 +7 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +9 android:targetSdkVersion="21" /> +9-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +10 +11 +12 +12-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:5-81 +12-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:22-78 +13 +13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:5-67 +13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:22-64 +14 +14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-72 +14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:22-69 +15 +15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:5-81 +15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:22-78 +16 +17 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-134:19 +18 android:debuggable="true" +19 android:icon="@drawable/icon_app" +19-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:9-42 +20 android:label="@string/app_name" +20-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:9-41 +21 android:testOnly="true" > +22 +23 +24 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:9-26:20 +25 android:name="net.micode.notes.login.LoginActivity" +25-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:13-48 +26 android:launchMode="singleTop" > +26-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:13-43 +27 +27-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:13-25:29 +28 +28-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:17-69 +28-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:25-66 +29 +30 +30-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:17-77 +30-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:27-74 +31 +32 +33 +34 +35 +35-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:9-60 +35-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:19-57 +36 +37 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:31:9-37:55 +38 android:name="net.micode.notes.ui.NotesListActivity" +38-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:13-49 +39 android:configChanges="keyboardHidden|orientation|screenSize" +39-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-74 +40 android:label="@string/app_name" +40-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:13-45 +41 android:launchMode="singleTop" +41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-43 +42 android:theme="@style/NoteTheme" +42-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-45 +43 android:windowSoftInputMode="adjustPan" /> +43-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-52 44 45 46 D:\Notes\app\src\main\AndroidManifest.xml:44:9-76:20 +46-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:40:9-66:20 47 android:name="net.micode.notes.ui.NoteEditActivity" -47-->D:\Notes\app\src\main\AndroidManifest.xml:45:13-48 +47-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:41:13-48 48 android:configChanges="keyboardHidden|orientation|screenSize" -48-->D:\Notes\app\src\main\AndroidManifest.xml:46:13-74 +48-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:42:13-74 49 android:launchMode="singleTop" -49-->D:\Notes\app\src\main\AndroidManifest.xml:47:13-43 +49-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:43:13-43 50 android:theme="@style/NoteTheme" > -50-->D:\Notes\app\src\main\AndroidManifest.xml:48:13-45 -51 -52 -53 -53-->D:\Notes\app\src\main\AndroidManifest.xml:50:13-58:29 -53-->D:\Notes\app\src\main\AndroidManifest.xml:51:17-38 -54 -54-->D:\Notes\app\src\main\AndroidManifest.xml:53:17-69 -54-->D:\Notes\app\src\main\AndroidManifest.xml:53:25-66 +50-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:13-45 +51 +51-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:13-52:29 +51-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:17-38 +52 +52-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:17-69 +52-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:25-66 +53 +54 +54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:17-76 +54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:27-73 55 -56 -56-->D:\Notes\app\src\main\AndroidManifest.xml:54:17-76 -56-->D:\Notes\app\src\main\AndroidManifest.xml:54:27-73 -57 -58 -58-->D:\Notes\app\src\main\AndroidManifest.xml:56:17-78 -58-->D:\Notes\app\src\main\AndroidManifest.xml:56:23-75 -59 -59-->D:\Notes\app\src\main\AndroidManifest.xml:56:17-78 -59-->D:\Notes\app\src\main\AndroidManifest.xml:56:23-75 -60 -61 -62 -62-->D:\Notes\app\src\main\AndroidManifest.xml:60:13-66:29 -63 -63-->D:\Notes\app\src\main\AndroidManifest.xml:61:17-79 -63-->D:\Notes\app\src\main\AndroidManifest.xml:61:25-76 -64 -65 -65-->D:\Notes\app\src\main\AndroidManifest.xml:54:17-76 -65-->D:\Notes\app\src\main\AndroidManifest.xml:54:27-73 -66 -67 -67-->D:\Notes\app\src\main\AndroidManifest.xml:56:17-78 -67-->D:\Notes\app\src\main\AndroidManifest.xml:56:23-75 -68 -68-->D:\Notes\app\src\main\AndroidManifest.xml:56:17-78 -68-->D:\Notes\app\src\main\AndroidManifest.xml:56:23-75 -69 -70 -71 -71-->D:\Notes\app\src\main\AndroidManifest.xml:68:13-71:29 -72 -72-->D:\Notes\app\src\main\AndroidManifest.xml:69:17-71 -72-->D:\Notes\app\src\main\AndroidManifest.xml:69:25-68 -73 -74 -74-->D:\Notes\app\src\main\AndroidManifest.xml:54:17-76 -74-->D:\Notes\app\src\main\AndroidManifest.xml:54:27-73 -75 -76 -77 D:\Notes\app\src\main\AndroidManifest.xml:73:13-75:54 -78 android:name="android.app.searchable" -78-->D:\Notes\app\src\main\AndroidManifest.xml:74:17-54 -79 android:resource="@xml/searchable" /> -79-->D:\Notes\app\src\main\AndroidManifest.xml:75:17-51 -80 -81 -82 -83 D:\Notes\app\src\main\AndroidManifest.xml:79:9-82:43 -84 android:name="net.micode.notes.data.NotesProvider" -84-->D:\Notes\app\src\main\AndroidManifest.xml:80:13-63 -85 android:authorities="micode_notes" -85-->D:\Notes\app\src\main\AndroidManifest.xml:81:13-47 -86 android:multiprocess="true" /> -86-->D:\Notes\app\src\main\AndroidManifest.xml:82:13-40 -87 -88 -89 D:\Notes\app\src\main\AndroidManifest.xml:85:9-96:20 -90 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -90-->D:\Notes\app\src\main\AndroidManifest.xml:86:13-57 -91 android:label="@string/app_widget2x2" > -91-->D:\Notes\app\src\main\AndroidManifest.xml:87:13-50 -92 -92-->D:\Notes\app\src\main\AndroidManifest.xml:88:13-92:29 -93 -93-->D:\Notes\app\src\main\AndroidManifest.xml:89:17-84 -93-->D:\Notes\app\src\main\AndroidManifest.xml:89:25-81 -94 -94-->D:\Notes\app\src\main\AndroidManifest.xml:90:17-85 -94-->D:\Notes\app\src\main\AndroidManifest.xml:90:25-82 -95 -95-->D:\Notes\app\src\main\AndroidManifest.xml:91:17-85 -95-->D:\Notes\app\src\main\AndroidManifest.xml:91:25-82 -96 -97 -98 D:\Notes\app\src\main\AndroidManifest.xml:93:13-95:58 -99 android:name="android.appwidget.provider" -99-->D:\Notes\app\src\main\AndroidManifest.xml:94:17-58 -100 android:resource="@xml/widget_2x_info" /> -100-->D:\Notes\app\src\main\AndroidManifest.xml:95:17-55 -101 -102 -103 D:\Notes\app\src\main\AndroidManifest.xml:98:9-109:20 -104 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -104-->D:\Notes\app\src\main\AndroidManifest.xml:99:13-57 -105 android:label="@string/app_widget4x4" > -105-->D:\Notes\app\src\main\AndroidManifest.xml:100:13-50 -106 -106-->D:\Notes\app\src\main\AndroidManifest.xml:88:13-92:29 -107 -107-->D:\Notes\app\src\main\AndroidManifest.xml:89:17-84 -107-->D:\Notes\app\src\main\AndroidManifest.xml:89:25-81 -108 -108-->D:\Notes\app\src\main\AndroidManifest.xml:90:17-85 -108-->D:\Notes\app\src\main\AndroidManifest.xml:90:25-82 -109 -109-->D:\Notes\app\src\main\AndroidManifest.xml:91:17-85 -109-->D:\Notes\app\src\main\AndroidManifest.xml:91:25-82 -110 -111 -112 D:\Notes\app\src\main\AndroidManifest.xml:93:13-95:58 -113 android:name="android.appwidget.provider" -113-->D:\Notes\app\src\main\AndroidManifest.xml:94:17-58 -114 android:resource="@xml/widget_4x_info" /> -114-->D:\Notes\app\src\main\AndroidManifest.xml:95:17-55 +56 +56-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:17-78 +56-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:23-75 +57 +57-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:17-78 +57-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:23-75 +58 +59 +59-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:13-58:29 +60 +60-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-79 +60-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:25-76 +61 +62 +62-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:17-76 +62-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:27-73 +63 +64 +64-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:17-78 +64-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:23-75 +65 +65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:17-78 +65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:23-75 +66 +67 +67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:59:13-62:29 +68 +68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:17-71 +68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:25-68 +69 +70 +70-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:17-76 +70-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:27-73 +71 +72 +73 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:13-65:54 +74 android:name="android.app.searchable" +74-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:64:17-54 +75 android:resource="@xml/searchable" /> +75-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:65:17-51 +76 +77 +78 +79 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:9-72:43 +80 android:name="net.micode.notes.data.NotesProvider" +80-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:70:13-63 +81 android:authorities="micode_notes" +81-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:71:13-47 +82 android:multiprocess="true" /> +82-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:72:13-40 +83 +84 +85 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:75:9-85:20 +86 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +86-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:76:13-57 +87 android:label="@string/app_widget2x2" > +87-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:77:13-50 +88 +88-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:78:13-81:29 +89 +89-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:17-84 +89-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:25-81 +90 +90-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:17-85 +90-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:25-82 +91 +92 +93 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-84:58 +94 android:name="android.appwidget.provider" +94-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:83:17-58 +95 android:resource="@xml/widget_2x_info" /> +95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:84:17-55 +96 +97 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:87:9-97:20 +98 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +98-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:13-57 +99 android:label="@string/app_widget4x4" > +99-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:13-50 +100 +100-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:78:13-81:29 +101 +101-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:17-84 +101-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:25-81 +102 +102-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:17-85 +102-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:25-82 +103 +104 +105 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-84:58 +106 android:name="android.appwidget.provider" +106-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:83:17-58 +107 android:resource="@xml/widget_4x_info" /> +107-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:84:17-55 +108 +109 +110 +111 +111-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:9-104:20 +111-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:19-55 +112 +112-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:101:13-103:29 +113 +113-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:17-79 +113-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:25-76 +114 115 116 -117 -118 -118-->D:\Notes\app\src\main\AndroidManifest.xml:112:9-116:20 -118-->D:\Notes\app\src\main\AndroidManifest.xml:112:19-55 -119 -119-->D:\Notes\app\src\main\AndroidManifest.xml:113:13-115:29 -120 -120-->D:\Notes\app\src\main\AndroidManifest.xml:114:17-79 -120-->D:\Notes\app\src\main\AndroidManifest.xml:114:25-76 -121 -122 -123 -124 -125 D:\Notes\app\src\main\AndroidManifest.xml:119:9-121:50 -126 android:name="net.micode.notes.ui.AlarmReceiver" -126-->D:\Notes\app\src\main\AndroidManifest.xml:120:13-61 -127 android:process=":remote" /> -127-->D:\Notes\app\src\main\AndroidManifest.xml:121:13-38 +117 +118 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:107:9-109:41 +119 android:name="net.micode.notes.ui.AlarmReceiver" +119-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:108:13-61 +120 android:process=":remote" /> +120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:109:13-38 +121 +122 +123 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:9-116:87 +124 android:name="net.micode.notes.ui.AlarmAlertActivity" +124-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:13-50 +125 android:label="@string/app_name" +125-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:13-45 +126 android:launchMode="singleInstance" +126-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:13-48 +127 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> +127-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:116:13-75 128 -129 +129 130 D:\Notes\app\src\main\AndroidManifest.xml:124:9-128:87 -131 android:name="net.micode.notes.ui.AlarmAlertActivity" -131-->D:\Notes\app\src\main\AndroidManifest.xml:125:13-50 -132 android:label="@string/app_name" -132-->D:\Notes\app\src\main\AndroidManifest.xml:126:13-45 -133 android:launchMode="singleInstance" -133-->D:\Notes\app\src\main\AndroidManifest.xml:127:13-48 -134 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" /> -134-->D:\Notes\app\src\main\AndroidManifest.xml:128:13-75 +130-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:119:9-123:72 +131 android:name="net.micode.notes.ui.NotesPreferenceActivity" +131-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:13-71 +132 android:label="@string/preferences_title" +132-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-54 +133 android:launchMode="singleTop" +133-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:122:13-43 +134 android:theme="@android:style/Theme.Holo.Light" /> +134-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:123:13-60 135 -136 -137 D:\Notes\app\src\main\AndroidManifest.xml:131:9-135:72 -138 android:name="net.micode.notes.ui.NotesPreferenceActivity" -138-->D:\Notes\app\src\main\AndroidManifest.xml:132:13-71 -139 android:label="@string/preferences_title" -139-->D:\Notes\app\src\main\AndroidManifest.xml:133:13-54 -140 android:launchMode="singleTop" -140-->D:\Notes\app\src\main\AndroidManifest.xml:134:13-43 -141 android:theme="@android:style/Theme.Holo.Light" /> -141-->D:\Notes\app\src\main\AndroidManifest.xml:135:13-60 -142 -143 -144 D:\Notes\app\src\main\AndroidManifest.xml:138:9-140:48 -145 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -145-->D:\Notes\app\src\main\AndroidManifest.xml:139:13-74 -146 android:exported="false" /> -146-->D:\Notes\app\src\main\AndroidManifest.xml:140:13-37 -147 -148 -149 D:\Notes\app\src\main\AndroidManifest.xml:143:9-145:52 -150 android:name="android.app.default_searchable" -150-->D:\Notes\app\src\main\AndroidManifest.xml:144:13-58 -151 android:value=".ui.NoteEditActivity" /> -151-->D:\Notes\app\src\main\AndroidManifest.xml:145:13-49 -152 -153 -154 +136 +137 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:9-128:40 +138 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +138-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-74 +139 android:exported="false" /> +139-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-37 +140 +141 +142 D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:131:9-133:52 +143 android:name="android.app.default_searchable" +143-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:13-58 +144 android:value=".ui.NoteEditActivity" /> +144-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-49 +145 +146 +147 diff --git a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index 3020499..5221260 100644 --- a/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -1,40 +1,29 @@ - - + android:versionName="0.1" > + - - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +31,23 @@ + + + + + - - @@ -58,7 +56,6 @@ - @@ -67,13 +64,12 @@ - - + @@ -85,28 +81,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index 3020499..5221260 100644 --- a/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -1,40 +1,29 @@ - - + android:versionName="0.1" > + - - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +31,23 @@ + + + + + - - @@ -58,7 +56,6 @@ - @@ -67,13 +64,12 @@ - - + @@ -85,28 +81,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat new file mode 100644 index 0000000..f803b63 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_activity_login.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat new file mode 100644 index 0000000..d71be54 Binary files /dev/null and b/Src/app/build/intermediates/merged_res/debug/layout_activity_register.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 7bbc622..3a30f02 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/Src/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat index ea0ebfc..c0e5804 100644 Binary files a/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/Src/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 5c3a1e9..4e56cd8 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,10 +1,29 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "from": { + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", @@ -21,24 +40,48 @@ "endColumns": "19", "endOffsets": "210" } - }, + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\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", + "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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" + "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:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "from": { + "startLines": "16", + "startColumns": "4", + "startOffsets": "333", + "endLines": "19", + "endColumns": "19", + "endOffsets": "438" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } } ] @@ -47,14 +90,61 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "10,18", - "startColumns": "4,4", - "startOffsets": "237,524", - "endLines": "15,21", - "endColumns": "19,19", - "endOffsets": "492,639" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,8332,8543,8708,8868,9051,9236,9421,9624,9830,10013", + "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": "8327,8538,8703,8863,9046,9231,9416,9619,9825,10008,10209" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -66,26 +156,27 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "49,55,66,61,15,20,25,31,37,10,43", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560", - "endLines": "52,58,69,63,18,23,28,34,40,13,46", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2001,2249,2710,2454,599,808,1017,1264,1515,393,1756" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "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,8332,8543,8750,8910,9093,9278,9463,9666,9872,10055", - "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": "8327,8538,8745,8905,9088,9273,9458,9661,9867,10050,10251" + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" } - }, + } + ] + }, + { + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "15,17,19,21,13", "startColumns": "4,4,4,4,4", @@ -102,7 +193,7 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\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", @@ -121,63 +212,58 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "331", - "endColumns": "56", - "endOffsets": "383" + "startLines": "49,55,66,61,15,20,25,31,37,10,43", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "1798,2043,2507,2299,421,628,837,1066,1314,215,1560", + "endLines": "52,58,69,63,18,23,28,34,40,13,46", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2001,2249,2710,2454,599,808,1017,1264,1515,393,1756" }, "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "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,8332,8543,8750,8910,9093,9278,9463,9666,9872,10055", + "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": "8327,8538,8745,8905,9088,9273,9458,9661,9867,10050,10251" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ + }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startLines": "10,18", + "startColumns": "4,4", + "startOffsets": "237,524", + "endLines": "15,21", + "endColumns": "19,19", + "endOffsets": "492,639" }, "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "16", "startColumns": "4", - "startOffsets": "333", - "endLines": "19", - "endColumns": "19", - "endOffsets": "438" + "startOffsets": "331", + "endColumns": "56", + "endOffsets": "383" }, "to": { - "startLines": "2", + "startLines": "12", "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" } } ] diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 61bbece..b29749a 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "336", - "endLines": "19", - "endColumns": "19", - "endOffsets": "441" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\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", @@ -40,6 +21,25 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "from": { + "startLines": "16", + "startColumns": "4", + "startOffsets": "336", + "endLines": "19", + "endColumns": "19", + "endOffsets": "441" + }, + "to": { + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" + } } ] } diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index d27ddc9..f154996 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\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", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "16", "startColumns": "4", diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 9f0cb8d..a316801 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,29 +1,46 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "outputFile": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "10,18", - "startColumns": "4,4", - "startOffsets": "237,524", - "endLines": "15,21", - "endColumns": "19,19", - "endOffsets": "492,639" + "startLines": "15,17,19,21,13", + "startColumns": "4,4,4,4,4", + "startOffsets": "335,409,484,558,262", + "endColumns": "51,52,52,51,51", + "endOffsets": "382,457,532,605,309" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "49,55,66,61,15,20,25,31,37,10,43", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", @@ -42,13 +59,52 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "15,17,19,21,13", - "startColumns": "4,4,4,4,4", - "startOffsets": "335,409,484,558,262", - "endColumns": "51,52,52,51,51", - "endOffsets": "382,457,532,605,309" + "startLines": "10,18", + "startColumns": "4,4", + "startOffsets": "237,524", + "endLines": "15,21", + "endColumns": "19,19", + "endOffsets": "492,639" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "16", + "startColumns": "4", + "startOffsets": "331", + "endColumns": "56", + "endOffsets": "383" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", @@ -59,14 +115,11 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "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 +131,46 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "16", - "startColumns": "4", - "startOffsets": "331", - "endColumns": "56", - "endOffsets": "383" + "startLines": "-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2507,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,69,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2720,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "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,8332,8543,8708,8868,9051,9236,9421,9624,9830,10013", + "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": "8327,8538,8703,8863,9046,9231,9416,9619,9825,10008,10209" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", diff --git a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 2a106a9..21b0cce 100644 --- a/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/Src/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,390 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_activity_register.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/activity_register.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_activity_login.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/activity_login.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + }, + { + "merged": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "D:\\Notes\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" } ] \ No newline at end of file diff --git a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index 3020499..5221260 100644 --- a/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/Src/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -1,40 +1,29 @@ - - + android:versionName="0.1" > + - - - - - - + - + + android:name="net.micode.notes.login.LoginActivity" + android:launchMode="singleTop" > @@ -42,14 +31,23 @@ + + + + + - - @@ -58,7 +56,6 @@ - @@ -67,13 +64,12 @@ - - + @@ -85,28 +81,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - - - + diff --git a/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index e203a19..35e096e 100644 Binary files a/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/Src/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar deleted file mode 100644 index 0d0f1fc..0000000 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar and /dev/null differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/acfd76e6c507414ecb9728b7977b2f7147e199cbf6743e4ad6ac77c3881d1565_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/acfd76e6c507414ecb9728b7977b2f7147e199cbf6743e4ad6ac77c3881d1565_9.jar new file mode 100644 index 0000000..30f4d5e Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/acfd76e6c507414ecb9728b7977b2f7147e199cbf6743e4ad6ac77c3881d1565_9.jar differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 03d3195..65c70d4 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index 8df2301..8df6234 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index 3ba5a35..44c573f 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index f05cfb5..2b3310b 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index 93eacf2..396232a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex index 00400e4..03d2859 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index a400a0b..f3ae256 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex new file mode 100644 index 0000000..152a39b Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/UserDao.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index dc74e3f..df7708c 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index 91ab17d..8aec629 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index e5ba8a9..72010fb 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index fc273f2..d38b854 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex index 02a7396..9f5a261 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 40591cf..1d5a695 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index e200d34..4e0b04c 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index 5e97dc5..ebf757e 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex index 29eefcc..2d65fa9 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index acaa88b..c87c426 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex new file mode 100644 index 0000000..de72244 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/LoginActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex new file mode 100644 index 0000000..244a4c1 Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/login/RegisterActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 2f70947..022aa0e 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 305a6c4..e2eacc6 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index 66e6305..d030ebc 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 9a73a73..52eb009 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index 8b507ea..0b145e5 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 8b9a610..ebcb62a 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index a14b091..86e2588 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index f747b9d..94c1ca3 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex new file mode 100644 index 0000000..0a9f46a Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 94f094f..2c6fa0d 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index 9d3d306..9177de9 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 6f4224b..3b43840 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index f79818f..b111a6e 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index 8bc3490..c9bed2f 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 90c5312..8307fb6 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 6fb96c3..d103da0 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 9843e09..ead3768 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index b474c57..8b0fc49 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index 6f24cf3..a3b3869 100644 Binary files a/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex differ diff --git a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..11b45e1 100644 --- a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -77,84 +77,94 @@ int drawable widget_4x_yellow 0x7f040041 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 +int id add_img_btn 0x7f050003 +int id amPm 0x7f050004 +int id btnBackToLogin 0x7f050005 +int id btnLogin 0x7f050006 +int id btnRegister 0x7f050007 +int id btn_new_note 0x7f050008 +int id btn_set_bg_color 0x7f050009 +int id cb_edit_item 0x7f05000a +int id date 0x7f05000b +int id delete 0x7f05000c +int id etLoginPassword 0x7f05000d +int id etLoginUsername 0x7f05000e +int id etPassword 0x7f05000f +int id etUsername 0x7f050010 +int id et_edit_text 0x7f050011 +int id et_foler_name 0x7f050012 +int id font_size_selector 0x7f050013 +int id hour 0x7f050014 +int id iv_alert_icon 0x7f050015 +int id iv_bg_blue 0x7f050016 +int id iv_bg_blue_select 0x7f050017 +int id iv_bg_green 0x7f050018 +int id iv_bg_green_select 0x7f050019 +int id iv_bg_red 0x7f05001a +int id iv_bg_red_select 0x7f05001b +int id iv_bg_white 0x7f05001c +int id iv_bg_white_select 0x7f05001d +int id iv_bg_yellow 0x7f05001e +int id iv_bg_yellow_select 0x7f05001f +int id iv_large_select 0x7f050020 +int id iv_medium_select 0x7f050021 +int id iv_small_select 0x7f050022 +int id iv_super_select 0x7f050023 +int id ll_font_large 0x7f050024 +int id ll_font_normal 0x7f050025 +int id ll_font_small 0x7f050026 +int id ll_font_super 0x7f050027 +int id menu_alert 0x7f050028 +int id menu_delete 0x7f050029 +int id menu_delete_remind 0x7f05002a +int id menu_export_text 0x7f05002b +int id menu_font_size 0x7f05002c +int id menu_list_mode 0x7f05002d +int id menu_new_folder 0x7f05002e +int id menu_new_note 0x7f05002f +int id menu_search 0x7f050030 +int id menu_send_to_desktop 0x7f050031 +int id menu_setting 0x7f050032 +int id menu_share 0x7f050033 +int id menu_sync 0x7f050034 +int id minute 0x7f050035 +int id move 0x7f050036 +int id navigation_bar 0x7f050037 +int id note_bg_color_selector 0x7f050038 +int id note_edit_list 0x7f050039 +int id note_edit_view 0x7f05003a +int id note_item 0x7f05003b +int id note_title 0x7f05003c +int id notes_list 0x7f05003d +int id prefenerece_sync_status_textview 0x7f05003e +int id preference_sync_button 0x7f05003f +int id selection_menu 0x7f050040 +int id sv_note_edit 0x7f050041 +int id tv_alert_date 0x7f050042 +int id tv_folder_name 0x7f050043 +int id tv_modified_date 0x7f050044 +int id tv_name 0x7f050045 +int id tv_time 0x7f050046 +int id tv_title 0x7f050047 +int id tv_title_bar 0x7f050048 +int id widget_bg_image 0x7f050049 +int id widget_text 0x7f05004a int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d +int layout activity_login 0x7f060001 +int layout activity_register 0x7f060002 +int layout add_account_text 0x7f060003 +int layout datetime_picker 0x7f060004 +int layout dialog_edit_text 0x7f060005 +int layout folder_list_item 0x7f060006 +int layout note_edit 0x7f060007 +int layout note_edit_list_item 0x7f060008 +int layout note_item 0x7f060009 +int layout note_list 0x7f06000a +int layout note_list_dropdown_menu 0x7f06000b +int layout note_list_footer 0x7f06000c +int layout settings_header 0x7f06000d +int layout widget_2x 0x7f06000e +int layout widget_4x 0x7f06000f int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 diff --git a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 72e47e3..dff1812 100644 --- a/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/Src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\Notes\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Notes\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\Notes\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\Notes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\Notes\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\Notes\app\src\debug\res -net.micode.notes.app-main-7 D:\Notes\app\src\main\res +net.micode.notes.app-pngs-0 D:\github\XiaoMiNote\Src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\github\XiaoMiNote\Src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\github\XiaoMiNote\Src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\github\XiaoMiNote\Src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\github\XiaoMiNote\Src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\github\XiaoMiNote\Src\app\src\debug\res +net.micode.notes.app-main-7 D:\github\XiaoMiNote\Src\app\src\main\res diff --git a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 4461006..3d1b32b 100644 --- a/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/Src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -55,11 +55,13 @@ net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 net.micode.notes:string/menu_export_text = 0x7f0a0023 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:string/format_date_ymd = 0x7f0a0018 net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 @@ -81,142 +83,144 @@ net.micode.notes:menu/sub_folder = 0x7f070006 net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:id/move = 0x7f050036 +net.micode.notes:id/iv_bg_yellow_select = 0x7f05001f net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:layout/note_item = 0x7f060007 +net.micode.notes:id/iv_bg_blue = 0x7f050016 +net.micode.notes:layout/settings_header = 0x7f06000d +net.micode.notes:layout/note_list = 0x7f06000a net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/tv_title_bar = 0x7f050040 +net.micode.notes:layout/datetime_picker = 0x7f060004 +net.micode.notes:layout/activity_login = 0x7f060001 +net.micode.notes:id/btn_new_note = 0x7f050008 +net.micode.notes:layout/note_list_footer = 0x7f06000c +net.micode.notes:id/widget_text = 0x7f05004a +net.micode.notes:id/tv_title_bar = 0x7f050048 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/tv_name = 0x7f05003d +net.micode.notes:id/tv_time = 0x7f050046 +net.micode.notes:id/tv_name = 0x7f050045 net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:id/selection_menu = 0x7f050038 +net.micode.notes:id/sv_note_edit = 0x7f050041 net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:id/preference_sync_button = 0x7f05003f +net.micode.notes:layout/note_edit = 0x7f060007 +net.micode.notes:id/notes_list = 0x7f05003d net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050034 +net.micode.notes:id/note_title = 0x7f05003c net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:id/navigation_bar = 0x7f05002f +net.micode.notes:id/note_edit_view = 0x7f05003a +net.micode.notes:id/navigation_bar = 0x7f050037 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:id/minute = 0x7f050035 net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:id/menu_share = 0x7f05002b -net.micode.notes:id/menu_setting = 0x7f05002a +net.micode.notes:id/menu_sync = 0x7f050034 +net.micode.notes:id/menu_share = 0x7f050033 +net.micode.notes:id/menu_setting = 0x7f050032 net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:id/menu_search = 0x7f050028 +net.micode.notes:id/menu_send_to_desktop = 0x7f050031 +net.micode.notes:id/menu_search = 0x7f050030 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050027 +net.micode.notes:id/menu_new_note = 0x7f05002f net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/menu_export_text = 0x7f050023 +net.micode.notes:id/menu_new_folder = 0x7f05002e +net.micode.notes:id/menu_list_mode = 0x7f05002d +net.micode.notes:id/iv_medium_select = 0x7f050021 +net.micode.notes:id/menu_export_text = 0x7f05002b net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 +net.micode.notes:layout/activity_register = 0x7f060002 +net.micode.notes:id/menu_delete = 0x7f050029 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f05003e net.micode.notes:string/menu_font_size = 0x7f0a0029 net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:id/menu_alert = 0x7f050028 net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e +net.micode.notes:id/ll_font_super = 0x7f050027 net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/ll_font_normal = 0x7f05001d -net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:id/note_bg_color_selector = 0x7f050030 +net.micode.notes:id/ll_font_normal = 0x7f050025 +net.micode.notes:id/ll_font_large = 0x7f050024 +net.micode.notes:id/note_bg_color_selector = 0x7f050038 net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:id/iv_bg_yellow = 0x7f050016 +net.micode.notes:id/iv_super_select = 0x7f050023 +net.micode.notes:id/iv_bg_yellow = 0x7f05001e net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:id/tv_alert_date = 0x7f05003a -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:drawable/notification = 0x7f040033 -net.micode.notes:id/iv_bg_red = 0x7f050012 +net.micode.notes:id/iv_bg_white_select = 0x7f05001d +net.micode.notes:id/iv_bg_white = 0x7f05001c net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050041 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f +net.micode.notes:id/iv_large_select = 0x7f050020 +net.micode.notes:id/widget_bg_image = 0x7f050049 +net.micode.notes:id/iv_bg_green_select = 0x7f050019 +net.micode.notes:id/amPm = 0x7f050004 +net.micode.notes:id/iv_bg_green = 0x7f050018 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:id/font_size_selector = 0x7f050013 +net.micode.notes:id/et_edit_text = 0x7f050011 +net.micode.notes:drawable/list_white_single = 0x7f040027 +net.micode.notes:layout/note_item = 0x7f060009 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:id/etUsername = 0x7f050010 +net.micode.notes:id/et_foler_name = 0x7f050012 net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:layout/widget_4x = 0x7f06000d +net.micode.notes:layout/widget_4x = 0x7f06000f net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:id/cb_edit_item = 0x7f050006 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 +net.micode.notes:id/cb_edit_item = 0x7f05000a +net.micode.notes:id/btn_set_bg_color = 0x7f050009 +net.micode.notes:id/btnRegister = 0x7f050007 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:drawable/menu_move = 0x7f04002e +net.micode.notes:drawable/widget_4x_white = 0x7f040040 +net.micode.notes:id/btnLogin = 0x7f050006 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:id/iv_bg_blue_select = 0x7f050017 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:id/amPm = 0x7f050003 net.micode.notes:drawable/widget_4x_green = 0x7f04003e net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:id/hour = 0x7f050014 net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f050042 net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:id/delete = 0x7f05000c net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 +net.micode.notes:id/iv_bg_red = 0x7f05001a +net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003c +net.micode.notes:id/tv_modified_date = 0x7f050044 net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:id/iv_small_select = 0x7f050022 net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:string/menu_folder_delete = 0x7f0a0025 net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/date = 0x7f050007 +net.micode.notes:id/date = 0x7f05000b net.micode.notes:drawable/list_yellow_single = 0x7f04002b +net.micode.notes:id/ll_font_small = 0x7f050026 +net.micode.notes:id/etPassword = 0x7f05000f +net.micode.notes:id/etLoginUsername = 0x7f05000e net.micode.notes:drawable/list_red_up = 0x7f040024 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f05003b +net.micode.notes:id/tv_folder_name = 0x7f050043 net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:string/format_folder_files_count = 0x7f0a001b net.micode.notes:drawable/clock = 0x7f040003 net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:layout/dialog_edit_text = 0x7f060003 +net.micode.notes:layout/dialog_edit_text = 0x7f060005 net.micode.notes:string/preferences_account_title = 0x7f0a0045 net.micode.notes:drawable/edit_white = 0x7f04000e net.micode.notes:drawable/list_white_middle = 0x7f040026 @@ -225,7 +229,7 @@ net.micode.notes:drawable/list_white_down = 0x7f040025 net.micode.notes:string/preferences_add_account = 0x7f0a0046 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:layout/widget_2x = 0x7f06000c +net.micode.notes:layout/widget_2x = 0x7f06000e net.micode.notes:drawable/list_footer_bg = 0x7f04001c net.micode.notes:string/alert_title_delete = 0x7f0a0003 net.micode.notes:drawable/edit_title_green = 0x7f04000a @@ -234,43 +238,49 @@ net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 net.micode.notes:drawable/list_red_single = 0x7f040023 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:id/menu_delete_remind = 0x7f050022 +net.micode.notes:id/btnBackToLogin = 0x7f050005 +net.micode.notes:id/menu_delete_remind = 0x7f05002a net.micode.notes:drawable/list_red_down = 0x7f040021 net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:id/iv_bg_red_select = 0x7f050013 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 +net.micode.notes:layout/note_list_dropdown_menu = 0x7f06000b net.micode.notes:drawable/list_blue_down = 0x7f040017 net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:drawable/font_small = 0x7f040013 net.micode.notes:string/sync_progress_login = 0x7f0a005e net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:layout/folder_list_item = 0x7f060006 +net.micode.notes:layout/add_account_text = 0x7f060003 +net.micode.notes:id/tv_title = 0x7f050047 net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:drawable/list_blue_up = 0x7f04001a net.micode.notes:string/search_setting_description = 0x7f0a0059 net.micode.notes:drawable/list_blue_single = 0x7f040019 net.micode.notes:drawable/font_large = 0x7f040010 +net.micode.notes:id/selection_menu = 0x7f050040 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/add_img_btn = 0x7f050003 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050033 +net.micode.notes:id/note_item = 0x7f05003b net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050031 +net.micode.notes:id/note_edit_list = 0x7f050039 +net.micode.notes:id/iv_alert_icon = 0x7f050015 +net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_title_red = 0x7f04000b net.micode.notes:string/menu_delete = 0x7f0a0021 net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:drawable/call_record = 0x7f040002 net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:id/menu_font_size = 0x7f050024 +net.micode.notes:id/menu_font_size = 0x7f05002c net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 +net.micode.notes:id/etLoginPassword = 0x7f05000d net.micode.notes:drawable/list_yellow_up = 0x7f04002c +net.micode.notes:id/iv_bg_red_select = 0x7f05001b net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:drawable/edit_title_blue = 0x7f040009 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:drawable/list_green_middle = 0x7f04001e net.micode.notes:drawable/list_background = 0x7f040016 @@ -278,6 +288,6 @@ net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:menu/note_list_dropdown = 0x7f070004 net.micode.notes:string/menu_setting = 0x7f0a0036 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 +net.micode.notes:layout/note_edit_list_item = 0x7f060008 net.micode.notes:layout/account_dialog_title = 0x7f060000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/Src/app/build/outputs/apk/debug/app-debug.apk b/Src/app/build/outputs/apk/debug/app-debug.apk index dde6fa4..31b8f36 100644 Binary files a/Src/app/build/outputs/apk/debug/app-debug.apk and b/Src/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt index 558dd73..e17c416 100644 --- a/Src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/Src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,241 +1,225 @@ -- Merging decision tree log --- manifest -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:4:1-147:12 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:1-135:12 package - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:6:5-31 - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:5-31 + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:8:5-30 - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:6:5-30 + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:5:5-51 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:3:5-51 xmlns:android - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:4:11-69 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:2:11-69 android:versionCode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:7:5-28 - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 -INJECTED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 - android:targetSdkVersion - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:11:15-41 - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:5:5-28 + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:14:5-81 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:14:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:15:5-88 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:5-81 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:15:22-85 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:9:22-78 uses-permission#android.permission.INTERNET -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:16:5-67 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:5-67 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:16:22-64 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:10:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:17:5-72 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:17:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:18:5-74 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:18:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:19:5-80 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:19:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:20:5-71 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-72 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:20:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:21:5-74 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:21:22-71 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:22-69 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:22:5-81 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:5-81 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:22:22-78 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:12:22-78 application -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:25:5-146:19 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-134:19 android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:27:9-41 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:9-41 android:icon - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:26:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:29:9-41:20 - android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:32:13-45 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:9-42 +activity#net.micode.notes.login.LoginActivity +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:9-26:20 android:launchMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:33:13-43 - android:windowSoftInputMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:36:13-52 - android:uiOptions - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:35:13-57 - android:configChanges - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:31:13-74 - android:theme - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:34:13-45 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:13-43 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:30:13-49 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:13-48 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:37:13-40:29 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:13-25:29 action#android.intent.action.MAIN -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:38:17-69 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:17-69 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:38:25-66 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:23:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:39:17-77 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:17-77 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:39:27-74 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:24:27-74 +activity#net.micode.notes.login.RegisterActivity +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:9-60 + android:name + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:29:19-57 +activity#net.micode.notes.ui.NotesListActivity +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:31:9-37:55 + android:label + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:13-45 + android:launchMode + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-43 + android:windowSoftInputMode + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:37:13-52 + android:configChanges + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-74 + android:theme + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-45 + android:name + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:13-49 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:44:9-76:20 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:40:9-66:20 android:launchMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:47:13-43 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:43:13-43 android:configChanges - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:46:13-74 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:48:13-45 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:13-45 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:45:13-48 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:41: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:\Notes\app\src\main\AndroidManifest.xml:50:13-58:29 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:45:13-52:29 android:scheme - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:51:17-38 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:46:17-38 tools:ignore - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:52:17-47 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:47:17-47 action#android.intent.action.VIEW -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:53:17-69 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:53:25-66 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:54:17-76 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:17-76 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:54:27-73 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:49:27-73 data -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:56:17-78 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:17-78 android:mimeType - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:56:23-75 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50: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:\Notes\app\src\main\AndroidManifest.xml:60:13-66:29 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:13-58:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:61:17-79 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-79 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:61:25-76 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:68:13-71:29 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:59:13-62:29 action#android.intent.action.SEARCH -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:69:17-71 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:17-71 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:69:25-68 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:60:25-68 meta-data#android.app.searchable -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:73:13-75:54 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:63:13-65:54 android:resource - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:75:17-51 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:65:17-51 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:74:17-54 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:64:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:79:9-82:43 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:9-72:43 android:authorities - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:81:13-47 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:71:13-47 android:multiprocess - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:82:13-40 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:72:13-40 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:80:13-63 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:70:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:85:9-96:20 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:75:9-85:20 android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:87:13-50 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:77:13-50 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:86: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:\Notes\app\src\main\AndroidManifest.xml:88:13-92:29 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:76:13-57 +intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:78:13-81:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:89:17-84 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:17-84 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:89:25-81 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:79:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:90:17-85 - android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:90:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:91:17-85 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:17-85 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:91:25-82 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:25-82 meta-data#android.appwidget.provider -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:93:13-95:58 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-84:58 android:resource - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:95:17-55 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:84:17-55 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:94:17-58 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:83:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:98:9-109:20 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:87:9-97:20 android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:100:13-50 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:13-50 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:99:13-57 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:88:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:112:9-116:20 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:9-104:20 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:112:19-55 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:113:13-115:29 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:101:13-103:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:114:17-79 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:17-79 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:114:25-76 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:102:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:119:9-121:50 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:107:9-109:41 android:process - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:121:13-38 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:109:13-38 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:120:13-61 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:108:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:124:9-128:87 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:9-116:87 android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:126:13-45 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:13-45 android:launchMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:127:13-48 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:115:13-48 android:theme - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:128:13-75 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:116:13-75 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:125:13-50 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:113:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:131:9-135:72 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:119:9-123:72 android:label - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:133:13-54 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-54 android:launchMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:134:13-43 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:122:13-43 android:theme - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:135:13-60 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:123:13-60 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:132:13-71 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:138:9-140:48 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:9-128:40 android:exported - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:140:13-37 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-37 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:139:13-74 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:127:13-74 meta-data#android.app.default_searchable -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:143:9-145:52 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:131:9-133:52 android:value - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:145:13-49 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-49 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:144:13-58 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:132:13-58 +uses-sdk +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + android:targetSdkVersion + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + android:minSdkVersion + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml diff --git a/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 3d7fdd1..7bf8a58 100644 Binary files a/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/Src/app/src/main/AndroidManifest.xml b/Src/app/src/main/AndroidManifest.xml index a0cf89e..a01dd6b 100644 --- a/Src/app/src/main/AndroidManifest.xml +++ b/Src/app/src/main/AndroidManifest.xml @@ -1,75 +1,65 @@ - - - + - - - - - - - - - - + + + android:name=".login.LoginActivity" + android:launchMode="singleTop"> + + + + + - - - - - - @@ -81,27 +71,25 @@ android:authorities="micode_notes" android:multiprocess="true" /> - + - - + - - + + android:process=":remote" /> + android:exported="false" /> + + + diff --git a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index 5c6ce2b..8d83d63 100644 --- a/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/Src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -20,12 +20,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private static final String DB_NAME = "note.db"; // 数据库版本号，用于判断数据库结构是否需要升级 - private static final int DB_VERSION = 4; + private static final int DB_VERSION = 5; // 表接口，定义了数据库中两个主要表的表名：NOTE和DATA public interface TABLE { public static final String NOTE = "note"; // 存储笔记信息 public static final String DATA = "data"; // 存储笔记内容的数据表 + public static final String USER = "user";//用户表 + String USERNAME_COLUMN = "username"; + String PASSWORD_COLUMN = "password"; } // 日志标签，用于输出调试信息 @@ -34,6 +37,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 单例模式，确保数据库辅助类的唯一实例 private static NotesDatabaseHelper mInstance; + // 创建用户表的SQL语句 + private static final String CREATE_USER_TABLE_SQL = + "CREATE TABLE " + TABLE.USER + " (" + + "id INTEGER PRIMARY KEY AUTOINCREMENT, " + + TABLE.USERNAME_COLUMN + " TEXT NOT NULL UNIQUE, " + + TABLE.PASSWORD_COLUMN + " TEXT NOT NULL" + + ")"; // SQL语句：创建NOTE表 private static final String CREATE_NOTE_TABLE_SQL = "CREATE TABLE " + TABLE.NOTE + "(" + @@ -333,7 +343,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { * @param context Context类型，应用上下文，用于初始化数据库 * @return NotesDatabaseHelper类型的单例对象 */ - static synchronized NotesDatabaseHelper getInstance(Context context) { + public static synchronized NotesDatabaseHelper getInstance(Context context) { // 检查是否已有实例 if (mInstance == null) { // 如果实例为空，则创建新的 NotesDatabaseHelper 实例 @@ -357,9 +367,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { // 调用createDataTable方法，创建DATA表，并配置相关触发器和索引 createDataTable(db); + createUserTable(db); // 创建用户表 } - + // 创建用户表的方法 + private void createUserTable(SQLiteDatabase db) { + db.execSQL(CREATE_USER_TABLE_SQL); + } /** * 升级数据库的方法。当检测到数据库版本号发生变化时，系统自动调用此方法，根据旧版本号逐步升级数据库结构。 * 此方法根据数据库的旧版本逐步调用不同版本的升级方法，并在必要时重新创建触发器。 @@ -370,38 +384,33 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { */ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - boolean reCreateTriggers = false; // 标记是否需要重新创建触发器 - boolean skipV2 = false; // 标记是否需要跳过版本2的升级 - - // 检查并按顺序执行版本升级 - if (oldVersion == 1) { - upgradeToV2(db); // 从版本1升级到版本2 - skipV2 = true; // 跳过后续升级到版本2的操作 - oldVersion++; + // 确保按顺序执行每个版本的升级逻辑 + if (oldVersion < 2) { + upgradeToV2(db); // 从版本1升级到版本2 } - if (oldVersion == 2 && !skipV2) { - upgradeToV3(db); // 从版本2升级到版本3 - reCreateTriggers = true; // 设置标记为true，表示需要重新创建触发器 - oldVersion++; + if (oldVersion < 3) { + upgradeToV3(db); // 从版本2升级到版本3 } - if (oldVersion == 3) { - upgradeToV4(db); // 从版本3升级到版本4 - oldVersion++; + if (oldVersion < 4) { + upgradeToV4(db); // 从版本3升级到版本4 } - - // 如果升级过程中需要重新创建触发器，则调用方法重新创建NOTE表和DATA表的触发器 - if (reCreateTriggers) { - reCreateNoteTableTriggers(db); // 重新创建NOTE表的触发器 - reCreateDataTableTriggers(db); // 重新创建DATA表的触发器 + if (oldVersion < 5) { + // 在版本5中创建用户表 + createUserTable(db); // 确保调用创建用户表的方法 } - // 检查是否所有升级已成功完成，如果未完成则抛出异常 - if (oldVersion != newVersion) { + // 如果需要，重新创建触发器 + reCreateNoteTableTriggers(db); // 重建NOTE表的触发器 + reCreateDataTableTriggers(db); // 重建DATA表的触发器 + + // 检查是否升级成功 + if (oldVersion >= newVersion) { throw new IllegalStateException("Upgrade notes database to version " + newVersion + " fails"); } } + /** * 从版本1升级到版本2的方法。此升级步骤删除旧表并重新创建NOTE表和DATA表， * 以确保结构更新并清除旧数据。 diff --git a/Src/app/src/main/java/net/micode/notes/data/UserDao.java b/Src/app/src/main/java/net/micode/notes/data/UserDao.java new file mode 100644 index 0000000..b6b86d9 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/data/UserDao.java @@ -0,0 +1,65 @@ +package net.micode.notes.data; + +import android.content.ContentValues; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.util.Log; + +public class UserDao { + private NotesDatabaseHelper dbHelper; + + // 常量定义 + public static final String COLUMN_USERNAME = "username"; + public static final String COLUMN_PASSWORD = "password"; + + // UserDao的构造函数，传入NotesDatabaseHelper的实例 + public UserDao(NotesDatabaseHelper dbHelper) { + this.dbHelper = dbHelper; + } + + // 注册用户的方法 + public boolean registerUser(String username, String password) { + SQLiteDatabase db = null; + try { + db = dbHelper.getWritableDatabase(); + ContentValues values = new ContentValues(); + values.put(COLUMN_USERNAME, username); + values.put(COLUMN_PASSWORD, password); + + // 尝试插入新用户 + long result = db.insert(NotesDatabaseHelper.TABLE.USER, null, values); + + // 输出调试信息 + if (result == -1) { + Log.d("UserDao", "Registration failed for user: " + username); + return false; // 插入失败 + } else { + Log.d("UserDao", "Successfully registered user: " + username); + return true; // 插入成功 + } + } catch (Exception e) { + Log.e("UserDao", "Error registering user", e); + return false; // 发生异常 + } finally { + if (db != null) { + db.close(); // 确保数据库在操作完后关闭 + } + } + } + + + + // 登录用户的方法 + public boolean loginUser(String username, String password) { + SQLiteDatabase db = dbHelper.getReadableDatabase(); + Cursor cursor = null; // 初始化Cursor为空 + try { + cursor = db.query(NotesDatabaseHelper.TABLE.USER, null, "username=? AND password=?", new String[]{username, password}, null, null, null); + return cursor.getCount() > 0; // 如果查询结果超过0，表示用户存在 + } finally { + if (cursor != null) { + cursor.close(); // 确保Cursor在使用完后关闭 + } + } + } +} \ No newline at end of file diff --git a/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java b/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java new file mode 100644 index 0000000..48d5f71 --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/login/LoginActivity.java @@ -0,0 +1,64 @@ +package net.micode.notes.login; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; +import android.app.Activity; + +import net.micode.notes.R; +import net.micode.notes.data.NotesDatabaseHelper; +import net.micode.notes.data.UserDao; +import net.micode.notes.ui.NotesListActivity; + +public class LoginActivity extends Activity { + + private EditText etLoginUsername; + private EditText etLoginPassword; + private Button btnLogin; + private Button btnRegister; + + private UserDao userDao; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_login); + + NotesDatabaseHelper dbHelper = NotesDatabaseHelper.getInstance(this); + userDao = new UserDao(dbHelper); + + etLoginUsername = (EditText) findViewById(R.id.etLoginUsername); + etLoginPassword = (EditText) findViewById(R.id.etLoginPassword); + btnLogin = (Button) findViewById(R.id.btnLogin); + btnRegister = (Button) findViewById(R.id.btnRegister); + + btnLogin.setOnClickListener(v -> attemptLogin()); + btnRegister.setOnClickListener(v -> navigateToRegister()); + } + + private void attemptLogin() { + String username = etLoginUsername.getText().toString().trim(); + String password = etLoginPassword.getText().toString().trim(); + + if (username.isEmpty() || password.isEmpty()) { + Toast.makeText(this, "Username or password cannot be empty", Toast.LENGTH_SHORT).show(); + return; + } + + if (userDao.loginUser(username, password)) { + Intent intent = new Intent(LoginActivity.this, NotesListActivity.class); + startActivity(intent); + finish(); + } else { + Toast.makeText(LoginActivity.this, "Invalid username or password", Toast.LENGTH_SHORT).show(); + } + } + + private void navigateToRegister() { + Intent intent = new Intent(LoginActivity.this, RegisterActivity.class); + startActivity(intent); + } +} diff --git a/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java b/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java new file mode 100644 index 0000000..bc9c0ff --- /dev/null +++ b/Src/app/src/main/java/net/micode/notes/login/RegisterActivity.java @@ -0,0 +1,63 @@ +package net.micode.notes.login; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; +import android.app.Activity; + +import net.micode.notes.R; +import net.micode.notes.data.NotesDatabaseHelper; +import net.micode.notes.data.UserDao; + +public class RegisterActivity extends Activity { + + private EditText etUsername; + private EditText etPassword; + private Button btnRegister; + private Button btnBackToLogin; + + private UserDao userDao; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_register); + + NotesDatabaseHelper dbHelper = NotesDatabaseHelper.getInstance(this); + userDao = new UserDao(dbHelper); + + etUsername = (EditText) findViewById(R.id.etUsername); + etPassword = (EditText) findViewById(R.id.etPassword); + btnRegister = (Button) findViewById(R.id.btnRegister); + btnBackToLogin = (Button) findViewById(R.id.btnBackToLogin); + + btnRegister.setOnClickListener(v -> attemptRegister()); + btnBackToLogin.setOnClickListener(v -> navigateToLogin()); + } + + private void attemptRegister() { + String username = etUsername.getText().toString().trim(); + String password = etPassword.getText().toString().trim(); + + if (username.isEmpty() || password.isEmpty()) { + Toast.makeText(this, "Username or password cannot be empty", Toast.LENGTH_SHORT).show(); + return; + } + + if (userDao.registerUser(username, password)) { + Toast.makeText(this, "User registered successfully", Toast.LENGTH_SHORT).show(); + navigateToLogin(); // 注册成功后返回登录界面 + } else { + Toast.makeText(this, "Registration failed", Toast.LENGTH_SHORT).show(); + } + } + + private void navigateToLogin() { + Intent intent = new Intent(RegisterActivity.this, LoginActivity.class); + startActivity(intent); + finish(); + } +} diff --git a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java index be55b60..02c31fb 100644 --- a/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/Src/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -38,7 +38,7 @@ public class WorkingNote { // 笔记的唯一标识符 private long mNoteId; // 笔记的内容 - private String mContent; + public String mContent; // 笔记的模式，例如普通、草稿等 private int mMode; diff --git a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 76c4c22..8b3b17a 100644 --- a/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/Src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -22,19 +22,32 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Paint; + + +import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -47,6 +60,7 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -65,6 +79,7 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -170,19 +185,48 @@ public class NoteEditActivity extends Activity implements OnClickListener, private Pattern mPattern; // 正则表达式模式 +// @Override +// protected void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// this.setContentView(R.layout.note_edit); // 设置活动的视图布局 +// +// // 检查实例状态是否被保存，如果未保存且初始化活动状态失败，则结束该活动 +// if (savedInstanceState == null && !initActivityState(getIntent())) { +// finish(); +// return; +// } +// initResources(); // 初始化资源 +// } + private final int PHOTO_REQUEST=1; @Override + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - this.setContentView(R.layout.note_edit); // 设置活动的视图布局 + this.setContentView(R.layout.note_edit); - // 检查实例状态是否被保存，如果未保存且初始化活动状态失败，则结束该活动 if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; } - initResources(); // 初始化资源 + initResources(); + + //根据id获取添加图片按钮 + final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn); + //为点击图片按钮设置监听器 + add_img_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: click add image button"); + //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据，并返回（特殊种类的数据：照一张相片或录一段音） + Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT); + //Category属性用于指定当前动作（Action）被执行的环境. + //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent + loadImage.addCategory(Intent.CATEGORY_OPENABLE); + loadImage.setType("image/*"); + startActivityForResult(loadImage, PHOTO_REQUEST); + } + }); } - /** * 当活动被系统销毁后，为了恢复之前的状态，此方法会被调用。 * 主要用于处理活动重新创建时的数据恢复。 @@ -343,6 +387,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 显示提醒头部信息（当前禁用，因DateTimePicker未准备好） showAlertHeader(); + convertToImage();//导入的图片变成路径 } /** @@ -371,6 +416,45 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } + private void convertToImage() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit + Editable editable = noteEditText.getText();//1.获取text + String noteText = editable.toString(); //2.将note内容转换为字符串 + int length = editable.length(); //内容的长度 + //3.截取img片段 [local]+uri+[local]，提取uri + for(int i = 0; i < length; i++) { + for(int j = i; j < length; j++) { + String img_fragment = noteText.substring(i, j+1); //img_fragment：关于图片路径的片段 + if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + int limit = 7; //[local]为7个字符 + //[local][/local]共15个字符，剩下的为真正的path长度 + int len = img_fragment.length()-15; + //从[local]之后的len个字符就是path + String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是："+path); + try { + bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + } catch (Exception e) { + e.printStackTrace(); + } + if(bitmap!=null){ //若图片存在 + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + //4.创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + //5.将指定的标记对象附加到文本的开始...结束范围 + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 + edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 + } + } + } + } + } /** * 当Activity接收到新的Intent时调用。 * 用于根据新的Intent重新初始化Activity状态。 @@ -1025,6 +1109,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + convertToImage();//导入的图片变成路径 } } @@ -1137,5 +1222,144 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + //获取文件的real path + public String getPath(final Context context, final Uri uri) { + + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + + // DocumentProvider + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + // ExternalStorageProvider +// if (isExternalStorageDocument(uri)) { +// final String docId = DocumentsContract.getDocumentId(uri); +// final String[] split = docId.split(":"); +// final String type = split[0]; +// +// if ("primary".equalsIgnoreCase(type)) { +// return Environment.getExternalStorageDirectory() + "/" + split[1]; +// } +// } +// // DownloadsProvider +// else if (isDownloadsDocument(uri)) { +// final String id = DocumentsContract.getDocumentId(uri); +// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); +// return getDataColumn(context, contentUri, null, null); +// } + // MediaProvider +// else + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。 + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + + + //是否为外部存储文件 +// public boolean isExternalStorageDocument(Uri uri) { +// return "com.android.externalstorage.documents".equals(uri.getAuthority()); +// } +// +// //是否为下载文件 +// public boolean isDownloadsDocument(Uri uri) { +// return "com.android.providers.downloads.documents".equals(uri.getAuthority()); +// } + + //是否为媒体文件 + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } + + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + Uri originalUri = intent.getData(); //1.获得图片的真实路径 + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if (bitmap != null) { + //3.根据Bitmap对象创建ImageSpan对象 + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this, originalUri); + //4.使用[local][/local]将path括起来，用于之后方便识别图片路径在note中的位置 + String img_fragment = "[local]" + path + "[/local]"; + //创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + //5.将选择的图片追加到EditText中光标所在位置 + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); //获取光标所在位置 + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); //将图片插入到光标所在位置 + + mWorkingNote.mContent = e.getText().toString(); + //6.把改动提交到数据库中,两个数据库表都要改的 + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet", mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content", mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id}); + + } else { + Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + // } diff --git a/Src/app/src/main/res/layout/activity_login.xml b/Src/app/src/main/res/layout/activity_login.xml new file mode 100644 index 0000000..1088273 --- /dev/null +++ b/Src/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,35 @@ + + + + + + + +