gtask

11 months ago · 410bba9d76
parent da007975bd
commit 410bba9d76
68 changed files with 1249 additions and 885 deletions
--- a/src/Notes-master/.gradle/8.0/checksums/checksums.lock
+++ b/src/Notes-master/.gradle/8.0/checksums/checksums.lock
--- a/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin
+++ b/src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin
--- a/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin
+++ b/src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin
--- a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
+++ b/src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
+++ b/src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_2/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_2/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_3/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_3/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_6/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_6/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_7/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f1b6f29af77e3f149fb4729aab8aed365050a341d1bb44145d9589626de7a85c_bucket_7/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_0/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_0/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_1/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_1/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_2/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_2/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_3/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_3/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_4/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_4/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_5/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_5/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_6/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_6/graph.bin
--- a/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_7/graph.bin
+++ b/src/Notes-master/app/build/intermediates/desugar_graph/debugAndroidTest/out/currentProject/jar_8aa2c456a0c111a02e18fcbb6420d97ce2fcc1f3e193a3b2d6958611594c80b6_bucket_7/graph.bin
--- a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
+++ b/src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,96 +1,96 @@
-#Sun Dec 10 23:29:21 CST 2023
-net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-6\:/raw/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+#Thu Dec 21 01:11:46 CST 2023
+net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-6\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-6\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-6\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-6\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-6\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-6\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-6\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-6\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-6\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@ -1,96 +1,96 @@
-#Sun Dec 10 23:29:22 CST 2023
-net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
-net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
-net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
-net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
-net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
-net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
-net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
-net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
-net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
-net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
-net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
-net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
-net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
-net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
-net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
-net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
-net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
-net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
-net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
-net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
-net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
-net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
-net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
-net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
-net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
-net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
-net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
-net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
-net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
-net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
-net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
-net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
-net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
-net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
-net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
-net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
-net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
-net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
-net.micode.notes.app-main-5\:/raw/introduction=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
-net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
-net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
-net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
-net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
+#Thu Dec 21 01:11:49 CST 2023
+net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
+net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
+net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
+net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
+net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
+net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
+net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
+net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
+net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/drawable/new_note.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
+net.micode.notes.app-main-5\:/layout/add_account_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/datetime_picker.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
+net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
+net.micode.notes.app-main-5\:/layout/folder_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
+net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_item.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
+net.micode.notes.app-main-5\:/layout/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
+net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
+net.micode.notes.app-main-5\:/layout/note_list_footer.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/layout/settings_header.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
+net.micode.notes.app-main-5\:/layout/widget_2x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
+net.micode.notes.app-main-5\:/layout/widget_4x.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
+net.micode.notes.app-main-5\:/menu/call_note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
+net.micode.notes.app-main-5\:/menu/call_record_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
+net.micode.notes.app-main-5\:/menu/note_edit.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
+net.micode.notes.app-main-5\:/menu/note_list.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
+net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
+net.micode.notes.app-main-5\:/menu/note_list_options.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
+net.micode.notes.app-main-5\:/menu/sub_folder.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
+net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
+net.micode.notes.app-main-5\:/raw/introduction=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
+net.micode.notes.app-main-5\:/xml/preferences.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
+net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
+net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
+net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
--- a/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@ -1 +1 @@
-#Fri Nov 10 09:20:17 CST 2023
+#Thu Dec 21 01:11:50 CST 2023
--- a/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Sun Dec 10 23:29:24 CST 2023
-base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+#Thu Dec 21 01:12:17 CST 2023
+base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@ -1,4 +1,4 @@
-#Fri Nov 17 20:53:27 CST 2023
-base.0=D\:\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
+#Thu Dec 21 01:11:55 CST 2023
+base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@ -20,252 +20,252 @@
 20    android:versionName="0.1" >
 21
 22    <uses-sdk
-22-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+22-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
 23        android:minSdkVersion="14"
-23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+23-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
 24        android:targetSdkVersion="14" />
 25
 26    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-26-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-26-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+26-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
 27    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-27-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-27-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
+27-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
 28    <uses-permission android:name="android.permission.INTERNET" />
-28-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-28-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
+28-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
 29    <uses-permission android:name="android.permission.READ_CONTACTS" />
-29-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-29-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
+29-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
 30    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-30-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-30-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
+30-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
 31    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-31-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-31-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
+31-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
 32    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-32-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-32-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
+32-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
 33    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-33-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-33-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
+33-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
 34    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-34-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-34-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
+34-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 35
 36    <application
-36-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+36-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
 37        android:debuggable="true"
 38        android:extractNativeLibs="true"
 39        android:icon="@drawable/icon_app"
-39-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+39-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
 40        android:label="@string/app_name"
-40-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+40-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
 41        android:testOnly="true" >
 42        <activity
-42-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
+42-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
 43            android:name="net.micode.notes.ui.NotesListActivity"
-43-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+43-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
 44            android:configChanges="keyboardHidden|orientation|screenSize"
-44-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+44-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
 45            android:label="@string/app_name"
-45-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+45-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
 46            android:launchMode="singleTop"
-46-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+46-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
 47            android:theme="@style/NoteTheme"
-47-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+47-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
 48            android:windowSoftInputMode="adjustPan" >
-48-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
+48-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
 49            <intent-filter>
-49-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
+49-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
 50                <action android:name="android.intent.action.MAIN" />
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
-50-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
+50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
+50-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
 51
 52                <category android:name="android.intent.category.LAUNCHER" />
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
-52-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
+52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
+52-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
 53            </intent-filter>
 54        </activity>
 55        <activity
-55-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
+55-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
 56            android:name="net.micode.notes.ui.NoteEditActivity"
-56-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
+56-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
 57            android:configChanges="keyboardHidden|orientation|screenSize"
-57-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
+57-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
 58            android:launchMode="singleTop"
-58-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
+58-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
 59            android:theme="@style/NoteTheme" >
-59-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
+59-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
 60            <intent-filter>
-60-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
+60-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
 61                <action android:name="android.intent.action.VIEW" />
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
-61-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
+61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
+61-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
 62
 63                <category android:name="android.intent.category.DEFAULT" />
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-63-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+63-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
 64
 65                <data android:mimeType="vnd.android.cursor.item/text_note" />
-65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-65-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+65-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
 66                <data android:mimeType="vnd.android.cursor.item/call_note" />
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-66-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+66-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
 67            </intent-filter>
 68            <intent-filter>
-68-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
+68-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
 69                <action android:name="android.intent.action.INSERT_OR_EDIT" />
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
-69-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
+69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
+69-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
 70
 71                <category android:name="android.intent.category.DEFAULT" />
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-71-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+71-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
 72
 73                <data android:mimeType="vnd.android.cursor.item/text_note" />
-73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-73-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+73-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
 74                <data android:mimeType="vnd.android.cursor.item/call_note" />
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
-74-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+74-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
 75            </intent-filter>
 76            <intent-filter>
-76-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
+76-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
 77                <action android:name="android.intent.action.SEARCH" />
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
-77-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
+77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
+77-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
 78
 79                <category android:name="android.intent.category.DEFAULT" />
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
-79-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+79-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
 80            </intent-filter>
 81
 82            <meta-data
-82-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
+82-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
 83                android:name="android.app.searchable"
-83-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
+83-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
 84                android:resource="@xml/searchable" />
-84-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
+84-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
 85        </activity>
 86
 87        <provider
-87-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
+87-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
 88            android:name="net.micode.notes.data.NotesProvider"
-88-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
+88-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
 89            android:authorities="micode_notes"
-89-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
+89-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
 90            android:multiprocess="true" />
-90-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
+90-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
 91
 92        <receiver
-92-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
+92-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
 93            android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
+93-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
 94            android:label="@string/app_widget2x2" >
-94-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
+94-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
 95            <intent-filter>
-95-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
+95-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
 96                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-96-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
+96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
+96-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
 97                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-97-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+97-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
 98                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-98-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+98-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 99            </intent-filter>
 100
 101            <meta-data
-101-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
+101-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
 102                android:name="android.appwidget.provider"
-102-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
+102-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
 103                android:resource="@xml/widget_2x_info" />
-103-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
+103-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
 104        </receiver>
 105        <receiver
-105-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
+105-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
 106            android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
+106-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
 107            android:label="@string/app_widget4x4" >
-107-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
+107-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
 108            <intent-filter>
-108-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
+108-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
 109                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
-109-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
+109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
+109-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
 110                <action android:name="android.appwidget.action.APPWIDGET_DELETED" />
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
-110-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+110-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
 111                <action android:name="android.intent.action.PRIVACY_MODE_CHANGED" />
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-111-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+111-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 112            </intent-filter>
 113
 114            <meta-data
-114-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
+114-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
 115                android:name="android.appwidget.provider"
-115-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
+115-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
 116                android:resource="@xml/widget_4x_info" />
-116-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
+116-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
 117        </receiver>
 118        <receiver android:name="net.micode.notes.ui.AlarmInitReceiver" >
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
-118-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
+118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
+118-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
 119            <intent-filter>
-119-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
+119-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
 120                <action android:name="android.intent.action.BOOT_COMPLETED" />
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
-120-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
+120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
+120-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
 121            </intent-filter>
 122        </receiver>
 123        <receiver
-123-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
+123-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
 124            android:name="net.micode.notes.ui.AlarmReceiver"
-124-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
+124-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
 125            android:process=":remote" >
-125-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
+125-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
 126        </receiver>
 127
 128        <activity
-128-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
+128-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
 129            android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
+129-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
 130            android:label="@string/app_name"
-130-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
+130-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
 131            android:launchMode="singleInstance"
-131-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
+131-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
 132            android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
+132-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
 133        </activity>
 134        <activity
-134-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
+134-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
 135            android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
+135-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
 136            android:label="@string/preferences_title"
-136-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
+136-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
 137            android:launchMode="singleTop"
-137-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
+137-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
 138            android:theme="@android:style/Theme.Holo.Light" >
-138-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
+138-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
 139        </activity>
 140
 141        <service
-141-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+141-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
 142            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+142-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
 143            android:exported="false" >
-143-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+143-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
 144        </service>
 145
 146        <meta-data
-146-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+146-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
 147            android:name="android.app.default_searchable"
-147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+147-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
 148            android:value=".ui.NoteEditActivity" />
-148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+148-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
 149    </application>
 150
 151</manifest>
--- a/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
+++ b/src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@ -3,32 +3,32 @@
 3    package="net.micode.notes.test" >
 4
 5    <uses-sdk
-5-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:5:5-74
+5-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:5-74
 6        android:minSdkVersion="14"
-6-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:5:15-41
+6-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:15-41
 7        android:targetSdkVersion="14" />
-7-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:5:42-71
+7-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:42-71
 8
 9    <instrumentation
-9-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:11:5-15:66
+9-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:5-15:66
 10        android:name="android.test.InstrumentationTestRunner"
-10-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:11:22-75
+10-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:11:22-75
 11        android:functionalTest="false"
-11-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:14:22-52
+11-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:14:22-52
 12        android:handleProfiling="false"
-12-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:13:22-53
+12-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:13:22-53
 13        android:label="Tests for net.micode.notes"
-13-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:15:22-64
+13-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:15:22-64
 14        android:targetPackage="net.micode.notes" />
-14-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:12:22-62
+14-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:12:22-62
 15
 16    <application
-16-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:7:5-9:19
+16-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:7:5-9:19
 17        android:debuggable="true"
 18        android:extractNativeLibs="true" >
 19        <uses-library android:name="android.test.runner" />
-19-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:8:9-60
-19-->D:\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest12879175485511818971.xml:8:23-57
+19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:9-60
+19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:23-57
 20    </application>
 21
 22</manifest>
--- a/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
+++ b/src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@ -1,36 +1,17 @@
 {
    "logs": [
        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                        "endLines": "21",
                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                    },
                    "to": {
                        "startLines": "2",
@ -40,69 +21,56 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
-            "map": [
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
+                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
                    },
                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
                    }
-                },
+                }
+            ]
+        },
+        {
+            "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
                    "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                    },
                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                    },
                    "to": {
                        "startLines": "12",
@ -113,34 +81,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
-            "map": [
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
                    },
                    "to": {
                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@ -152,14 +100,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
                    "from": {
                        "startLines": "19,26",
                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                        "endLines": "24,29",
                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                    },
                    "to": {
                        "startLines": "2,8",
@ -171,72 +119,38 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
                    "from": {
                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
                    },
                    "to": {
                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
                    }
                }
            ]
        },
        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rTW_values-zh-rTW.arsc.flat",
+            "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                        "endLines": "21",
                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                    },
                    "to": {
                        "startLines": "2",
@ -248,14 +162,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                    "from": {
                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@ -4,33 +4,14 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
-                    "from": {
-                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029",
-                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
-                    },
-                    "to": {
-                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
-                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
-                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                        "endLines": "21",
                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                    },
                    "to": {
                        "startLines": "2",
@ -40,6 +21,25 @@
                        "endColumns": "19",
                        "endOffsets": "210"
                    }
+                },
+                {
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+                    "from": {
+                        "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052",
+                        "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
+                    },
+                    "to": {
+                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+                        "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925",
+                        "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+                        "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+                        "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
+                    }
                }
            ]
        }
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@ -4,14 +4,14 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
                    "from": {
                        "startLines": "18",
                        "startColumns": "4",
-                        "startOffsets": "712",
+                        "startOffsets": "730",
                        "endLines": "21",
                        "endColumns": "19",
-                        "endOffsets": "817"
+                        "endOffsets": "838"
                    },
                    "to": {
                        "startLines": "2",
@ -23,14 +23,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
                    "from": {
                        "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029",
+                        "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052",
                        "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
                        "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
-                        "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
+                        "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
                    },
                    "to": {
                        "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
--- a/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@ -4,62 +4,30 @@
            "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
            "map": [
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034",
-                        "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
-                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
-                    "from": {
-                        "startLines": "-1,-1",
-                        "startColumns": "-1,-1",
-                        "startOffsets": "-1,-1"
-                    },
-                    "to": {
-                        "startLines": "2,8",
-                        "startColumns": "4,4",
-                        "startOffsets": "105,300",
-                        "endLines": "7,11",
-                        "endColumns": "19,19",
-                        "endOffsets": "295,415"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
-                    "from": {
-                        "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
-                        "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
+                        "startLines": "19,20,21,22,18",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "783,836,890,944,730",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "830,884,938,991,777"
                    },
                    "to": {
-                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
-                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
-                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
-                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
+                        "startLines": "13,14,15,16,17",
+                        "startColumns": "4,4,4,4,4",
+                        "startOffsets": "477,529,582,635,687",
+                        "endColumns": "51,52,52,51,51",
+                        "endOffsets": "524,577,630,682,734"
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
                    "from": {
-                        "startLines": "-1",
-                        "startColumns": "-1",
-                        "startOffsets": "-1"
+                        "startLines": "18",
+                        "startColumns": "4",
+                        "startOffsets": "730",
+                        "endColumns": "56",
+                        "endOffsets": "782"
                    },
                    "to": {
                        "startLines": "12",
@ -70,34 +38,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "-1,-1,-1,-1,-1",
-                        "startColumns": "-1,-1,-1,-1,-1",
-                        "startOffsets": "-1,-1,-1,-1,-1"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
-                    }
-                }
-            ]
-        },
-        {
-            "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-mergeDebugResources-2:\\values\\values.xml",
-            "map": [
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
                    "from": {
                        "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084",
+                        "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107",
                        "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
                        "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
-                        "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169"
+                        "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
                    },
                    "to": {
                        "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124",
@ -109,14 +57,14 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
                    "from": {
                        "startLines": "19,26",
                        "startColumns": "4,4",
-                        "startOffsets": "739,1047",
+                        "startOffsets": "758,1073",
                        "endLines": "24,29",
                        "endColumns": "19,19",
-                        "endOffsets": "1041,1162"
+                        "endOffsets": "1065,1191"
                    },
                    "to": {
                        "startLines": "2,8",
@ -128,56 +76,22 @@
                    }
                },
                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
+                    "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
                    "from": {
                        "startLines": "50,55,64,60,22,26,30,35,40,18,45",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+                        "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
                        "endLines": "53,58,67,62,25,29,33,38,43,21,48",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+                        "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
                    },
                    "to": {
                        "startLines": "125,129,133,137,140,144,148,152,156,160,164",
                        "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
-                        "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+                        "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054",
                        "endLines": "128,132,136,139,143,147,151,155,159,163,167",
                        "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
-                        "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
-                    "from": {
-                        "startLines": "18",
-                        "startColumns": "4",
-                        "startOffsets": "712",
-                        "endColumns": "56",
-                        "endOffsets": "764"
-                    },
-                    "to": {
-                        "startLines": "12",
-                        "startColumns": "4",
-                        "startOffsets": "420",
-                        "endColumns": "56",
-                        "endOffsets": "472"
-                    }
-                },
-                {
-                    "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
-                    "from": {
-                        "startLines": "19,20,21,22,18",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "764,816,869,922,712",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "811,864,917,969,759"
-                    },
-                    "to": {
-                        "startLines": "13,14,15,16,17",
-                        "startColumns": "4,4,4,4,4",
-                        "startOffsets": "477,529,582,635,687",
-                        "endColumns": "51,52,52,51,51",
-                        "endOffsets": "524,577,630,682,734"
+                        "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
                    }
                }
            ]
--- a/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
@ -1,7 +1,7 @@
-net.micode.notes.app-pngs-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
-net.micode.notes.app-packageDebugResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
-net.micode.notes.app-packageDebugResources-3 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
-net.micode.notes.app-merged_res-4 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-5 D:\Project1\MiNotes\src\Notes-master\app\src\debug\res
-net.micode.notes.app-main-6 D:\Project1\MiNotes\src\Notes-master\app\src\main\res
+net.micode.notes.app-pngs-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
+net.micode.notes.app-packageDebugResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
+net.micode.notes.app-packageDebugResources-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
+net.micode.notes.app-merged_res-4 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\res
+net.micode.notes.app-main-6 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\res
--- a/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
+++ b/src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@ -1,4 +1,4 @@
-net.micode.notes.test.app-androidTest-0 D:\Notes-master\app\build\generated\res\resValues\androidTest\debug
-net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
-net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
-net.micode.notes.test.app-merged_res-3 D:\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
+net.micode.notes.test.app-androidTest-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug
+net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
+net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
+net.micode.notes.test.app-merged_res-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
--- a/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/src/Notes-master/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@ -1,125 +1,109 @@
+net.micode.notes:xml/searchable = 0x7f0c0001
 net.micode.notes:xml/preferences = 0x7f0c0000
-net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
-net.micode.notes:string/menu_deselect_all = 0x7f0a0022
-net.micode.notes:string/search = 0x7f0a0056
-net.micode.notes:string/search_setting_description = 0x7f0a0059
 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
-net.micode.notes:string/preferences_title = 0x7f0a0053
+net.micode.notes:xml/widget_2x_info = 0x7f0c0002
+net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
+net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001
-net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
+net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
+net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:string/success_sync_account = 0x7f0a005c
+net.micode.notes:string/search_setting_description = 0x7f0a0059
+net.micode.notes:string/search_hint = 0x7f0a0057
+net.micode.notes:string/search = 0x7f0a0056
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
+net.micode.notes:string/preferences_title = 0x7f0a0053
 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
+net.micode.notes:string/preferences_add_account = 0x7f0a0046
+net.micode.notes:string/preferences_account_title = 0x7f0a0045
 net.micode.notes:xml/widget_4x_info = 0x7f0c0003
-net.micode.notes:string/notealert_enter = 0x7f0a0040
 net.micode.notes:string/set_remind_time_message = 0x7f0a005a
-net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
-net.micode.notes:id/account_dialog_subtitle = 0x7f050000
-net.micode.notes:menu/note_list = 0x7f070003
-net.micode.notes:string/sync_progress_login = 0x7f0a005e
+net.micode.notes:string/notealert_enter = 0x7f0a0040
+net.micode.notes:string/note_link_web = 0x7f0a003f
+net.micode.notes:string/note_link_tel = 0x7f0a003e
 net.micode.notes:string/note_link_other = 0x7f0a003d
-net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055
-net.micode.notes:string/search_hint = 0x7f0a0057
-net.micode.notes:string/menu_normal_mode = 0x7f0a002f
-net.micode.notes:string/menu_setting = 0x7f0a0036
-net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047
-net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a
-net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
+net.micode.notes:string/note_link_email = 0x7f0a003c
 net.micode.notes:string/note_alert_expired = 0x7f0a003b
-net.micode.notes:id/ll_font_super = 0x7f05001f
-net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
+net.micode.notes:string/menu_sync = 0x7f0a0038
 net.micode.notes:string/menu_share = 0x7f0a0037
-net.micode.notes:string/error_sync_network = 0x7f0a0013
-net.micode.notes:id/notes_list = 0x7f050035
-net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065
-net.micode.notes:string/menu_font_small = 0x7f0a002a
-net.micode.notes:string/menu_font_normal = 0x7f0a0028
-net.micode.notes:string/note_link_tel = 0x7f0a003e
+net.micode.notes:string/menu_setting = 0x7f0a0036
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035
 net.micode.notes:string/menu_select_title = 0x7f0a0034
-net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005
-net.micode.notes:id/menu_send_to_desktop = 0x7f050029
-net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
-net.micode.notes:menu/call_note_edit = 0x7f070000
-net.micode.notes:id/preference_sync_button = 0x7f050037
-net.micode.notes:string/menu_search = 0x7f0a0031
-net.micode.notes:string/menu_font_size = 0x7f0a0029
-net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
 net.micode.notes:string/menu_select_all = 0x7f0a0032
-net.micode.notes:string/note_link_email = 0x7f0a003c
-net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b
-net.micode.notes:xml/searchable = 0x7f0c0001
-net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
-net.micode.notes:string/menu_sync_cancel = 0x7f0a0039
-net.micode.notes:string/menu_export_text = 0x7f0a0023
+net.micode.notes:string/menu_search = 0x7f0a0031
+net.micode.notes:string/menu_normal_mode = 0x7f0a002f
+net.micode.notes:string/menu_font_size = 0x7f0a0029
+net.micode.notes:string/menu_font_small = 0x7f0a002a
+net.micode.notes:string/menu_font_normal = 0x7f0a0028
 net.micode.notes:string/menu_remove_remind = 0x7f0a0030
 net.micode.notes:string/menu_font_large = 0x7f0a0027
-net.micode.notes:menu/sub_folder = 0x7f070006
-net.micode.notes:layout/note_item = 0x7f060007
-net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:string/menu_folder_change_name = 0x7f0a0024
+net.micode.notes:string/menu_export_text = 0x7f0a0023
+net.micode.notes:string/menu_deselect_all = 0x7f0a0022
 net.micode.notes:string/menu_create_folder = 0x7f0a0020
-net.micode.notes:drawable/widget_2x_red = 0x7f04003a
-net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
-net.micode.notes:string/format_date_ymd = 0x7f0a0018
-net.micode.notes:string/preferences_account_summary = 0x7f0a0044
+net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e
 net.micode.notes:string/success_sdcard_export = 0x7f0a005b
 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
-net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
+net.micode.notes:string/preferences_account_summary = 0x7f0a0044
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
 net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:id/note_edit_list = 0x7f050031
 net.micode.notes:drawable/new_note = 0x7f04002f
 net.micode.notes:string/folder_exist = 0x7f0a0017
-net.micode.notes:id/note_edit_list = 0x7f050031
-net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
 net.micode.notes:string/menu_select_none = 0x7f0a0033
-net.micode.notes:layout/widget_4x = 0x7f06000d
-net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
-net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
-net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
 net.micode.notes:string/ticker_cancel = 0x7f0a0060
+net.micode.notes:drawable/list_red_single = 0x7f040023
+net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009
+net.micode.notes:string/error_sync_cancelled = 0x7f0a0011
+net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010
 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008
 net.micode.notes:drawable/widget_4x_green = 0x7f04003e
 net.micode.notes:string/error_sdcard_export = 0x7f0a000f
-net.micode.notes:string/note_link_web = 0x7f0a003f
-net.micode.notes:id/menu_sync = 0x7f05002c
-net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007
-net.micode.notes:xml/widget_2x_info = 0x7f0c0002
-net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
-net.micode.notes:id/tv_title = 0x7f05003f
-net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
 net.micode.notes:string/notealert_ok = 0x7f0a0041
-net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e
+net.micode.notes:id/tv_title = 0x7f05003f
+net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c
+net.micode.notes:string/delete_remind_time_message = 0x7f0a000b
 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006
-net.micode.notes:string/button_delete = 0x7f0a0007
 net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052
-net.micode.notes:id/menu_list_mode = 0x7f050025
-net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/button_delete = 0x7f0a0007
 net.micode.notes:string/ticker_fail = 0x7f0a0061
-net.micode.notes:string/app_name = 0x7f0a0004
 net.micode.notes:string/search_label = 0x7f0a0058
 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c
-net.micode.notes:string/success_sync_account = 0x7f0a005c
-net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
-net.micode.notes:id/amPm = 0x7f050003
-net.micode.notes:string/preferences_account_title = 0x7f0a0045
-net.micode.notes:string/alert_title_delete = 0x7f0a0003
-net.micode.notes:string/widget_havenot_content = 0x7f0a0064
-net.micode.notes:string/hint_foler_name = 0x7f0a001d
-net.micode.notes:id/menu_delete = 0x7f050021
-net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/app_name = 0x7f0a0004
 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a
+net.micode.notes:drawable/list_red_down = 0x7f040021
+net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:string/hint_foler_name = 0x7f0a001d
+net.micode.notes:string/widget_havenot_content = 0x7f0a0064
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
 net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
-net.micode.notes:string/preferences_add_account = 0x7f0a0046
-net.micode.notes:string/menu_sync = 0x7f0a0038
-net.micode.notes:id/move = 0x7f05002e
-net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
+net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009
+net.micode.notes:layout/note_item = 0x7f060007
+net.micode.notes:menu/sub_folder = 0x7f070006
+net.micode.notes:menu/note_list = 0x7f070003
 net.micode.notes:string/ticker_syncing = 0x7f0a0063
-net.micode.notes:id/menu_search = 0x7f050028
 net.micode.notes:drawable/menu_move = 0x7f04002e
+net.micode.notes:id/menu_search = 0x7f050028
+net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a
 net.micode.notes:raw/introduction = 0x7f090000
 net.micode.notes:menu/call_record_folder = 0x7f070001
+net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f
+net.micode.notes:menu/call_note_edit = 0x7f070000
 net.micode.notes:drawable/list_red_middle = 0x7f040022
 net.micode.notes:layout/widget_2x = 0x7f06000c
+net.micode.notes:layout/widget_4x = 0x7f06000d
 net.micode.notes:drawable/icon_app = 0x7f040015
 net.micode.notes:layout/note_list = 0x7f060008
 net.micode.notes:layout/note_edit = 0x7f060005
@ -128,8 +112,8 @@ net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
 net.micode.notes:drawable/widget_2x_blue = 0x7f040038
 net.micode.notes:layout/folder_list_item = 0x7f060004
 net.micode.notes:string/sync_progress_init_list = 0x7f0a005d
-net.micode.notes:layout/add_account_text = 0x7f060001
 net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:layout/add_account_text = 0x7f060001
 net.micode.notes:id/widget_text = 0x7f050042
 net.micode.notes:id/widget_bg_image = 0x7f050041
 net.micode.notes:string/menu_folder_delete = 0x7f0a0025
@ -140,38 +124,49 @@ net.micode.notes:id/tv_alert_date = 0x7f05003a
 net.micode.notes:color/primary_text_dark = 0x7f020000
 net.micode.notes:id/tv_time = 0x7f05003e
 net.micode.notes:id/selection_menu = 0x7f050038
-net.micode.notes:id/ll_font_small = 0x7f05001e
+net.micode.notes:id/preference_sync_button = 0x7f050037
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:id/notes_list = 0x7f050035
 net.micode.notes:id/note_title = 0x7f050034
 net.micode.notes:string/format_exported_file_location = 0x7f0a001a
 net.micode.notes:id/note_bg_color_selector = 0x7f050030
+net.micode.notes:id/navigation_bar = 0x7f05002f
+net.micode.notes:id/move = 0x7f05002e
+net.micode.notes:id/menu_sync = 0x7f05002c
 net.micode.notes:id/menu_share = 0x7f05002b
 net.micode.notes:string/format_folder_files_count = 0x7f0a001b
-net.micode.notes:id/menu_setting = 0x7f05002a
 net.micode.notes:string/menu_move = 0x7f0a002d
 net.micode.notes:id/date = 0x7f050007
 net.micode.notes:id/note_item = 0x7f050033
+net.micode.notes:id/menu_setting = 0x7f05002a
+net.micode.notes:id/menu_send_to_desktop = 0x7f050029
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
 net.micode.notes:id/note_edit_view = 0x7f050032
-net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
+net.micode.notes:id/menu_list_mode = 0x7f050025
 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d
 net.micode.notes:id/menu_font_size = 0x7f050024
 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048
 net.micode.notes:id/menu_alert = 0x7f050020
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:id/ll_font_small = 0x7f05001e
 net.micode.notes:string/error_note_not_exist = 0x7f0a000e
 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d
 net.micode.notes:id/minute = 0x7f05002d
 net.micode.notes:id/ll_font_normal = 0x7f05001d
 net.micode.notes:id/ll_font_large = 0x7f05001c
-net.micode.notes:id/iv_super_select = 0x7f05001b
 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049
-net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
-net.micode.notes:drawable/list_yellow_up = 0x7f04002c
-net.micode.notes:id/iv_bg_white = 0x7f050014
-net.micode.notes:id/iv_medium_select = 0x7f050019
+net.micode.notes:id/iv_super_select = 0x7f05001b
 net.micode.notes:string/ticker_success = 0x7f0a0062
+net.micode.notes:id/iv_medium_select = 0x7f050019
 net.micode.notes:id/iv_large_select = 0x7f050018
+net.micode.notes:id/iv_bg_yellow_select = 0x7f050017
 net.micode.notes:drawable/bg_btn_set_color = 0x7f040000
 net.micode.notes:id/iv_bg_yellow = 0x7f050016
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002c
+net.micode.notes:id/iv_bg_white = 0x7f050014
 net.micode.notes:menu/note_edit = 0x7f070002
 net.micode.notes:drawable/list_white_down = 0x7f040025
 net.micode.notes:drawable/list_white_up = 0x7f040028
@ -182,18 +177,23 @@ net.micode.notes:drawable/list_green_single = 0x7f04001f
 net.micode.notes:id/iv_alert_icon = 0x7f05000d
 net.micode.notes:drawable/list_yellow_single = 0x7f04002b
 net.micode.notes:id/cb_edit_item = 0x7f050006
-net.micode.notes:id/font_size_selector = 0x7f05000b
-net.micode.notes:color/user_query_highlight = 0x7f020002
 net.micode.notes:drawable/font_super = 0x7f040014
 net.micode.notes:drawable/edit_title_blue = 0x7f040009
-net.micode.notes:id/et_edit_text = 0x7f050009
+net.micode.notes:color/user_query_highlight = 0x7f020002
+net.micode.notes:id/font_size_selector = 0x7f05000b
 net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054
-net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:id/et_edit_text = 0x7f050009
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
 net.micode.notes:id/menu_new_note = 0x7f050027
+net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:drawable/widget_2x_red = 0x7f04003a
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040041
 net.micode.notes:drawable/clock = 0x7f040003
-net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:drawable/font_small = 0x7f040013
 net.micode.notes:id/btn_set_bg_color = 0x7f050005
+net.micode.notes:array/menu_share_ways = 0x7f010001
 net.micode.notes:style/NoteTheme = 0x7f0b0003
 net.micode.notes:drawable/notification = 0x7f040033
 net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
--- a/src/Notes-master/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
+++ b/src/Notes-master/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
--- a/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk
+++ b/src/Notes-master/app/build/outputs/apk/debug/app-debug.apk
--- a/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
@ -1,225 +1,225 @@
 -- Merging decision tree log ---
 manifest
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
 	package
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 	android:versionName
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:21:5-30
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 	xmlns:android
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:11-69
 	android:versionCode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 uses-sdk
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
 	android:targetSdkVersion
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
 uses-permission#android.permission.INTERNET
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
 uses-permission#android.permission.READ_CONTACTS
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
 uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
 uses-permission#android.permission.GET_ACCOUNTS
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
 uses-permission#android.permission.USE_CREDENTIALS
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
 application
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
-INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
+INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:35:5-148:19
 	android:extractNativeLibs
-		INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
+		INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
 	android:icon
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
 activity#net.micode.notes.ui.NotesListActivity
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:38:9-50:20
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
 	android:launchMode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
 	android:windowSoftInputMode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:44:13-52
 	android:configChanges
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
 	android:theme
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:46:13-49:29
 action#android.intent.action.MAIN
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:17-69
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:47:25-66
 category#android.intent.category.LAUNCHER
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:17-77
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:48:27-74
 activity#net.micode.notes.ui.NoteEditActivity
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:52:9-80:20
 	android:launchMode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:55:13-43
 	android:configChanges
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:54:13-74
 	android:theme
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:56:13-45
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53:13-48
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:53: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:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:58:13-63:29
 action#android.intent.action.VIEW
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:17-69
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:59:25-66
 category#android.intent.category.DEFAULT
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:17-76
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:60:27-73
 data
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:17-78
 	android:mimeType
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61:23-75
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:61: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:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:65:13-70:29
 action#android.intent.action.INSERT_OR_EDIT
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:17-79
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:66:25-76
 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:72:13-75:29
 action#android.intent.action.SEARCH
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:17-71
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:73:25-68
 meta-data#android.app.searchable
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:77:13-79:54
 	android:resource
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:79:17-51
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:78:17-54
 provider#net.micode.notes.data.NotesProvider
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:82:9-85:43
 	android:authorities
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:84:13-47
 	android:multiprocess
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:85:13-40
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:83:13-63
 receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:87:9-99:20
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:89:13-50
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88:13-57
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:88: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:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:90:13-94:29
 action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:17-84
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:91:25-81
 action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
 action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
 meta-data#android.appwidget.provider
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:96:13-98:58
 	android:resource
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:98:17-55
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:97:17-58
 receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:100:9-113:20
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:102:13-50
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:101:13-57
 receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:9-119:20
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:115:19-55
 intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:116:13-118:29
 action#android.intent.action.BOOT_COMPLETED
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:17-79
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:117:25-76
 receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:121:9-124:20
 	android:process
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:123:13-38
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:122:13-61
 activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:126:9-131:20
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:128:13-45
 	android:launchMode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:129:13-48
 	android:theme
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:130:13-75
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:127:13-50
 activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:133:9-138:20
 	android:label
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:135:13-54
 	android:launchMode
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:136:13-43
 	android:theme
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:137:13-60
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:134:13-71
 service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:140:9-143:19
 	android:exported
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:142:13-37
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:141:13-74
 meta-data#android.app.default_searchable
-ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
+ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:145:9-147:52
 	android:value
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
 	android:name
-		ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
+		ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
--- a/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
+++ b/src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
@ -26,29 +26,52 @@ import org.json.JSONObject;


 public class MetaData extends Task {
+    /*
+	 * 功能描述：得到类的简写名称存入字符串TAG中
+	 * 实现过程：调用getSimpleName ()函数
+    */
    private final static String TAG = MetaData.class.getSimpleName();

    private String mRelatedGid = null;
-
+    /*
+     * 功能描述：设置数据，即生成元数据库
+     * 实现过程：调用JSONObject库函数put ()，Task类中的setNotes ()和setName ()函数
+     * 参数注解：
+     */
    public void setMeta(String gid, JSONObject metaInfo) {
+        //对函数块进行注释
        try {
            metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
+            /*
+             * 将这对键值放入metaInfo这个jsonobject对象中
+             */
        } catch (JSONException e) {
            Log.e(TAG, "failed to put related gid");
+            /*
+             * 输出错误信息
+             */
        }
        setNotes(metaInfo.toString());
        setName(GTaskStringUtils.META_NOTE_NAME);
    }
-
+    /*
+     * 功能描述：获取相关联的Gid
+     */
    public String getRelatedGid() {
        return mRelatedGid;
    }
-
+    /*
+     * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存
+     */
    @Override
    public boolean isWorthSaving() {
        return getNotes() != null;
    }
-
+    /*
+     * 功能描述：使用远程json数据对象设置元数据内容
+     * 实现过程：调用父类Task中的setContentByRemoteJSON ()函数，并
+     * 参数注解：
+     */
    @Override
    public void setContentByRemoteJSON(JSONObject js) {
        super.setContentByRemoteJSON(js);
@ -58,11 +81,16 @@ public class MetaData extends Task {
                mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
            } catch (JSONException e) {
                Log.w(TAG, "failed to get related gid");
+                /*
+                 * 输出警告信息
+                 */
                mRelatedGid = null;
            }
        }
    }
-
+    /*
+     * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常
+     */
    @Override
    public void setContentByLocalJSON(JSONObject js) {
        // this function should not be called
@ -72,11 +100,21 @@ public class MetaData extends Task {
    @Override
    public JSONObject getLocalJSONFromContent() {
        throw new IllegalAccessError("MetaData:getLocalJSONFromContent should not be called");
+        /*
+        传递非法参数异常
+         */
    }
-
+    /*
+     * 功能描述：从元数据内容中获取本地json对象，一般不会用到，若用到，则抛出异常
+     */
    @Override
    public int getSyncAction(Cursor c) {
        throw new IllegalAccessError("MetaData:getSyncAction should not be called");
+        /*
+        传递非法参数异常
+         */
    }

 }
+
+}
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
@ -20,32 +20,37 @@ import android.database.Cursor;

 import org.json.JSONObject;

+/**
+ * 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量
+ * 关键字：abstract
+ */
 public abstract class Node {
-    public static final int SYNC_ACTION_NONE = 0;
+    //定义了各种用于表征同步状态的常量
+    public static final int SYNC_ACTION_NONE = 0;// 本地和云端都无可更新内容（即本地和云端内容一致）

-    public static final int SYNC_ACTION_ADD_REMOTE = 1;
+    public static final int SYNC_ACTION_ADD_REMOTE = 1;// 需要在远程云端增加内容

-    public static final int SYNC_ACTION_ADD_LOCAL = 2;
+    public static final int SYNC_ACTION_ADD_LOCAL = 2;// 需要在本地增加内容

-    public static final int SYNC_ACTION_DEL_REMOTE = 3;
+    public static final int SYNC_ACTION_DEL_REMOTE = 3;// 需要在远程云端删除内容

-    public static final int SYNC_ACTION_DEL_LOCAL = 4;
+    public static final int SYNC_ACTION_DEL_LOCAL = 4;// 需要在本地删除内容

-    public static final int SYNC_ACTION_UPDATE_REMOTE = 5;
+    public static final int SYNC_ACTION_UPDATE_REMOTE = 5;// 需要将本地内容更新到远程云端

-    public static final int SYNC_ACTION_UPDATE_LOCAL = 6;
+    public static final int SYNC_ACTION_UPDATE_LOCAL = 6;// 需要将远程云端内容更新到本地

-    public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
+    public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;// 同步出现冲突

-    public static final int SYNC_ACTION_ERROR = 8;
+    public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误

    private String mGid;

    private String mName;

-    private long mLastModified;
+    private long mLastModified;//记录最后一次修改时间

-    private boolean mDeleted;
+    private boolean mDeleted;//表征是否被删除

    public Node() {
        mGid = null;
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
@ -14,7 +14,17 @@
 * limitations under the License.
 */

+/*
+ * Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。
+ * SqlData其实就是也就是所谓数据中的数据
+ */
+
 package net.micode.notes.gtask.data;
+/*
+ * 功能描述：
+ * 实现过程：
+ * 参数注解：
+ */

 import android.content.ContentResolver;
 import android.content.ContentUris;
@ -36,15 +46,28 @@ import org.json.JSONObject;


 public class SqlData {
+    /*
+     * 功能描述：得到类的简写名称存入字符串TAG中
+     * 实现过程：调用getSimpleName ()函数
+     */
    private static final String TAG = SqlData.class.getSimpleName();

-    private static final int INVALID_ID = -99999;
+    private static final int INVALID_ID = -99999;//为mDataId置初始值-99999
+

+    /**
+     * 来自Notes类中定义的DataColumn中的一些常量
+     */
+
+    // 集合了interface DataColumns中所有SF常量
    public static final String[] PROJECTION_DATA = new String[] {
            DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
            DataColumns.DATA3
    };

+    /**
+     * 以下五个变量作为sql表中5列的编号
+     */
    public static final int DATA_ID_COLUMN = 0;

    public static final int DATA_MIME_TYPE_COLUMN = 1;
@ -56,7 +79,7 @@ public class SqlData {
    public static final int DATA_CONTENT_DATA_3_COLUMN = 4;

    private ContentResolver mContentResolver;
-
+    //判断是否直接用Content生成，是为true，否则为false
    private boolean mIsCreate;

    private long mDataId;
@ -71,10 +94,16 @@ public class SqlData {

    private ContentValues mDiffDataValues;

+    /*
+     * 功能描述：构造函数，用于初始化数据
+     * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+     * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+     * 参数注解：
+     */
    public SqlData(Context context) {
        mContentResolver = context.getContentResolver();
        mIsCreate = true;
-        mDataId = INVALID_ID;
+        mDataId = INVALID_ID;//mDataId置初始值-99999
        mDataMimeType = DataConstants.NOTE;
        mDataContent = "";
        mDataContentData1 = 0;
@ -82,6 +111,13 @@ public class SqlData {
        mDiffDataValues = new ContentValues();
    }

+
+    /*
+     * 功能描述：构造函数，初始化数据
+     * 参数注解：mContentResolver用于获取ContentProvider提供的数据
+     * 参数注解： mIsCreate表征当前数据是用哪种方式创建（两种构造函数的参数不同）
+     * 参数注解：
+     */
    public SqlData(Context context, Cursor c) {
        mContentResolver = context.getContentResolver();
        mIsCreate = false;
@ -89,6 +125,10 @@ public class SqlData {
        mDiffDataValues = new ContentValues();
    }

+    /*
+     * 功能描述：从光标处加载数据
+     * 从当前的光标处将五列的数据加载到该类的对象
+     */
    private void loadFromCursor(Cursor c) {
        mDataId = c.getLong(DATA_ID_COLUMN);
        mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
@ -97,7 +137,13 @@ public class SqlData {
        mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
    }

+
+    /*
+     * 功能描述：设置用于共享的数据，并提供异常抛出与处理机制
+     * 参数注解：
+     */
    public void setContent(JSONObject js) throws JSONException {
+        //如果传入的JSONObject对象中有DataColumns.ID这一项，则设置，否则设为INVALID_ID
        long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
        if (mIsCreate || mDataId != dataId) {
            mDiffDataValues.put(DataColumns.ID, dataId);
@ -130,11 +176,17 @@ public class SqlData {
        mDataContentData3 = dataContentData3;
    }

+
+    /*
+     * 功能描述：获取共享的数据内容，并提供异常抛出与处理机制
+     * 参数注解：
+     */
    public JSONObject getContent() throws JSONException {
        if (mIsCreate) {
            Log.e(TAG, "it seems that we haven't created this in database yet");
            return null;
        }
+        //创建JSONObject对象。并将相关数据放入其中，并返回。
        JSONObject js = new JSONObject();
        js.put(DataColumns.ID, mDataId);
        js.put(DataColumns.MIME_TYPE, mDataMimeType);
@ -144,6 +196,10 @@ public class SqlData {
        return js;
    }

+    /*
+     * 功能描述：commit函数用于把当前造作所做的修改保存到数据库
+     * 参数注解：
+     */
    public void commit(long noteId, boolean validateVersion, long version) {

        if (mIsCreate) {
@ -167,7 +223,7 @@ public class SqlData {
                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
                } else {
                    result = mContentResolver.update(ContentUris.withAppendedId(
-                            Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
+                                    Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
                            " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
                                    + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
                                    String.valueOf(noteId), String.valueOf(version)
@ -182,7 +238,11 @@ public class SqlData {
        mDiffDataValues.clear();
        mIsCreate = false;
    }
-
+    /*
+     * 功能描述：获取当前id
+     * 实现过程：
+     * 参数注解：
+     */
    public long getId() {
        return mDataId;
    }
--- a/src/Notes-master/local.properties
+++ b/src/Notes-master/local.properties
@ -2,6 +2,7 @@
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Thu Nov 09 19:48:40 CST 2023
-sdk.dir=D\:\\Android\\Sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Dec 21 01:09:02 CST 2023
+sdk.dir=C\:\\Users\\lenovo\\AppData\\Local\\Android\\Sdk