diff --git a/Doc/小米便签.docx b/Doc/小米便签.docx index ccadb94..8d63e26 100644 Binary files a/Doc/小米便签.docx and b/Doc/小米便签.docx differ diff --git a/Src/.gradle/7.5/executionHistory/executionHistory.bin b/Src/.gradle/7.5/executionHistory/executionHistory.bin index aa77335..b2fdc8f 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..af4c9ae 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..51fe87b 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..8cc0fe5 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..3deeae0 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..3058dc4 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..18e654e 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/app/build/intermediates/apk/debug/app-debug.apk b/Src/app/build/intermediates/apk/debug/app-debug.apk index 2e22a84..8fbb75a 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..d077654 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..7e6c26c 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..f907760 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..abed6d9 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_archive_input_jar_hashes/debug/out b/Src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 2d09eee..2aeb4de 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..24840ab 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,96 @@ -#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 +#Thu Dec 05 20:45:28 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/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/merger.xml b/Src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index c16ca6b..d59d840 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\" - + 短信 邮件 - 便签便签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..220370c 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,11 @@ -#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 +#Thu Dec 05 20:45:42 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 path.0=0/classes.dex path.1=11/classes.dex path.2=12/classes.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..fd61682 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.class b/Src/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index a327029..7eeade4 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/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/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..347dbb2 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..fddc6fa 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..21a6e7c 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..5883e84 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..0c7bd9f 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..5bb29a0 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..2caef51 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..2ed7733 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..dd8be63 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..3697b30 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..d19b0c3 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..2b687e6 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..a1679fe 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..89a3005 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/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..5b750d6 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 @@ -6,272 +6,272 @@ 6 android:versionCode="1" 7 android:versionName="0.1" > 8 D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 +8-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 9 android:minSdkVersion="21" -9-->D:\Notes\app\src\main\AndroidManifest.xml:11:15-41 +9-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:15-41 10 android:targetSdkVersion="21" /> -10-->D:\Notes\app\src\main\AndroidManifest.xml:11:5-44 +10-->D:\github\XiaoMiNote\Src\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 +13-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-81 +13-->D:\github\XiaoMiNote\Src\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 +14-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:15:5-88 +14-->D:\github\XiaoMiNote\Src\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 +15-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:16:5-67 +15-->D:\github\XiaoMiNote\Src\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 +16-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-72 +16-->D:\github\XiaoMiNote\Src\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 +17-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:5-74 +17-->D:\github\XiaoMiNote\Src\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 +18-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:5-80 +18-->D:\github\XiaoMiNote\Src\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 +19-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:20:5-71 +19-->D:\github\XiaoMiNote\Src\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 +20-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:21:5-74 +20-->D:\github\XiaoMiNote\Src\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 +21-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:5-81 +21-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:22:22-78 22 23 D:\Notes\app\src\main\AndroidManifest.xml:25:5-146:19 +23-->D:\github\XiaoMiNote\Src\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 +25-->D:\github\XiaoMiNote\Src\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 +26-->D:\github\XiaoMiNote\Src\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 +30-->D:\github\XiaoMiNote\Src\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 +31-->D:\github\XiaoMiNote\Src\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 +32-->D:\github\XiaoMiNote\Src\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 +33-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:32:13-45 34 android:launchMode="singleTop" -34-->D:\Notes\app\src\main\AndroidManifest.xml:33:13-43 +34-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-43 35 android:theme="@style/NoteTheme" -35-->D:\Notes\app\src\main\AndroidManifest.xml:34:13-45 +35-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:34:13-45 36 android:uiOptions="splitActionBarWhenNarrow" -36-->D:\Notes\app\src\main\AndroidManifest.xml:35:13-57 +36-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-57 37 android:windowSoftInputMode="adjustPan" > -37-->D:\Notes\app\src\main\AndroidManifest.xml:36:13-52 +37-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-52 38 -38-->D:\Notes\app\src\main\AndroidManifest.xml:37:13-40:29 +38-->D:\github\XiaoMiNote\Src\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 +39-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:38:17-69 +39-->D:\github\XiaoMiNote\Src\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 +41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:17-77 +41-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:39:27-74 42 43 44 45 46 D:\Notes\app\src\main\AndroidManifest.xml:44:9-76:20 +46-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:44:9-76: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:45: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:46: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:47:13-43 50 android:theme="@style/NoteTheme" > -50-->D:\Notes\app\src\main\AndroidManifest.xml:48:13-45 +50-->D:\github\XiaoMiNote\Src\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 +53-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:50:13-58:29 +53-->D:\github\XiaoMiNote\Src\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 +54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:17-69 +54-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:53:25-66 55 56 -56-->D:\Notes\app\src\main\AndroidManifest.xml:54:17-76 -56-->D:\Notes\app\src\main\AndroidManifest.xml:54:27-73 +56-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 +56-->D:\github\XiaoMiNote\Src\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 +58-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 +58-->D:\github\XiaoMiNote\Src\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 +59-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 +59-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 60 61 62 -62-->D:\Notes\app\src\main\AndroidManifest.xml:60:13-66:29 +62-->D:\github\XiaoMiNote\Src\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 +63-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:61:17-79 +63-->D:\github\XiaoMiNote\Src\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 +65-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 +65-->D:\github\XiaoMiNote\Src\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 +67-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 +67-->D:\github\XiaoMiNote\Src\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 +68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:17-78 +68-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:56:23-75 69 70 71 -71-->D:\Notes\app\src\main\AndroidManifest.xml:68:13-71:29 +71-->D:\github\XiaoMiNote\Src\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 +72-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:69:17-71 +72-->D:\github\XiaoMiNote\Src\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 +74-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:17-76 +74-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:54:27-73 75 76 77 D:\Notes\app\src\main\AndroidManifest.xml:73:13-75:54 +77-->D:\github\XiaoMiNote\Src\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 +78-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:74:17-54 79 android:resource="@xml/searchable" /> -79-->D:\Notes\app\src\main\AndroidManifest.xml:75:17-51 +79-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:75:17-51 80 81 82 83 D:\Notes\app\src\main\AndroidManifest.xml:79:9-82:43 +83-->D:\github\XiaoMiNote\Src\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 +84-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:80:13-63 85 android:authorities="micode_notes" -85-->D:\Notes\app\src\main\AndroidManifest.xml:81:13-47 +85-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:81:13-47 86 android:multiprocess="true" /> -86-->D:\Notes\app\src\main\AndroidManifest.xml:82:13-40 +86-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:82:13-40 87 88 89 D:\Notes\app\src\main\AndroidManifest.xml:85:9-96:20 +89-->D:\github\XiaoMiNote\Src\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 +90-->D:\github\XiaoMiNote\Src\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 +91-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:87:13-50 92 -92-->D:\Notes\app\src\main\AndroidManifest.xml:88:13-92:29 +92-->D:\github\XiaoMiNote\Src\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 +93-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:17-84 +93-->D:\github\XiaoMiNote\Src\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 +94-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 +94-->D:\github\XiaoMiNote\Src\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 +95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:17-85 +95-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:25-82 96 97 98 D:\Notes\app\src\main\AndroidManifest.xml:93:13-95:58 +98-->D:\github\XiaoMiNote\Src\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 +99-->D:\github\XiaoMiNote\Src\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 +100-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:17-55 101 102 103 D:\Notes\app\src\main\AndroidManifest.xml:98:9-109:20 +103-->D:\github\XiaoMiNote\Src\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 +104-->D:\github\XiaoMiNote\Src\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 +105-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:100:13-50 106 -106-->D:\Notes\app\src\main\AndroidManifest.xml:88:13-92:29 +106-->D:\github\XiaoMiNote\Src\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 +107-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:89:17-84 +107-->D:\github\XiaoMiNote\Src\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 +108-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 +108-->D:\github\XiaoMiNote\Src\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 +109-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:17-85 +109-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:91:25-82 110 111 112 D:\Notes\app\src\main\AndroidManifest.xml:93:13-95:58 +112-->D:\github\XiaoMiNote\Src\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 +113-->D:\github\XiaoMiNote\Src\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 +114-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:95:17-55 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 +118-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:9-116:20 +118-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:112:19-55 119 -119-->D:\Notes\app\src\main\AndroidManifest.xml:113:13-115:29 +119-->D:\github\XiaoMiNote\Src\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 +120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:17-79 +120-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:114:25-76 121 122 123 124 125 D:\Notes\app\src\main\AndroidManifest.xml:119:9-121:50 +125-->D:\github\XiaoMiNote\Src\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 +126-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:120:13-61 127 android:process=":remote" /> -127-->D:\Notes\app\src\main\AndroidManifest.xml:121:13-38 +127-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:121:13-38 128 129 130 D:\Notes\app\src\main\AndroidManifest.xml:124:9-128:87 +130-->D:\github\XiaoMiNote\Src\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 +131-->D:\github\XiaoMiNote\Src\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 +132-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:126:13-45 133 android:launchMode="singleInstance" -133-->D:\Notes\app\src\main\AndroidManifest.xml:127:13-48 +133-->D:\github\XiaoMiNote\Src\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 +134-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:128:13-75 135 136 137 D:\Notes\app\src\main\AndroidManifest.xml:131:9-135:72 +137-->D:\github\XiaoMiNote\Src\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 +138-->D:\github\XiaoMiNote\Src\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 +139-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:133:13-54 140 android:launchMode="singleTop" -140-->D:\Notes\app\src\main\AndroidManifest.xml:134:13-43 +140-->D:\github\XiaoMiNote\Src\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 +141-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:135:13-60 142 143 144 D:\Notes\app\src\main\AndroidManifest.xml:138:9-140:48 +144-->D:\github\XiaoMiNote\Src\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 +145-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:139:13-74 146 android:exported="false" /> -146-->D:\Notes\app\src\main\AndroidManifest.xml:140:13-37 +146-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:140:13-37 147 148 149 D:\Notes\app\src\main\AndroidManifest.xml:143:9-145:52 +149-->D:\github\XiaoMiNote\Src\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 +150-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:144:13-58 151 android:value=".ui.NoteEditActivity" /> -151-->D:\Notes\app\src\main\AndroidManifest.xml:145:13-49 +151-->D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:145:13-49 152 153 154 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_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..2ccce0f 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 @@ -4,26 +4,7 @@ "outputFile": "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", - "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,52 +21,33 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "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:\\Notes\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values-zh-rCN\\arrays.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": "16", + "startColumns": "4", + "startOffsets": "336", + "endLines": "19", + "endColumns": "19", + "endOffsets": "441" }, "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": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } - }, + } + ] + }, + { + "outputFile": "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 +64,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,7 +83,45 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "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", + "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": "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" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "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", @@ -143,7 +143,7 @@ "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-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", @@ -162,7 +162,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-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..fd64a3d 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 @@ -4,45 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "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:\\Notes\\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", - "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": "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" - } - }, - { - "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", @@ -59,7 +21,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", @@ -78,7 +40,45 @@ } }, { - "source": "D:\\Notes\\app\\src\\main\\res\\values\\colors.xml", + "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", + "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": "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" + } + }, + { + "source": "D:\\github\\XiaoMiNote\\Src\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "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", 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..6af9f95 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/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_9.jar b/Src/app/build/intermediates/project_dex_archive/debug/out/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_9.jar new file mode 100644 index 0000000..ed0cf9e Binary files /dev/null and b/Src/app/build/intermediates/project_dex_archive/debug/out/92922e5495b78ea82e09e2ccc5ac512f57b7e1742d4c266b4b51e58a4838f5c5_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.dex b/Src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index a400a0b..c8ba276 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/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/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..b43bda5 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..518b973 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..b751af5 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..1c24fb1 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..feca944 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..bac57cc 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..a729733 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..2f767ee 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..247fa7f 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..fa02165 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..6aa2060 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..cf7b6e2 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..4177584 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..523c713 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/runtime_symbol_list/debug/R.txt b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..2927cf5 100644 --- a/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/Src/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -77,70 +77,71 @@ 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 btn_new_note 0x7f050005 +int id btn_set_bg_color 0x7f050006 +int id cb_edit_item 0x7f050007 +int id date 0x7f050008 +int id delete 0x7f050009 +int id et_edit_text 0x7f05000a +int id et_foler_name 0x7f05000b +int id font_size_selector 0x7f05000c +int id hour 0x7f05000d +int id iv_alert_icon 0x7f05000e +int id iv_bg_blue 0x7f05000f +int id iv_bg_blue_select 0x7f050010 +int id iv_bg_green 0x7f050011 +int id iv_bg_green_select 0x7f050012 +int id iv_bg_red 0x7f050013 +int id iv_bg_red_select 0x7f050014 +int id iv_bg_white 0x7f050015 +int id iv_bg_white_select 0x7f050016 +int id iv_bg_yellow 0x7f050017 +int id iv_bg_yellow_select 0x7f050018 +int id iv_large_select 0x7f050019 +int id iv_medium_select 0x7f05001a +int id iv_small_select 0x7f05001b +int id iv_super_select 0x7f05001c +int id ll_font_large 0x7f05001d +int id ll_font_normal 0x7f05001e +int id ll_font_small 0x7f05001f +int id ll_font_super 0x7f050020 +int id menu_alert 0x7f050021 +int id menu_delete 0x7f050022 +int id menu_delete_remind 0x7f050023 +int id menu_export_text 0x7f050024 +int id menu_font_size 0x7f050025 +int id menu_list_mode 0x7f050026 +int id menu_new_folder 0x7f050027 +int id menu_new_note 0x7f050028 +int id menu_search 0x7f050029 +int id menu_send_to_desktop 0x7f05002a +int id menu_setting 0x7f05002b +int id menu_share 0x7f05002c +int id menu_sync 0x7f05002d +int id minute 0x7f05002e +int id move 0x7f05002f +int id navigation_bar 0x7f050030 +int id note_bg_color_selector 0x7f050031 +int id note_edit_list 0x7f050032 +int id note_edit_view 0x7f050033 +int id note_item 0x7f050034 +int id note_title 0x7f050035 +int id notes_list 0x7f050036 +int id prefenerece_sync_status_textview 0x7f050037 +int id preference_sync_button 0x7f050038 +int id selection_menu 0x7f050039 +int id sv_note_edit 0x7f05003a +int id tv_alert_date 0x7f05003b +int id tv_folder_name 0x7f05003c +int id tv_modified_date 0x7f05003d +int id tv_name 0x7f05003e +int id tv_time 0x7f05003f +int id tv_title 0x7f050040 +int id tv_title_bar 0x7f050041 +int id widget_bg_image 0x7f050042 +int id widget_text 0x7f050043 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 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..83040b8 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 @@ -81,11 +81,11 @@ 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 = 0x7f05002f +net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 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:id/iv_bg_blue = 0x7f05000f net.micode.notes:layout/settings_header = 0x7f06000b net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040027 @@ -93,129 +93,128 @@ net.micode.notes:layout/note_item = 0x7f060007 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:id/btn_new_note = 0x7f050005 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:id/widget_text = 0x7f050043 +net.micode.notes:id/tv_title_bar = 0x7f050041 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 = 0x7f05003f +net.micode.notes:id/tv_name = 0x7f05003e 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 = 0x7f05003a net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050037 +net.micode.notes:id/preference_sync_button = 0x7f050038 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:id/notes_list = 0x7f050036 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 = 0x7f050035 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 = 0x7f050033 +net.micode.notes:id/navigation_bar = 0x7f050030 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 = 0x7f05002e 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 = 0x7f05002d +net.micode.notes:id/menu_share = 0x7f05002c +net.micode.notes:id/menu_setting = 0x7f05002b 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 = 0x7f05002a +net.micode.notes:id/menu_search = 0x7f050029 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050027 +net.micode.notes:id/menu_new_note = 0x7f050028 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 = 0x7f050027 +net.micode.notes:id/menu_list_mode = 0x7f050026 +net.micode.notes:id/iv_medium_select = 0x7f05001a +net.micode.notes:id/menu_export_text = 0x7f050024 net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050021 +net.micode.notes:id/menu_delete = 0x7f050022 net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 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 = 0x7f050021 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 = 0x7f050020 +net.micode.notes:id/ll_font_small = 0x7f05001f 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 = 0x7f05001e +net.micode.notes:id/ll_font_large = 0x7f05001d +net.micode.notes:id/note_bg_color_selector = 0x7f050031 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 = 0x7f05001c +net.micode.notes:id/iv_bg_yellow = 0x7f050017 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:id/iv_bg_white_select = 0x7f050016 +net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:id/tv_alert_date = 0x7f05003b 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_red = 0x7f050013 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:id/iv_large_select = 0x7f050019 +net.micode.notes:id/widget_bg_image = 0x7f050042 +net.micode.notes:id/iv_bg_green_select = 0x7f050012 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_bg_blue_select = 0x7f050010 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 = 0x7f05000c +net.micode.notes:id/et_edit_text = 0x7f05000a +net.micode.notes:id/et_foler_name = 0x7f05000b net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:layout/widget_4x = 0x7f06000d 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 = 0x7f050007 +net.micode.notes:id/btn_set_bg_color = 0x7f050006 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 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:id/iv_bg_green = 0x7f050011 +net.micode.notes:id/amPm = 0x7f050004 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 = 0x7f05000d 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:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:id/delete = 0x7f050009 net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 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 = 0x7f05003d net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:id/iv_small_select = 0x7f05001b 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 = 0x7f050008 net.micode.notes:drawable/list_yellow_single = 0x7f04002b 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 = 0x7f05003c 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:id/iv_alert_icon = 0x7f05000e net.micode.notes:layout/dialog_edit_text = 0x7f060003 net.micode.notes:string/preferences_account_title = 0x7f0a0045 net.micode.notes:drawable/edit_white = 0x7f04000e @@ -234,11 +233,10 @@ 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/menu_delete_remind = 0x7f050023 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:id/iv_bg_red_select = 0x7f050014 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040017 @@ -250,24 +248,27 @@ 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:id/tv_title = 0x7f050040 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 = 0x7f050039 +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 = 0x7f050034 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050031 +net.micode.notes:id/note_edit_list = 0x7f050032 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 = 0x7f050025 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 net.micode.notes:drawable/list_yellow_up = 0x7f04002c net.micode.notes:dimen/text_font_size_small = 0x7f030003 diff --git a/Src/app/build/outputs/apk/debug/app-debug.apk b/Src/app/build/outputs/apk/debug/app-debug.apk index dde6fa4..dbbd586 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..9c6b64b 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,241 @@ -- 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:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147:12 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:4:1-147: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:6: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:8: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:5: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:4: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 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:7: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-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 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 +INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 +INJECTED from D:\github\XiaoMiNote\Src\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 + INJECTED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:11:5-44 + INJECTED from D:\github\XiaoMiNote\Src\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:11:15-41 + 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 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:14:5-81 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:14:22-78 + ADDED from D:\github\XiaoMiNote\Src\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:15:5-88 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:15:22-85 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:16: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:16:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:17:5-72 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:17:5-72 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:17:22-69 + ADDED from D:\github\XiaoMiNote\Src\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 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:18:5-74 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:18:22-71 + ADDED from D:\github\XiaoMiNote\Src\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 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:19:5-80 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:19:22-77 + ADDED from D:\github\XiaoMiNote\Src\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:20:5-71 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:20:22-68 + ADDED from D:\github\XiaoMiNote\Src\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 +ADDED from D:\github\XiaoMiNote\Src\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:21:22-71 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:22: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:22: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:25:5-146: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:27:9-41 android:icon - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:26:9-42 + ADDED from D:\github\XiaoMiNote\Src\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 +ADDED from D:\github\XiaoMiNote\Src\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:32:13-45 android:launchMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:33:13-43 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:33:13-43 android:windowSoftInputMode - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:36:13-52 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:36:13-52 android:uiOptions - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:35:13-57 + ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:35:13-57 android:configChanges - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:31:13-74 + ADDED from D:\github\XiaoMiNote\Src\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:34:13-45 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:30:13-49 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:37:13-40: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:38: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:38: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:39: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:39:27-74 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:44:9-76: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:47: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:46: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:48: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:45: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:50:13-58: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:51: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:52: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:53: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:53: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:54: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:54: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:56: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:56: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:60:13-66: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:61: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:61: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:68:13-71: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:69: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:69: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:73:13-75: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:75: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:74: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:79:9-82: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:81: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:82: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:80: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:85:9-96: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:87:13-50 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:86:13-57 + ADDED from D:\github\XiaoMiNote\Src\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:88:13-92: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:89: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:89:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes\app\src\main\AndroidManifest.xml:90:17-85 +ADDED from D:\github\XiaoMiNote\Src\app\src\main\AndroidManifest.xml:90:17-85 android:name - ADDED from D:\Notes\app\src\main\AndroidManifest.xml:90:25-82 + ADDED from D:\github\XiaoMiNote\Src\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:91: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:91: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:93:13-95: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:95: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:94: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:98:9-109: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:100: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:99: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:112:9-116: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:112: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:113:13-115: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:114: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:114: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:119:9-121:50 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:121: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:120: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:124:9-128: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:126: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:127: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:128: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:125: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:131:9-135: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:133: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:134: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:135: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:132: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:138:9-140:48 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:140: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:139: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:143:9-145: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:145: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:144:13-58 diff --git a/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/Src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 3d7fdd1..6ad11ce 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/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..6f10435 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,30 @@ 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 +58,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 +77,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 +183,49 @@ 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 +386,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 显示提醒头部信息(当前禁用,因DateTimePicker未准备好) showAlertHeader(); + convertToImage();//导入的图片变成路径 } /** @@ -371,6 +415,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 +1108,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 +1221,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/note_edit.xml b/Src/app/src/main/res/layout/note_edit.xml index 52c884d..77e2c66 100644 --- a/Src/app/src/main/res/layout/note_edit.xml +++ b/Src/app/src/main/res/layout/note_edit.xml @@ -116,7 +116,14 @@ android:background="@drawable/bg_color_btn_mask" /> - +