diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
new file mode 100644
index 0000000..6c28c88
Binary files /dev/null and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
new file mode 100644
index 0000000..87f3f20
Binary files /dev/null and b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
new file mode 100644
index 0000000..7ded4d6
Binary files /dev/null and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
new file mode 100644
index 0000000..6af9004
Binary files /dev/null and b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock differ
diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin
new file mode 100644
index 0000000..dd8f722
Binary files /dev/null and b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
new file mode 100644
index 0000000..bd025de
Binary files /dev/null and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
new file mode 100644
index 0000000..7607135
Binary files /dev/null and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe
new file mode 100644
index 0000000..56ae756
Binary files /dev/null and b/src/Notes-master1/.gradle/file-system.probe differ
diff --git a/src/Notes-master1/.idea/deploymentTargetDropDown.xml b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0ebbad6
--- /dev/null
+++ b/src/Notes-master1/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
new file mode 100644
index 0000000..3b7aaf1
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
new file mode 100644
index 0000000..55b788d
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes-master1/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
new file mode 100644
index 0000000..916f167
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ
diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
new file mode 100644
index 0000000..d4637cc
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
new file mode 100644
index 0000000..796ec85
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
new file mode 100644
index 0000000..bd37630
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out differ
diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
new file mode 100644
index 0000000..9a03714
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out
@@ -0,0 +1 @@
+10
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
new file mode 100644
index 0000000..9a03714
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debugAndroidTest/out
@@ -0,0 +1 @@
+10
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..f44f0f3
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -0,0 +1,99 @@
+#Thu Jan 04 10:28:03 CST 2024
+net.micode.notes.app-main-6\:/color/primary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/grass.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_grass.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/lanyangyang.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_lanyangyang.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/playground1.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_playground1.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-6\:/drawable/new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-6\:/layout/add_account_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-6\:/layout/datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-6\:/layout/folder_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-6\:/layout/note_list_footer.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-6\:/layout/settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-6\:/layout/widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-6\:/menu/call_note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/call_record_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-6\:/menu/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-6\:/menu/note_list_options.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-6\:/menu/sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-6\:/raw/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-6\:/xml/preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-6\:/xml/searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
new file mode 100644
index 0000000..96016e5
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -0,0 +1,56 @@
+
+
+ - -%s
+ - --%s
+ - --%s
+ - --%s
+
+ - Messaging
+ - Email
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txtBackground:lanyangyangBackground:grassBackground:playground1(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ - %1$s result for \"%2$s\"
+
+ - %1$s results for \"%2$s\"
+
+ - 短信
+ - 邮件
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ - %1$s 条符合“%2$s”的搜索结果
+
+ - 短信
+ - 郵件
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ - %1$s 條符合”%2$s“的搜尋結果
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
new file mode 100644
index 0000000..6bdca05
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -0,0 +1,99 @@
+#Thu Jan 04 10:28:03 CST 2024
+net.micode.notes.app-main-5\:/color/primary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
+net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png
+net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png
+net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png
+net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png
+net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png
+net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png
+net.micode.notes.app-main-5\:/drawable-hdpi/grass.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\grass.png
+net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png
+net.micode.notes.app-main-5\:/drawable-hdpi/lanyangyang.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\lanyangyang.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png
+net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png
+net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png
+net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png
+net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png
+net.micode.notes.app-main-5\:/drawable-hdpi/playground1.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\playground1.png
+net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png
+net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png
+net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png
+net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png
+net.micode.notes.app-main-5\:/drawable/new_note.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml
+net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml
+net.micode.notes.app-main-5\:/layout/add_account_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml
+net.micode.notes.app-main-5\:/layout/datetime_picker.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml
+net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml
+net.micode.notes.app-main-5\:/layout/folder_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml
+net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml
+net.micode.notes.app-main-5\:/layout/note_item.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml
+net.micode.notes.app-main-5\:/layout/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml
+net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml
+net.micode.notes.app-main-5\:/layout/note_list_footer.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml
+net.micode.notes.app-main-5\:/layout/settings_header.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml
+net.micode.notes.app-main-5\:/layout/widget_2x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml
+net.micode.notes.app-main-5\:/layout/widget_4x.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml
+net.micode.notes.app-main-5\:/menu/call_note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml
+net.micode.notes.app-main-5\:/menu/call_record_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml
+net.micode.notes.app-main-5\:/menu/note_edit.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml
+net.micode.notes.app-main-5\:/menu/note_list.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml
+net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml
+net.micode.notes.app-main-5\:/menu/note_list_options.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml
+net.micode.notes.app-main-5\:/menu/sub_folder.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml
+net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction
+net.micode.notes.app-main-5\:/raw/introduction=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction
+net.micode.notes.app-main-5\:/xml/preferences.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml
+net.micode.notes.app-main-5\:/xml/searchable.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
+net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
+net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=E\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
new file mode 100644
index 0000000..96016e5
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
@@ -0,0 +1,56 @@
+
+
+ - -%s
+ - --%s
+ - --%s
+ - --%s
+
+ - Messaging
+ - Email
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txtBackground:lanyangyangBackground:grassBackground:playground1(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ - %1$s result for \"%2$s\"
+
+ - %1$s results for \"%2$s\"
+
+ - 短信
+ - 邮件
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ - %1$s 条符合“%2$s”的搜索结果
+
+ - 短信
+ - 郵件
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ - %1$s 條符合”%2$s“的搜尋結果
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
new file mode 100644
index 0000000..2901a7c
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -0,0 +1 @@
+#Thu Jan 04 00:01:50 CST 2024
diff --git a/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
new file mode 100644
index 0000000..dffc582
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
new file mode 100644
index 0000000..3fdabbd
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
new file mode 100644
index 0000000..3c8e3b7
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
new file mode 100644
index 0000000..2f5ed39
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
new file mode 100644
index 0000000..8806540
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
new file mode 100644
index 0000000..e297877
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
new file mode 100644
index 0000000..56a1ec1
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
new file mode 100644
index 0000000..72284e7
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Thu Jan 04 11:09:30 CST 2024
+base.0=E\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
+path.0=classes.dex
+renamed.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
new file mode 100644
index 0000000..37aac17
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
new file mode 100644
index 0000000..378fa1b
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -0,0 +1,4 @@
+#Thu Jan 04 00:01:52 CST 2024
+base.0=E\:\\Notes-master1\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
+path.0=classes.dex
+renamed.0=classes.dex
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
new file mode 100644
index 0000000..535a8a5
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
new file mode 100644
index 0000000..b6c8e59
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
new file mode 100644
index 0000000..f879ef0
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
new file mode 100644
index 0000000..0421480
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
new file mode 100644
index 0000000..5e14fac
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
new file mode 100644
index 0000000..28051ed
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
new file mode 100644
index 0000000..0985c40
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
new file mode 100644
index 0000000..82f914b
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
new file mode 100644
index 0000000..46303ff
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
new file mode 100644
index 0000000..757f94d
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
new file mode 100644
index 0000000..f463311
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
new file mode 100644
index 0000000..113ea13
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
new file mode 100644
index 0000000..2d467ae
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
new file mode 100644
index 0000000..d227ab5
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
new file mode 100644
index 0000000..872c330
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
new file mode 100644
index 0000000..d8afb0b
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
new file mode 100644
index 0000000..b30291e
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
new file mode 100644
index 0000000..6b6ae59
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
new file mode 100644
index 0000000..2e5d866
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
new file mode 100644
index 0000000..16020a0
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
new file mode 100644
index 0000000..9aaa0f4
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
new file mode 100644
index 0000000..1899e39
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt
@@ -0,0 +1,295 @@
+R_DEF: Internal format may change without notice
+local
+array format_for_exported_note
+array menu_share_ways
+color primary_text_dark
+color secondary_text_dark
+color user_query_highlight
+dimen text_font_size_large
+dimen text_font_size_medium
+dimen text_font_size_normal
+dimen text_font_size_small
+dimen text_font_size_super
+drawable bg_btn_set_color
+drawable bg_color_btn_mask
+drawable call_record
+drawable clock
+drawable delete
+drawable dropdown_icon
+drawable edit_blue
+drawable edit_green
+drawable edit_red
+drawable edit_title_blue
+drawable edit_title_green
+drawable edit_title_red
+drawable edit_title_white
+drawable edit_title_yellow
+drawable edit_white
+drawable edit_yellow
+drawable font_large
+drawable font_normal
+drawable font_size_selector_bg
+drawable font_small
+drawable font_super
+drawable grass
+drawable icon_app
+drawable lanyangyang
+drawable list_background
+drawable list_blue_down
+drawable list_blue_middle
+drawable list_blue_single
+drawable list_blue_up
+drawable list_folder
+drawable list_footer_bg
+drawable list_green_down
+drawable list_green_middle
+drawable list_green_single
+drawable list_green_up
+drawable list_red_down
+drawable list_red_middle
+drawable list_red_single
+drawable list_red_up
+drawable list_white_down
+drawable list_white_middle
+drawable list_white_single
+drawable list_white_up
+drawable list_yellow_down
+drawable list_yellow_middle
+drawable list_yellow_single
+drawable list_yellow_up
+drawable menu_delete
+drawable menu_move
+drawable new_note
+drawable new_note_normal
+drawable new_note_pressed
+drawable note_edit_color_selector_panel
+drawable notification
+drawable playground1
+drawable search_result
+drawable selected
+drawable title_alert
+drawable title_bar_bg
+drawable widget_2x_blue
+drawable widget_2x_green
+drawable widget_2x_red
+drawable widget_2x_white
+drawable widget_2x_yellow
+drawable widget_4x_blue
+drawable widget_4x_green
+drawable widget_4x_red
+drawable widget_4x_white
+drawable widget_4x_yellow
+id account_dialog_subtitle
+id account_dialog_title
+id action_select_all
+id amPm
+id btn_new_note
+id btn_set_bg_color
+id cb_edit_item
+id date
+id delete
+id et_edit_text
+id et_foler_name
+id font_size_selector
+id hour
+id iv_alert_icon
+id iv_bg_blue
+id iv_bg_blue_select
+id iv_bg_green
+id iv_bg_green_select
+id iv_bg_red
+id iv_bg_red_select
+id iv_bg_white
+id iv_bg_white_select
+id iv_bg_yellow
+id iv_bg_yellow_select
+id iv_large_select
+id iv_medium_select
+id iv_small_select
+id iv_super_select
+id ll_font_large
+id ll_font_normal
+id ll_font_small
+id ll_font_super
+id menu_alert
+id menu_delete
+id menu_delete_remind
+id menu_export_text
+id menu_font_size
+id menu_grass
+id menu_lanyangyang
+id menu_list_mode
+id menu_new_folder
+id menu_new_note
+id menu_playground1
+id menu_search
+id menu_send_to_desktop
+id menu_setting
+id menu_share
+id menu_sync
+id minute
+id move
+id navigation_bar
+id note_bg_color_selector
+id note_edit_list
+id note_edit_view
+id note_item
+id note_title
+id notes_list
+id prefenerece_sync_status_textview
+id preference_sync_button
+id selection_menu
+id sv_note_edit
+id text_num
+id tv_alert_date
+id tv_folder_name
+id tv_modified_date
+id tv_name
+id tv_time
+id tv_title
+id tv_title_bar
+id widget_bg_image
+id widget_text
+layout account_dialog_title
+layout add_account_text
+layout datetime_picker
+layout dialog_edit_text
+layout folder_list_item
+layout note_edit
+layout note_edit_list_item
+layout note_item
+layout note_list
+layout note_list_dropdown_menu
+layout note_list_footer
+layout settings_header
+layout widget_2x
+layout widget_4x
+menu call_note_edit
+menu call_record_folder
+menu note_edit
+menu note_list
+menu note_list_dropdown
+menu note_list_options
+menu sub_folder
+plurals search_results_title
+raw introduction
+string alert_message_delete_folder
+string alert_message_delete_note
+string alert_message_delete_notes
+string alert_title_delete
+string app_name
+string app_widget2x2
+string app_widget4x4
+string button_delete
+string call_record_folder_name
+string datetime_dialog_cancel
+string datetime_dialog_ok
+string delete_remind_time_message
+string error_note_empty_for_clock
+string error_note_empty_for_send_to_desktop
+string error_note_not_exist
+string error_sdcard_export
+string error_sdcard_unmounted
+string error_sync_cancelled
+string error_sync_internal
+string error_sync_network
+string failed_sdcard_export
+string file_name_txt_format
+string file_path
+string folder_exist
+string format_date_ymd
+string format_datetime_mdhm
+string format_exported_file_location
+string format_folder_files_count
+string format_move_notes_to_folder
+string hint_foler_name
+string info_note_enter_desktop
+string menu_alert
+string menu_create_folder
+string menu_delete
+string menu_deselect_all
+string menu_export_text
+string menu_folder_change_name
+string menu_folder_delete
+string menu_folder_view
+string menu_font_large
+string menu_font_normal
+string menu_font_size
+string menu_font_small
+string menu_font_super
+string menu_grass
+string menu_lanyangyang
+string menu_list_mode
+string menu_move
+string menu_move_parent_folder
+string menu_normal_mode
+string menu_playground1
+string menu_remove_remind
+string menu_search
+string menu_select_all
+string menu_select_none
+string menu_select_title
+string menu_send_to_desktop
+string menu_setting
+string menu_share
+string menu_sync
+string menu_sync_cancel
+string menu_title_select_folder
+string note_alert_expired
+string note_link_email
+string note_link_other
+string note_link_tel
+string note_link_web
+string notealert_enter
+string notealert_ok
+string notelist_menu_new
+string notelist_string_info
+string preferences_account_summary
+string preferences_account_title
+string preferences_add_account
+string preferences_bg_random_appear_title
+string preferences_button_sync_cancel
+string preferences_button_sync_immediately
+string preferences_dialog_change_account_title
+string preferences_dialog_change_account_warn_msg
+string preferences_dialog_select_account_tips
+string preferences_dialog_select_account_title
+string preferences_last_sync_time
+string preferences_last_sync_time_format
+string preferences_menu_cancel
+string preferences_menu_change_account
+string preferences_menu_remove_account
+string preferences_title
+string preferences_toast_cannot_change_account
+string preferences_toast_success_set_accout
+string search
+string search_hint
+string search_label
+string search_setting_description
+string set_remind_time_message
+string success_sdcard_export
+string success_sync_account
+string sync_progress_init_list
+string sync_progress_login
+string sync_progress_syncing
+string ticker_cancel
+string ticker_fail
+string ticker_success
+string ticker_syncing
+string widget_havenot_content
+string widget_under_visit_mode
+style HighlightTextAppearancePrimary
+style HighlightTextAppearanceSecondary
+style NoteActionBarStyle
+style NoteTheme
+style TextAppearanceLarge
+style TextAppearanceMedium
+style TextAppearanceNormal
+style TextAppearancePrimaryItem
+style TextAppearanceSecondaryItem
+style TextAppearanceSuper
+style TextAppearanceUnderMenuIcon
+xml preferences
+xml searchable
+xml widget_2x_info
+xml widget_4x_info
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 0000000..6d78915
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,273 @@
+1
+2
+17
+21
+22 E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+23 android:minSdkVersion="14"
+23-->E:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
+24 android:targetSdkVersion="14" />
+25
+26
+26-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+26-->E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+27
+27-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+27-->E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+28
+28-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+28-->E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+29
+29-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+29-->E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+30
+30-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+30-->E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+31
+31-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+31-->E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+32
+32-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+32-->E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+33
+33-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+33-->E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+34
+34-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+34-->E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+35
+36 E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+37 android:debuggable="true"
+38 android:extractNativeLibs="true"
+39 android:icon="@drawable/icon_app"
+39-->E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+40 android:label="@string/app_name"
+40-->E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+41 android:testOnly="true" >
+42 E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+43 android:name="net.micode.notes.ui.NotesListActivity"
+43-->E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+44 android:configChanges="keyboardHidden|orientation|screenSize"
+44-->E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+45 android:label="@string/app_name"
+45-->E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+46 android:launchMode="singleTop"
+46-->E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+47 android:theme="@style/NoteTheme"
+47-->E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+48 android:uiOptions="splitActionBarWhenNarrow"
+48-->E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+49 android:windowSoftInputMode="adjustPan" >
+49-->E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+50
+50-->E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+51
+51-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+51-->E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+52
+53
+53-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+53-->E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+54
+55
+56 E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+57 android:name="net.micode.notes.ui.NoteEditActivity"
+57-->E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+58 android:configChanges="keyboardHidden|orientation|screenSize"
+58-->E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+59 android:launchMode="singleTop"
+59-->E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+60 android:theme="@style/NoteTheme" >
+60-->E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+61
+61-->E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+62
+62-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+62-->E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+63
+64
+64-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+64-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+65
+66
+66-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+66-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+67
+67-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+67-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+68
+69
+69-->E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+70
+70-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
+70-->E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+71
+72
+72-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+72-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+73
+74
+74-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+74-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+75
+75-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+75-->E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+76
+77
+77-->E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+78
+78-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+78-->E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+79
+80
+80-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+80-->E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+81
+82
+83 E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+84 android:name="android.app.searchable"
+84-->E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+85 android:resource="@xml/searchable" />
+85-->E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+86
+87
+88 E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+89 android:name="net.micode.notes.data.NotesProvider"
+89-->E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+90 android:authorities="micode_notes"
+90-->E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+91 android:multiprocess="true" />
+91-->E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+92
+93 E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
+94-->E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+95 android:label="@string/app_widget2x2" >
+95-->E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+96
+96-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+97
+97-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+97-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+98
+98-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+98-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+99
+99-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+99-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+100
+101
+102 E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+103 android:name="android.appwidget.provider"
+103-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+104 android:resource="@xml/widget_2x_info" />
+104-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+105
+106 E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
+107-->E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+108 android:label="@string/app_widget4x4" >
+108-->E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+109
+109-->E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+110
+110-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+110-->E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+111
+111-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+111-->E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+112
+112-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+112-->E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+113
+114
+115 E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+116 android:name="android.appwidget.provider"
+116-->E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+117 android:resource="@xml/widget_4x_info" />
+117-->E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+118
+119
+119-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+119-->E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+120
+120-->E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+121
+121-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+121-->E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+122
+123
+124 E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+125 android:name="net.micode.notes.ui.AlarmReceiver"
+125-->E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+126 android:process=":remote" >
+126-->E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+127
+128
+129 E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+130 android:name="net.micode.notes.ui.AlarmAlertActivity"
+130-->E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+131 android:label="@string/app_name"
+131-->E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+132 android:launchMode="singleInstance"
+132-->E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
+133-->E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+134
+135 E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+136 android:name="net.micode.notes.ui.NotesPreferenceActivity"
+136-->E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+137 android:label="@string/preferences_title"
+137-->E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+138 android:launchMode="singleTop"
+138-->E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+139 android:theme="@android:style/Theme.Holo.Light" >
+139-->E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+140
+141
+142 E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+143 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+143-->E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+144 android:exported="false" >
+144-->E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+145
+146
+147 E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+148 android:name="android.app.default_searchable"
+148-->E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
+149 android:value=".ui.NoteEditActivity" />
+149-->E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+150
+151
+152
diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
new file mode 100644
index 0000000..16d62ed
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -0,0 +1,34 @@
+1
+2
+4
+5 E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:5:5-74
+6 android:minSdkVersion="14"
+6-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:5:15-41
+7 android:targetSdkVersion="14" />
+7-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:5:42-71
+8
+9 E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:11:5-15:66
+10 android:name="android.test.InstrumentationTestRunner"
+10-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:11:22-75
+11 android:functionalTest="false"
+11-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:14:22-52
+12 android:handleProfiling="false"
+12-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:13:22-53
+13 android:label="Tests for net.micode.notes"
+13-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:15:22-64
+14 android:targetPackage="net.micode.notes" />
+14-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:12:22-62
+15
+16 E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:7:5-9:19
+17 android:debuggable="true"
+18 android:extractNativeLibs="true" >
+19
+19-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:8:9-60
+19-->E:\Notes-master1\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest16828872319273054321.xml:8:23-57
+20
+21
+22
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat
new file mode 100644
index 0000000..4a17fe1
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
new file mode 100644
index 0000000..00291c5
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
new file mode 100644
index 0000000..a036344
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -0,0 +1,186 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,44,43,65,55,76,66,45,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8356,4190,4454,4357,4287,846,890,943,7844,7894,8297,8245,1308,4914,5009,4842,4757,4673,5888,5804,5701,5187,2043,1991,3681,1515,1569,5249,2358,4538,7958,4118,3869,2418,2739,3045,2477,3609,3547,3489,3263,3210,3105,3159,3314,2230,2161,3365,2787,4051,3426,2287,3919,2691,2989,2900,2841,3806,2640,3760,2535,2579,3983,1459,1784,1894,1736,1840,1679,1630,1252,1198,6351,6283,6595,7745,6964,6882,7039,7129,7373,7293,6436,6512,6822,6660,6741,6227,7518,7641,8203,8074,8016,8128,1393,5118,5614,6025,5955,6106,5554,5498,5435,5374,996,1107",
+ "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,44,43,65,55,76,66,45,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,55,67,59,52,65,61,67,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": "8764,4281,4532,4448,4351,884,937,990,7888,7952,8350,8291,1387,5003,5112,4908,4836,4751,5949,5882,5798,5243,2100,2037,3754,1563,1624,5349,2412,4635,8008,4184,3913,2471,2781,3099,2529,3675,3603,3541,3308,3257,3153,3204,3359,2281,2224,3420,2835,4112,3483,2350,3977,2733,3039,2983,2894,3863,2685,3800,2573,2634,4045,1509,1834,1942,1778,1888,1730,1673,1302,1246,6430,6345,6654,7836,7033,6958,7123,7287,7512,7367,6506,6589,6876,6735,6816,6277,7635,7739,8239,8122,8068,8197,1453,5181,5695,6100,6019,6195,5608,5548,5492,5429,1101,1192"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "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,4106,4174,4234,4287,4353,4415,4483,4546,4593,4648,4736,4794,4856,4906,4951,4994,5054,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+ "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,55,67,59,52,65,61,67,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,4101,4169,4229,4282,4348,4410,4478,4541,4588,4643,4731,4789,4851,4901,4946,4989,5049,5116,5171,5226,5279,5326,5379,5435,5483,5538,5591,5675,5742,5806,5902,5976,6057,6146,6309,6453,6532,6607,6689,6748,6828,6908,6963,7085,7188,7229,7282,7339,7413,7478,7546,7632,7712,7781,7875,7934,7989,8051,8111,8221,8311"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "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": "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": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endColumns": "56",
+ "endOffsets": "782"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
+ },
+ "to": {
+ "startLines": "128,132,136,140,143,147,151,155,159,163,167",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8316,8520,8731,8941,9101,9284,9469,9654,9857,10063,10246",
+ "endLines": "131,135,139,142,146,150,154,158,162,166,170",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8515,8726,8936,9096,9279,9464,9649,9852,10058,10241,10442"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ }
+ ]
+ },
+ {
+ "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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": "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",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
new file mode 100644
index 0000000..644c952
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "from": {
+ "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
new file mode 100644
index 0000000..14b167d
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -0,0 +1,47 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "from": {
+ "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "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": "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",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923",
+ "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106",
+ "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
+ "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "838"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
new file mode 100644
index 0000000..d51c7fc
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -0,0 +1,100 @@
+{
+ "logs": [
+ {
+ "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
+ "map": [
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml",
+ "from": {
+ "startLines": "134,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,44,43,65,55,76,66,45,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8356,4190,4454,4357,4287,846,890,943,7844,7894,8297,8245,1308,4914,5009,4842,4757,4673,5888,5804,5701,5187,2043,1991,3681,1515,1569,5249,2358,4538,7958,4118,3869,2418,2739,3045,2477,3609,3547,3489,3263,3210,3105,3159,3314,2230,2161,3365,2787,4051,3426,2287,3919,2691,2989,2900,2841,3806,2640,3760,2535,2579,3983,1459,1784,1894,1736,1840,1679,1630,1252,1198,6351,6283,6595,7745,6964,6882,7039,7129,7373,7293,6436,6512,6822,6660,6741,6227,7518,7641,8203,8074,8016,8128,1393,5118,5614,6025,5955,6106,5554,5498,5435,5374,996,1107",
+ "endLines": "138,78,81,80,79,19,20,21,124,125,133,132,26,87,88,86,85,84,100,99,98,90,39,38,70,29,30,91,47,82,126,77,73,48,54,59,49,69,68,67,63,62,60,61,64,44,43,65,55,76,66,45,74,53,58,57,56,72,52,71,50,51,75,28,34,36,33,35,32,31,25,24,107,106,110,122,115,114,116,117,119,118,108,109,113,111,112,105,120,121,131,129,128,130,27,89,97,102,101,103,96,95,94,93,22,23",
+ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,55,67,59,52,65,61,67,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": "8764,4281,4532,4448,4351,884,937,990,7888,7952,8350,8291,1387,5003,5112,4908,4836,4751,5949,5882,5798,5243,2100,2037,3754,1563,1624,5349,2412,4635,8008,4184,3913,2471,2781,3099,2529,3675,3603,3541,3308,3257,3153,3204,3359,2281,2224,3420,2835,4112,3483,2350,3977,2733,3039,2983,2894,3863,2685,3800,2573,2634,4045,1509,1834,1942,1778,1888,1730,1673,1302,1246,6430,6345,6654,7836,7033,6958,7123,7287,7512,7367,6506,6589,6876,6735,6816,6277,7635,7739,8239,8122,8068,8197,1453,5181,5695,6100,6019,6195,5608,5548,5492,5429,1101,1192"
+ },
+ "to": {
+ "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
+ "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,4106,4174,4234,4287,4353,4415,4483,4546,4593,4648,4736,4794,4856,4906,4951,4994,5054,5121,5176,5231,5284,5331,5384,5440,5488,5543,5596,5680,5747,5811,5907,5981,6062,6151,6314,6458,6537,6612,6694,6753,6833,6913,6968,7090,7193,7234,7287,7344,7418,7483,7551,7637,7717,7786,7880,7939,7994,8056,8116,8226",
+ "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127",
+ "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,55,67,59,52,65,61,67,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,4101,4169,4229,4282,4348,4410,4478,4541,4588,4643,4731,4789,4851,4901,4946,4989,5049,5116,5171,5226,5279,5326,5379,5435,5483,5538,5591,5675,5742,5806,5902,5976,6057,6146,6309,6453,6532,6607,6689,6748,6828,6908,6963,7085,7188,7229,7282,7339,7413,7478,7546,7632,7712,7781,7875,7934,7989,8051,8111,8221,8311"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml",
+ "from": {
+ "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": "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": "E:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "730",
+ "endColumns": "56",
+ "endOffsets": "782"
+ },
+ "to": {
+ "startLines": "12",
+ "startColumns": "4",
+ "startOffsets": "420",
+ "endColumns": "56",
+ "endOffsets": "472"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
+ },
+ "to": {
+ "startLines": "128,132,136,140,143,147,151,155,159,163,167",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8316,8520,8731,8941,9101,9284,9469,9654,9857,10063,10246",
+ "endLines": "131,135,139,142,146,150,154,158,162,166,170",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8515,8726,8936,9096,9279,9464,9649,9852,10058,10241,10442"
+ }
+ },
+ {
+ "source": "E:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml",
+ "from": {
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "758,1073",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1065,1191"
+ },
+ "to": {
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
new file mode 100644
index 0000000..2c6284f
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json
@@ -0,0 +1,398 @@
+[
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_alert.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_alert.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_preferences.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\preferences.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_title_bar_bg.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\title_bar_bg.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw-zh-rCN_introduction.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw-zh-rCN\\introduction"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_middle.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_middle.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_yellow.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_yellow.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_options.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_options.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit_list_item.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit_list_item.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_normal.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_normal.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_icon_app.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\icon_app.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_up.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_up.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_footer_bg.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_footer_bg.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_red.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_red.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable_new_note.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable\\new_note.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_single.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_single.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_lanyangyang.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\lanyangyang.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_up.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_up.9.png"
+ },
+ {
+ "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat",
+ "source": "net.micode.notes.app-main-6:/layout/note_edit.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_green.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_green.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_down.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_down.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_sub_folder.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\sub_folder.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_small.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_small.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_single.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_single.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_yellow.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_yellow.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_folder.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_folder.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_search_result.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\search_result.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_single.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_single.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_edit.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_edit.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_record_folder.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_record_folder.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_up.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_up.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_2x.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_2x.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_down.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_down.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_up.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_up.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_large.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_large.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_item.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_item.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_playground1.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\playground1.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_selected.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\selected.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_4x_info.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_4x_info.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_dropdown_menu.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_dropdown_menu.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_call_record.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\call_record.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\note_edit_color_selector_panel.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_clock.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\clock.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_green.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_green.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_notification.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\notification.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_new_note_pressed.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\new_note_pressed.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_red.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_red.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_middle.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_middle.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_single.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_single.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_primary_text_dark.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\primary_text_dark.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_red.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_red.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_white.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_white.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_super.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_super.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_dropdown_icon.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\dropdown_icon.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_single.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_single.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_white.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_white.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_middle.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_middle.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_blue_middle.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_blue_middle.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_note_list_dropdown.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\note_list_dropdown.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_white.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_white.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_settings_header.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\settings_header.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_delete.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_delete.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_background.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_background.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\menu_call_note_edit.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\menu\\call_note_edit.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_widget_4x.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\widget_4x.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_green.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_green.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_color_btn_mask.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_color_btn_mask.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_red.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_red.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_up.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_up.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\color_secondary_text_dark.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\color\\secondary_text_dark.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_white_middle.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_white_middle.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_folder_list_item.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\folder_list_item.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_yellow.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_yellow.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_account_dialog_title.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\account_dialog_title.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\raw_introduction.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\raw\\introduction"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_dialog_edit_text.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\dialog_edit_text.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_blue.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_blue.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_green.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_green.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_add_account_text.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\add_account_text.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_yellow_down.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_yellow_down.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_green_down.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_green_down.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_normal.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_normal.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_datetime_picker.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\datetime_picker.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_font_size_selector_bg.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\font_size_selector_bg.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_yellow.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_yellow.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_widget_2x_info.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\widget_2x_info.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_list_red_down.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\list_red_down.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\xml_searchable.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\xml\\searchable.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_bg_btn_set_color.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\bg_btn_set_color.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_delete.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\delete.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_4x_blue.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_4x_blue.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_grass.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\grass.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_list_footer.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_list_footer.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_widget_2x_white.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\widget_2x_white.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\layout_note_edit.xml.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\layout\\note_edit.xml"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_menu_move.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\menu_move.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_title_blue.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_title_blue.9.png"
+ },
+ {
+ "merged": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\drawable-hdpi_edit_blue.9.png.flat",
+ "source": "C:\\Users\\86139\\.gradle\\daemon\\8.0\\net.micode.notes.app-main-6:\\drawable-hdpi\\edit_blue.9.png"
+ }
+]
\ No newline at end of file
diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
new file mode 100644
index 0000000..b9ab010
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml
@@ -0,0 +1,408 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
new file mode 100644
index 0000000..98ef597
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
new file mode 100644
index 0000000..0ee7c95
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
new file mode 100644
index 0000000..ec679dc
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
new file mode 100644
index 0000000..733b031
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
new file mode 100644
index 0000000..2c3217a
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
new file mode 100644
index 0000000..b04e62f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
new file mode 100644
index 0000000..68ee1ab
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
new file mode 100644
index 0000000..9c8f2d5
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
new file mode 100644
index 0000000..a802f8f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
new file mode 100644
index 0000000..cc165fb
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
new file mode 100644
index 0000000..5556621
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
new file mode 100644
index 0000000..da0a398
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
new file mode 100644
index 0000000..e89e83f
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
new file mode 100644
index 0000000..c2f7d45
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
new file mode 100644
index 0000000..487f7aa
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
new file mode 100644
index 0000000..2d8d823
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
new file mode 100644
index 0000000..5ccca4d
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
new file mode 100644
index 0000000..f3ea41e
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
new file mode 100644
index 0000000..5090610
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
new file mode 100644
index 0000000..c58a0ba
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
new file mode 100644
index 0000000..79d9911
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
new file mode 100644
index 0000000..1202651
Binary files /dev/null and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
new file mode 100644
index 0000000..0200fa3
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt
@@ -0,0 +1,293 @@
+int array format_for_exported_note 0x7f010000
+int array menu_share_ways 0x7f010001
+int color primary_text_dark 0x7f020000
+int color secondary_text_dark 0x7f020001
+int color user_query_highlight 0x7f020002
+int dimen text_font_size_large 0x7f030000
+int dimen text_font_size_medium 0x7f030001
+int dimen text_font_size_normal 0x7f030002
+int dimen text_font_size_small 0x7f030003
+int dimen text_font_size_super 0x7f030004
+int drawable bg_btn_set_color 0x7f040000
+int drawable bg_color_btn_mask 0x7f040001
+int drawable call_record 0x7f040002
+int drawable clock 0x7f040003
+int drawable delete 0x7f040004
+int drawable dropdown_icon 0x7f040005
+int drawable edit_blue 0x7f040006
+int drawable edit_green 0x7f040007
+int drawable edit_red 0x7f040008
+int drawable edit_title_blue 0x7f040009
+int drawable edit_title_green 0x7f04000a
+int drawable edit_title_red 0x7f04000b
+int drawable edit_title_white 0x7f04000c
+int drawable edit_title_yellow 0x7f04000d
+int drawable edit_white 0x7f04000e
+int drawable edit_yellow 0x7f04000f
+int drawable font_large 0x7f040010
+int drawable font_normal 0x7f040011
+int drawable font_size_selector_bg 0x7f040012
+int drawable font_small 0x7f040013
+int drawable font_super 0x7f040014
+int drawable grass 0x7f040015
+int drawable icon_app 0x7f040016
+int drawable lanyangyang 0x7f040017
+int drawable list_background 0x7f040018
+int drawable list_blue_down 0x7f040019
+int drawable list_blue_middle 0x7f04001a
+int drawable list_blue_single 0x7f04001b
+int drawable list_blue_up 0x7f04001c
+int drawable list_folder 0x7f04001d
+int drawable list_footer_bg 0x7f04001e
+int drawable list_green_down 0x7f04001f
+int drawable list_green_middle 0x7f040020
+int drawable list_green_single 0x7f040021
+int drawable list_green_up 0x7f040022
+int drawable list_red_down 0x7f040023
+int drawable list_red_middle 0x7f040024
+int drawable list_red_single 0x7f040025
+int drawable list_red_up 0x7f040026
+int drawable list_white_down 0x7f040027
+int drawable list_white_middle 0x7f040028
+int drawable list_white_single 0x7f040029
+int drawable list_white_up 0x7f04002a
+int drawable list_yellow_down 0x7f04002b
+int drawable list_yellow_middle 0x7f04002c
+int drawable list_yellow_single 0x7f04002d
+int drawable list_yellow_up 0x7f04002e
+int drawable menu_delete 0x7f04002f
+int drawable menu_move 0x7f040030
+int drawable new_note 0x7f040031
+int drawable new_note_normal 0x7f040032
+int drawable new_note_pressed 0x7f040033
+int drawable note_edit_color_selector_panel 0x7f040034
+int drawable notification 0x7f040035
+int drawable playground1 0x7f040036
+int drawable search_result 0x7f040037
+int drawable selected 0x7f040038
+int drawable title_alert 0x7f040039
+int drawable title_bar_bg 0x7f04003a
+int drawable widget_2x_blue 0x7f04003b
+int drawable widget_2x_green 0x7f04003c
+int drawable widget_2x_red 0x7f04003d
+int drawable widget_2x_white 0x7f04003e
+int drawable widget_2x_yellow 0x7f04003f
+int drawable widget_4x_blue 0x7f040040
+int drawable widget_4x_green 0x7f040041
+int drawable widget_4x_red 0x7f040042
+int drawable widget_4x_white 0x7f040043
+int drawable widget_4x_yellow 0x7f040044
+int id account_dialog_subtitle 0x7f050000
+int id account_dialog_title 0x7f050001
+int id action_select_all 0x7f050002
+int id amPm 0x7f050003
+int id btn_new_note 0x7f050004
+int id btn_set_bg_color 0x7f050005
+int id cb_edit_item 0x7f050006
+int id date 0x7f050007
+int id delete 0x7f050008
+int id et_edit_text 0x7f050009
+int id et_foler_name 0x7f05000a
+int id font_size_selector 0x7f05000b
+int id hour 0x7f05000c
+int id iv_alert_icon 0x7f05000d
+int id iv_bg_blue 0x7f05000e
+int id iv_bg_blue_select 0x7f05000f
+int id iv_bg_green 0x7f050010
+int id iv_bg_green_select 0x7f050011
+int id iv_bg_red 0x7f050012
+int id iv_bg_red_select 0x7f050013
+int id iv_bg_white 0x7f050014
+int id iv_bg_white_select 0x7f050015
+int id iv_bg_yellow 0x7f050016
+int id iv_bg_yellow_select 0x7f050017
+int id iv_large_select 0x7f050018
+int id iv_medium_select 0x7f050019
+int id iv_small_select 0x7f05001a
+int id iv_super_select 0x7f05001b
+int id ll_font_large 0x7f05001c
+int id ll_font_normal 0x7f05001d
+int id ll_font_small 0x7f05001e
+int id ll_font_super 0x7f05001f
+int id menu_alert 0x7f050020
+int id menu_delete 0x7f050021
+int id menu_delete_remind 0x7f050022
+int id menu_export_text 0x7f050023
+int id menu_font_size 0x7f050024
+int id menu_grass 0x7f050025
+int id menu_lanyangyang 0x7f050026
+int id menu_list_mode 0x7f050027
+int id menu_new_folder 0x7f050028
+int id menu_new_note 0x7f050029
+int id menu_playground1 0x7f05002a
+int id menu_search 0x7f05002b
+int id menu_send_to_desktop 0x7f05002c
+int id menu_setting 0x7f05002d
+int id menu_share 0x7f05002e
+int id menu_sync 0x7f05002f
+int id minute 0x7f050030
+int id move 0x7f050031
+int id navigation_bar 0x7f050032
+int id note_bg_color_selector 0x7f050033
+int id note_edit_list 0x7f050034
+int id note_edit_view 0x7f050035
+int id note_item 0x7f050036
+int id note_title 0x7f050037
+int id notes_list 0x7f050038
+int id prefenerece_sync_status_textview 0x7f050039
+int id preference_sync_button 0x7f05003a
+int id selection_menu 0x7f05003b
+int id sv_note_edit 0x7f05003c
+int id text_num 0x7f05003d
+int id tv_alert_date 0x7f05003e
+int id tv_folder_name 0x7f05003f
+int id tv_modified_date 0x7f050040
+int id tv_name 0x7f050041
+int id tv_time 0x7f050042
+int id tv_title 0x7f050043
+int id tv_title_bar 0x7f050044
+int id widget_bg_image 0x7f050045
+int id widget_text 0x7f050046
+int layout account_dialog_title 0x7f060000
+int layout add_account_text 0x7f060001
+int layout datetime_picker 0x7f060002
+int layout dialog_edit_text 0x7f060003
+int layout folder_list_item 0x7f060004
+int layout note_edit 0x7f060005
+int layout note_edit_list_item 0x7f060006
+int layout note_item 0x7f060007
+int layout note_list 0x7f060008
+int layout note_list_dropdown_menu 0x7f060009
+int layout note_list_footer 0x7f06000a
+int layout settings_header 0x7f06000b
+int layout widget_2x 0x7f06000c
+int layout widget_4x 0x7f06000d
+int menu call_note_edit 0x7f070000
+int menu call_record_folder 0x7f070001
+int menu note_edit 0x7f070002
+int menu note_list 0x7f070003
+int menu note_list_dropdown 0x7f070004
+int menu note_list_options 0x7f070005
+int menu sub_folder 0x7f070006
+int plurals search_results_title 0x7f080000
+int raw introduction 0x7f090000
+int string alert_message_delete_folder 0x7f0a0000
+int string alert_message_delete_note 0x7f0a0001
+int string alert_message_delete_notes 0x7f0a0002
+int string alert_title_delete 0x7f0a0003
+int string app_name 0x7f0a0004
+int string app_widget2x2 0x7f0a0005
+int string app_widget4x4 0x7f0a0006
+int string button_delete 0x7f0a0007
+int string call_record_folder_name 0x7f0a0008
+int string datetime_dialog_cancel 0x7f0a0009
+int string datetime_dialog_ok 0x7f0a000a
+int string delete_remind_time_message 0x7f0a000b
+int string error_note_empty_for_clock 0x7f0a000c
+int string error_note_empty_for_send_to_desktop 0x7f0a000d
+int string error_note_not_exist 0x7f0a000e
+int string error_sdcard_export 0x7f0a000f
+int string error_sdcard_unmounted 0x7f0a0010
+int string error_sync_cancelled 0x7f0a0011
+int string error_sync_internal 0x7f0a0012
+int string error_sync_network 0x7f0a0013
+int string failed_sdcard_export 0x7f0a0014
+int string file_name_txt_format 0x7f0a0015
+int string file_path 0x7f0a0016
+int string folder_exist 0x7f0a0017
+int string format_date_ymd 0x7f0a0018
+int string format_datetime_mdhm 0x7f0a0019
+int string format_exported_file_location 0x7f0a001a
+int string format_folder_files_count 0x7f0a001b
+int string format_move_notes_to_folder 0x7f0a001c
+int string hint_foler_name 0x7f0a001d
+int string info_note_enter_desktop 0x7f0a001e
+int string menu_alert 0x7f0a001f
+int string menu_create_folder 0x7f0a0020
+int string menu_delete 0x7f0a0021
+int string menu_deselect_all 0x7f0a0022
+int string menu_export_text 0x7f0a0023
+int string menu_folder_change_name 0x7f0a0024
+int string menu_folder_delete 0x7f0a0025
+int string menu_folder_view 0x7f0a0026
+int string menu_font_large 0x7f0a0027
+int string menu_font_normal 0x7f0a0028
+int string menu_font_size 0x7f0a0029
+int string menu_font_small 0x7f0a002a
+int string menu_font_super 0x7f0a002b
+int string menu_grass 0x7f0a002c
+int string menu_lanyangyang 0x7f0a002d
+int string menu_list_mode 0x7f0a002e
+int string menu_move 0x7f0a002f
+int string menu_move_parent_folder 0x7f0a0030
+int string menu_normal_mode 0x7f0a0031
+int string menu_playground1 0x7f0a0032
+int string menu_remove_remind 0x7f0a0033
+int string menu_search 0x7f0a0034
+int string menu_select_all 0x7f0a0035
+int string menu_select_none 0x7f0a0036
+int string menu_select_title 0x7f0a0037
+int string menu_send_to_desktop 0x7f0a0038
+int string menu_setting 0x7f0a0039
+int string menu_share 0x7f0a003a
+int string menu_sync 0x7f0a003b
+int string menu_sync_cancel 0x7f0a003c
+int string menu_title_select_folder 0x7f0a003d
+int string note_alert_expired 0x7f0a003e
+int string note_link_email 0x7f0a003f
+int string note_link_other 0x7f0a0040
+int string note_link_tel 0x7f0a0041
+int string note_link_web 0x7f0a0042
+int string notealert_enter 0x7f0a0043
+int string notealert_ok 0x7f0a0044
+int string notelist_menu_new 0x7f0a0045
+int string notelist_string_info 0x7f0a0046
+int string preferences_account_summary 0x7f0a0047
+int string preferences_account_title 0x7f0a0048
+int string preferences_add_account 0x7f0a0049
+int string preferences_bg_random_appear_title 0x7f0a004a
+int string preferences_button_sync_cancel 0x7f0a004b
+int string preferences_button_sync_immediately 0x7f0a004c
+int string preferences_dialog_change_account_title 0x7f0a004d
+int string preferences_dialog_change_account_warn_msg 0x7f0a004e
+int string preferences_dialog_select_account_tips 0x7f0a004f
+int string preferences_dialog_select_account_title 0x7f0a0050
+int string preferences_last_sync_time 0x7f0a0051
+int string preferences_last_sync_time_format 0x7f0a0052
+int string preferences_menu_cancel 0x7f0a0053
+int string preferences_menu_change_account 0x7f0a0054
+int string preferences_menu_remove_account 0x7f0a0055
+int string preferences_title 0x7f0a0056
+int string preferences_toast_cannot_change_account 0x7f0a0057
+int string preferences_toast_success_set_accout 0x7f0a0058
+int string search 0x7f0a0059
+int string search_hint 0x7f0a005a
+int string search_label 0x7f0a005b
+int string search_setting_description 0x7f0a005c
+int string set_remind_time_message 0x7f0a005d
+int string success_sdcard_export 0x7f0a005e
+int string success_sync_account 0x7f0a005f
+int string sync_progress_init_list 0x7f0a0060
+int string sync_progress_login 0x7f0a0061
+int string sync_progress_syncing 0x7f0a0062
+int string ticker_cancel 0x7f0a0063
+int string ticker_fail 0x7f0a0064
+int string ticker_success 0x7f0a0065
+int string ticker_syncing 0x7f0a0066
+int string widget_havenot_content 0x7f0a0067
+int string widget_under_visit_mode 0x7f0a0068
+int style HighlightTextAppearancePrimary 0x7f0b0000
+int style HighlightTextAppearanceSecondary 0x7f0b0001
+int style NoteActionBarStyle 0x7f0b0002
+int style NoteTheme 0x7f0b0003
+int style TextAppearanceLarge 0x7f0b0004
+int style TextAppearanceMedium 0x7f0b0005
+int style TextAppearanceNormal 0x7f0b0006
+int style TextAppearancePrimaryItem 0x7f0b0007
+int style TextAppearanceSecondaryItem 0x7f0b0008
+int style TextAppearanceSuper 0x7f0b0009
+int style TextAppearanceUnderMenuIcon 0x7f0b000a
+int xml preferences 0x7f0c0000
+int xml searchable 0x7f0c0001
+int xml widget_2x_info 0x7f0c0002
+int xml widget_4x_info 0x7f0c0003
diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt
new file mode 100644
index 0000000..d60fb9e
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -0,0 +1,7 @@
+net.micode.notes.app-pngs-0 E:\Notes-master1\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 E:\Notes-master1\app\build\generated\res\resValues\debug
+net.micode.notes.app-packageDebugResources-2 E:\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
+net.micode.notes.app-packageDebugResources-3 E:\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
+net.micode.notes.app-merged_res-4 E:\Notes-master1\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-5 E:\Notes-master1\app\src\debug\res
+net.micode.notes.app-main-6 E:\Notes-master1\app\src\main\res
diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
new file mode 100644
index 0000000..777909c
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
@@ -0,0 +1,4 @@
+net.micode.notes.test.app-androidTest-0 E:\Notes-master1\app\build\generated\res\resValues\androidTest\debug
+net.micode.notes.test.app-mergeDebugAndroidTestResources-1 E:\Notes-master1\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
+net.micode.notes.test.app-mergeDebugAndroidTestResources-2 E:\Notes-master1\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
+net.micode.notes.test.app-merged_res-3 E:\Notes-master1\app\build\intermediates\merged_res\debugAndroidTest
diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
new file mode 100644
index 0000000..449027c
--- /dev/null
+++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
@@ -0,0 +1,293 @@
+net.micode.notes:xml/searchable = 0x7f0c0001
+net.micode.notes:xml/preferences = 0x7f0c0000
+net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a
+net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009
+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/widget_under_visit_mode = 0x7f0a0068
+net.micode.notes:string/sync_progress_login = 0x7f0a0061
+net.micode.notes:string/success_sync_account = 0x7f0a005f
+net.micode.notes:string/search_setting_description = 0x7f0a005c
+net.micode.notes:string/search_hint = 0x7f0a005a
+net.micode.notes:string/search = 0x7f0a0059
+net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058
+net.micode.notes:string/preferences_title = 0x7f0a0056
+net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054
+net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051
+net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d
+net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004a
+net.micode.notes:string/preferences_add_account = 0x7f0a0049
+net.micode.notes:string/preferences_account_title = 0x7f0a0048
+net.micode.notes:xml/widget_4x_info = 0x7f0c0003
+net.micode.notes:string/set_remind_time_message = 0x7f0a005d
+net.micode.notes:string/notealert_enter = 0x7f0a0043
+net.micode.notes:string/note_link_web = 0x7f0a0042
+net.micode.notes:string/note_link_tel = 0x7f0a0041
+net.micode.notes:string/note_link_other = 0x7f0a0040
+net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e
+net.micode.notes:string/note_link_email = 0x7f0a003f
+net.micode.notes:string/note_alert_expired = 0x7f0a003e
+net.micode.notes:string/menu_sync_cancel = 0x7f0a003c
+net.micode.notes:string/menu_sync = 0x7f0a003b
+net.micode.notes:string/menu_share = 0x7f0a003a
+net.micode.notes:string/menu_setting = 0x7f0a0039
+net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038
+net.micode.notes:string/menu_select_title = 0x7f0a0037
+net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004
+net.micode.notes:string/menu_select_all = 0x7f0a0035
+net.micode.notes:string/menu_search = 0x7f0a0034
+net.micode.notes:string/menu_normal_mode = 0x7f0a0031
+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 = 0x7f0a0033
+net.micode.notes:string/menu_font_large = 0x7f0a0027
+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:string/info_note_enter_desktop = 0x7f0a001e
+net.micode.notes:string/success_sdcard_export = 0x7f0a005e
+net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c
+net.micode.notes:string/format_folder_files_count = 0x7f0a001b
+net.micode.notes:string/format_exported_file_location = 0x7f0a001a
+net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019
+net.micode.notes:string/preferences_account_summary = 0x7f0a0047
+net.micode.notes:string/format_date_ymd = 0x7f0a0018
+net.micode.notes:string/file_name_txt_format = 0x7f0a0015
+net.micode.notes:id/note_edit_list = 0x7f050034
+net.micode.notes:drawable/new_note = 0x7f040031
+net.micode.notes:string/folder_exist = 0x7f0a0017
+net.micode.notes:string/menu_select_none = 0x7f0a0036
+net.micode.notes:string/failed_sdcard_export = 0x7f0a0014
+net.micode.notes:string/ticker_cancel = 0x7f0a0063
+net.micode.notes:drawable/list_red_single = 0x7f040025
+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 = 0x7f040041
+net.micode.notes:string/error_sdcard_export = 0x7f0a000f
+net.micode.notes:string/notealert_ok = 0x7f0a0044
+net.micode.notes:string/menu_move_parent_folder = 0x7f0a0030
+net.micode.notes:id/tv_title = 0x7f050043
+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/preferences_menu_remove_account = 0x7f0a0055
+net.micode.notes:string/button_delete = 0x7f0a0007
+net.micode.notes:string/ticker_fail = 0x7f0a0064
+net.micode.notes:string/search_label = 0x7f0a005b
+net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f
+net.micode.notes:string/app_widget2x2 = 0x7f0a0005
+net.micode.notes:string/app_name = 0x7f0a0004
+net.micode.notes:string/widget_havenot_content = 0x7f0a0067
+net.micode.notes:string/alert_title_delete = 0x7f0a0003
+net.micode.notes:string/alert_message_delete_note = 0x7f0a0001
+net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000
+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 = 0x7f0a0066
+net.micode.notes:drawable/menu_move = 0x7f040030
+net.micode.notes:id/menu_search = 0x7f05002b
+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 = 0x7f0a0052
+net.micode.notes:menu/call_note_edit = 0x7f070000
+net.micode.notes:drawable/list_red_middle = 0x7f040024
+net.micode.notes:layout/widget_2x = 0x7f06000c
+net.micode.notes:layout/widget_4x = 0x7f06000d
+net.micode.notes:drawable/icon_app = 0x7f040016
+net.micode.notes:layout/note_list = 0x7f060008
+net.micode.notes:layout/note_edit = 0x7f060005
+net.micode.notes:drawable/list_background = 0x7f040018
+net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002
+net.micode.notes:drawable/widget_2x_blue = 0x7f04003b
+net.micode.notes:layout/folder_list_item = 0x7f060004
+net.micode.notes:string/sync_progress_init_list = 0x7f0a0060
+net.micode.notes:id/btn_new_note = 0x7f050004
+net.micode.notes:layout/add_account_text = 0x7f060001
+net.micode.notes:id/widget_text = 0x7f050046
+net.micode.notes:id/widget_bg_image = 0x7f050045
+net.micode.notes:string/menu_folder_delete = 0x7f0a0025
+net.micode.notes:id/tv_name = 0x7f050041
+net.micode.notes:id/tv_alert_date = 0x7f05003e
+net.micode.notes:color/primary_text_dark = 0x7f020000
+net.micode.notes:id/tv_time = 0x7f050042
+net.micode.notes:id/selection_menu = 0x7f05003b
+net.micode.notes:id/preference_sync_button = 0x7f05003a
+net.micode.notes:string/error_sync_network = 0x7f0a0013
+net.micode.notes:id/notes_list = 0x7f050038
+net.micode.notes:drawable/playground1 = 0x7f040036
+net.micode.notes:id/note_title = 0x7f050037
+net.micode.notes:id/note_bg_color_selector = 0x7f050033
+net.micode.notes:id/navigation_bar = 0x7f050032
+net.micode.notes:id/move = 0x7f050031
+net.micode.notes:id/menu_sync = 0x7f05002f
+net.micode.notes:string/menu_move = 0x7f0a002f
+net.micode.notes:id/date = 0x7f050007
+net.micode.notes:id/note_item = 0x7f050036
+net.micode.notes:id/menu_setting = 0x7f05002d
+net.micode.notes:id/menu_send_to_desktop = 0x7f05002c
+net.micode.notes:id/menu_share = 0x7f05002e
+net.micode.notes:id/menu_playground1 = 0x7f05002a
+net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000
+net.micode.notes:drawable/font_size_selector_bg = 0x7f040012
+net.micode.notes:id/menu_lanyangyang = 0x7f050026
+net.micode.notes:id/note_edit_view = 0x7f050035
+net.micode.notes:id/menu_list_mode = 0x7f050027
+net.micode.notes:string/menu_lanyangyang = 0x7f0a002d
+net.micode.notes:id/account_dialog_title = 0x7f050001
+net.micode.notes:id/tv_folder_name = 0x7f05003f
+net.micode.notes:id/menu_grass = 0x7f050025
+net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050
+net.micode.notes:id/menu_font_size = 0x7f050024
+net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b
+net.micode.notes:id/menu_alert = 0x7f050020
+net.micode.notes:string/menu_grass = 0x7f0a002c
+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 = 0x7f050030
+net.micode.notes:id/ll_font_normal = 0x7f05001d
+net.micode.notes:id/ll_font_large = 0x7f05001c
+net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c
+net.micode.notes:string/menu_playground1 = 0x7f0a0032
+net.micode.notes:id/iv_super_select = 0x7f05001b
+net.micode.notes:string/ticker_success = 0x7f0a0065
+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:layout/account_dialog_title = 0x7f060000
+net.micode.notes:string/notelist_menu_new = 0x7f0a0045
+net.micode.notes:drawable/menu_delete = 0x7f04002f
+net.micode.notes:id/iv_bg_red_select = 0x7f050013
+net.micode.notes:id/iv_bg_red = 0x7f050012
+net.micode.notes:menu/note_edit = 0x7f070002
+net.micode.notes:drawable/list_white_down = 0x7f040027
+net.micode.notes:drawable/list_white_up = 0x7f04002a
+net.micode.notes:id/iv_bg_green = 0x7f050010
+net.micode.notes:drawable/delete = 0x7f040004
+net.micode.notes:id/iv_bg_blue = 0x7f05000e
+net.micode.notes:drawable/list_green_single = 0x7f040021
+net.micode.notes:id/iv_alert_icon = 0x7f05000d
+net.micode.notes:drawable/list_yellow_single = 0x7f04002d
+net.micode.notes:id/cb_edit_item = 0x7f050006
+net.micode.notes:drawable/font_super = 0x7f040014
+net.micode.notes:drawable/edit_title_blue = 0x7f040009
+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 = 0x7f0a0057
+net.micode.notes:id/et_edit_text = 0x7f050009
+net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f
+net.micode.notes:id/amPm = 0x7f050003
+net.micode.notes:id/account_dialog_subtitle = 0x7f050000
+net.micode.notes:drawable/clock = 0x7f040003
+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 = 0x7f040035
+net.micode.notes:id/iv_bg_blue_select = 0x7f05000f
+net.micode.notes:string/menu_title_select_folder = 0x7f0a003d
+net.micode.notes:string/hint_foler_name = 0x7f0a001d
+net.micode.notes:drawable/list_red_down = 0x7f040023
+net.micode.notes:id/menu_delete = 0x7f050021
+net.micode.notes:drawable/lanyangyang = 0x7f040017
+net.micode.notes:drawable/widget_4x_blue = 0x7f040040
+net.micode.notes:drawable/edit_title_white = 0x7f04000c
+net.micode.notes:string/menu_delete = 0x7f0a0021
+net.micode.notes:drawable/list_footer_bg = 0x7f04001e
+net.micode.notes:drawable/edit_red = 0x7f040008
+net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053
+net.micode.notes:drawable/widget_2x_white = 0x7f04003e
+net.micode.notes:drawable/widget_4x_yellow = 0x7f040044
+net.micode.notes:drawable/grass = 0x7f040015
+net.micode.notes:drawable/widget_2x_red = 0x7f04003d
+net.micode.notes:drawable/font_large = 0x7f040010
+net.micode.notes:string/file_path = 0x7f0a0016
+net.micode.notes:string/menu_alert = 0x7f0a001f
+net.micode.notes:drawable/title_alert = 0x7f040039
+net.micode.notes:drawable/list_green_down = 0x7f04001f
+net.micode.notes:string/error_sync_internal = 0x7f0a0012
+net.micode.notes:drawable/search_result = 0x7f040037
+net.micode.notes:string/app_widget4x4 = 0x7f0a0006
+net.micode.notes:drawable/title_bar_bg = 0x7f04003a
+net.micode.notes:drawable/selected = 0x7f040038
+net.micode.notes:plurals/search_results_title = 0x7f080000
+net.micode.notes:drawable/edit_title_green = 0x7f04000a
+net.micode.notes:drawable/new_note_normal = 0x7f040032
+net.micode.notes:drawable/edit_white = 0x7f04000e
+net.micode.notes:drawable/widget_2x_green = 0x7f04003c
+net.micode.notes:id/iv_bg_white = 0x7f050014
+net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001
+net.micode.notes:drawable/list_yellow_up = 0x7f04002e
+net.micode.notes:drawable/list_white_single = 0x7f040029
+net.micode.notes:menu/note_list_dropdown = 0x7f070004
+net.micode.notes:drawable/edit_title_red = 0x7f04000b
+net.micode.notes:id/tv_title_bar = 0x7f050044
+net.micode.notes:drawable/list_red_up = 0x7f040026
+net.micode.notes:id/delete = 0x7f050008
+net.micode.notes:layout/note_edit_list_item = 0x7f060006
+net.micode.notes:string/call_record_folder_name = 0x7f0a0008
+net.micode.notes:drawable/list_green_up = 0x7f040022
+net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050039
+net.micode.notes:id/et_foler_name = 0x7f05000a
+net.micode.notes:id/menu_delete_remind = 0x7f050022
+net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040034
+net.micode.notes:id/menu_export_text = 0x7f050023
+net.micode.notes:id/hour = 0x7f05000c
+net.micode.notes:string/menu_folder_view = 0x7f0a0026
+net.micode.notes:drawable/dropdown_icon = 0x7f040005
+net.micode.notes:string/notelist_string_info = 0x7f0a0046
+net.micode.notes:drawable/list_blue_single = 0x7f04001b
+net.micode.notes:drawable/list_white_middle = 0x7f040028
+net.micode.notes:drawable/call_record = 0x7f040002
+net.micode.notes:id/text_num = 0x7f05003d
+net.micode.notes:dimen/text_font_size_normal = 0x7f030002
+net.micode.notes:layout/dialog_edit_text = 0x7f060003
+net.micode.notes:color/secondary_text_dark = 0x7f020001
+net.micode.notes:drawable/list_folder = 0x7f04001d
+net.micode.notes:id/iv_bg_green_select = 0x7f050011
+net.micode.notes:id/menu_new_note = 0x7f050029
+net.micode.notes:drawable/list_green_middle = 0x7f040020
+net.micode.notes:string/sync_progress_syncing = 0x7f0a0062
+net.micode.notes:drawable/font_normal = 0x7f040011
+net.micode.notes:drawable/list_blue_up = 0x7f04001c
+net.micode.notes:id/iv_small_select = 0x7f05001a
+net.micode.notes:drawable/list_blue_down = 0x7f040019
+net.micode.notes:id/ll_font_super = 0x7f05001f
+net.micode.notes:dimen/text_font_size_large = 0x7f030000
+net.micode.notes:drawable/edit_yellow = 0x7f04000f
+net.micode.notes:drawable/list_yellow_down = 0x7f04002b
+net.micode.notes:dimen/text_font_size_super = 0x7f030004
+net.micode.notes:drawable/edit_blue = 0x7f040006
+net.micode.notes:array/format_for_exported_note = 0x7f010000
+net.micode.notes:string/menu_list_mode = 0x7f0a002e
+net.micode.notes:drawable/list_yellow_middle = 0x7f04002c
+net.micode.notes:drawable/list_blue_middle = 0x7f04001a
+net.micode.notes:dimen/text_font_size_medium = 0x7f030001
+net.micode.notes:drawable/new_note_pressed = 0x7f040033
+net.micode.notes:id/menu_new_folder = 0x7f050028
+net.micode.notes:id/sv_note_edit = 0x7f05003c
+net.micode.notes:drawable/edit_green = 0x7f040007
+net.micode.notes:id/action_select_all = 0x7f050002
+net.micode.notes:id/tv_modified_date = 0x7f050040
+net.micode.notes:id/iv_bg_white_select = 0x7f050015
+net.micode.notes:drawable/edit_title_yellow = 0x7f04000d
+net.micode.notes:layout/note_list_footer = 0x7f06000a
+net.micode.notes:string/menu_font_super = 0x7f0a002b
+net.micode.notes:drawable/widget_4x_red = 0x7f040042
+net.micode.notes:layout/settings_header = 0x7f06000b
+net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002
+net.micode.notes:dimen/text_font_size_small = 0x7f030003
+net.micode.notes:layout/datetime_picker = 0x7f060002
+net.micode.notes:menu/note_list_options = 0x7f070005
+net.micode.notes:drawable/widget_4x_white = 0x7f040043
diff --git a/src/Notes-master1/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/src/Notes-master1/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
new file mode 100644
index 0000000..8692d77
Binary files /dev/null and b/src/Notes-master1/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ
diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 0000000..d144d6a
--- /dev/null
+++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,227 @@
+-- Merging decision tree log ---
+manifest
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12
+ package
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+ android:versionName
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+ xmlns:android
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69
+ android:versionCode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+uses-sdk
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44
+ android:targetSdkVersion
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85
+uses-permission#android.permission.INTERNET
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78
+application
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19
+ android:extractNativeLibs
+ INJECTED from E:\Notes-master1\app\src\main\AndroidManifest.xml
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41
+ android:icon
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45
+ android:launchMode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43
+ android:windowSoftInputMode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52
+ android:uiOptions
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57
+ android:configChanges
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74
+ android:theme
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29
+action#android.intent.action.MAIN
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66
+category#android.intent.category.LAUNCHER
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20
+ android:launchMode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43
+ android:configChanges
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74
+ android:theme
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29
+action#android.intent.action.VIEW
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66
+category#android.intent.category.DEFAULT
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73
+data
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78
+ android:mimeType
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75
+intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29
+action#android.intent.action.SEARCH
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68
+meta-data#android.app.searchable
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54
+ android:resource
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43
+ android:authorities
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47
+ android:multiprocess
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57
+intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82
+meta-data#android.appwidget.provider
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58
+ android:resource
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20
+ android:process
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45
+ android:launchMode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48
+ android:theme
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20
+ android:label
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54
+ android:launchMode
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43
+ android:theme
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19
+ android:exported
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74
+meta-data#android.app.default_searchable
+ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52
+ android:value
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49
+ android:name
+ ADDED from E:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId13 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId13
new file mode 100644
index 0000000..2d467ae
Binary files /dev/null and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$8.class.uniqueId13 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4
new file mode 100644
index 0000000..b30291e
Binary files /dev/null and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/NotesListActivity$ModeCallback$2.class.uniqueId4 differ
diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
new file mode 100644
index 0000000..91f6012
Binary files /dev/null and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
new file mode 100644
index 0000000..7cf5b67
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -0,0 +1,914 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.AlertDialog;
+import android.app.PendingIntent;
+import android.app.SearchManager;
+import android.appwidget.AppWidgetManager;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.speech.tts.TextToSpeech;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.format.DateUtils;
+import android.text.style.BackgroundColorSpan;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.TextNote;
+import net.micode.notes.model.WorkingNote;
+import net.micode.notes.model.WorkingNote.NoteSettingChangedListener;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.tool.ResourceParser.TextAppearanceResources;
+import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener;
+import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener;
+import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_4x;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class NoteEditActivity extends Activity implements OnClickListener,
+ NoteSettingChangedListener, OnTextViewChangeListener {
+ private class HeadViewHolder {
+ public TextView tvModified;
+
+ public ImageView ivAlertIcon;
+
+ public TextView tvAlertDate;
+
+ public ImageView ibSetBgColor;
+ public EditText editText;
+ public TextView textView;
+ }
+
+ private static final Map sBgSelectorBtnsMap = new HashMap();
+ static {
+ sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
+ sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+ }
+
+ private static final Map sBgSelectorSelectionMap = new HashMap();
+ static {
+ sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select);
+ sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select);
+ sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
+ sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
+ sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+ }
+
+ private static final Map sFontSizeBtnsMap = new HashMap();
+ static {
+ sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE);
+ sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL);
+ sFontSizeBtnsMap.put(R.id.ll_font_normal, ResourceParser.TEXT_MEDIUM);
+ sFontSizeBtnsMap.put(R.id.ll_font_super, ResourceParser.TEXT_SUPER);
+ }
+
+ private static final Map sFontSelectorSelectionMap = new HashMap();
+ static {
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_MEDIUM, R.id.iv_medium_select);
+ sFontSelectorSelectionMap.put(ResourceParser.TEXT_SUPER, R.id.iv_super_select);
+ }
+
+ private static final String TAG = "NoteEditActivity";
+
+ private HeadViewHolder mNoteHeaderHolder;
+
+ private View mHeadViewPanel;
+
+ private View mNoteBgColorSelector;
+
+ private View mFontSizeSelector;
+
+ private EditText mNoteEditor;
+
+ private View mNoteEditorPanel;
+
+ private WorkingNote mWorkingNote;
+
+ private SharedPreferences mSharedPrefs;
+ private int mFontSizeId;
+
+ private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
+
+ private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
+
+ public static final String TAG_CHECKED = String.valueOf('\u221A');
+ public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
+
+ private LinearLayout mEditTextList;
+
+ private String mUserQuery;
+ private Pattern mPattern;
+ private EditText editText;
+ private TextView textView;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ this.setContentView(R.layout.note_edit);
+
+ if (savedInstanceState == null && !initActivityState(getIntent())) {
+ finish();
+ return;
+ }
+ initResources();
+ count();
+ }
+ private void count(){
+ mNoteEditor.addTextChangedListener(new TextWatcher() {
+ int currentLength = 0;
+
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ mNoteHeaderHolder.textView.setText("字符数:" + currentLength);
+ }
+
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ currentLength = mNoteHeaderHolder.editText.getText().length();
+ }
+
+ public void afterTextChanged(Editable s) {
+ mNoteHeaderHolder.textView.setText("字符数:" + currentLength);
+ }
+ });
+ }
+ /**
+ * Current activity may be killed when the memory is low. Once it is killed, for another time
+ * user load this activity, we should restore the former state
+ */
+ @Override
+ protected void onRestoreInstanceState(Bundle savedInstanceState) {
+ super.onRestoreInstanceState(savedInstanceState);
+ if (savedInstanceState != null && savedInstanceState.containsKey(Intent.EXTRA_UID)) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.putExtra(Intent.EXTRA_UID, savedInstanceState.getLong(Intent.EXTRA_UID));
+ if (!initActivityState(intent)) {
+ finish();
+ return;
+ }
+ Log.d(TAG, "Restoring from killed activity");
+ }
+ }
+
+ private boolean initActivityState(Intent intent) {
+ /**
+ * If the user specified the {@link Intent#ACTION_VIEW} but not provided with id,
+ * then jump to the NotesListActivity
+ */
+ mWorkingNote = null;
+ if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
+ long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
+ mUserQuery = "";
+
+ /**
+ * Starting from the searched result
+ */
+ if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
+ noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
+ mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
+ }
+
+ if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
+ Intent jump = new Intent(this, NotesListActivity.class);
+ startActivity(jump);
+ showToast(R.string.error_note_not_exist);
+ finish();
+ return false;
+ } else {
+ mWorkingNote = WorkingNote.load(this, noteId);
+ if (mWorkingNote == null) {
+ Log.e(TAG, "load note failed with note id" + noteId);
+ finish();
+ return false;
+ }
+ }
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
+ | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+ } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) {
+ // New note
+ long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
+ int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
+ AppWidgetManager.INVALID_APPWIDGET_ID);
+ int widgetType = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_TYPE,
+ Notes.TYPE_WIDGET_INVALIDE);
+ int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
+ ResourceParser.getDefaultBgId(this));
+
+ // Parse call-record note
+ String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
+ long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
+ if (callDate != 0 && phoneNumber != null) {
+ if (TextUtils.isEmpty(phoneNumber)) {
+ Log.w(TAG, "The call record number is null");
+ }
+ long noteId = 0;
+ if ((noteId = DataUtils.getNoteIdByPhoneNumberAndCallDate(getContentResolver(),
+ phoneNumber, callDate)) > 0) {
+ mWorkingNote = WorkingNote.load(this, noteId);
+ if (mWorkingNote == null) {
+ Log.e(TAG, "load call note failed with note id" + noteId);
+ finish();
+ return false;
+ }
+ } else {
+ mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId,
+ widgetType, bgResId);
+ mWorkingNote.convertToCallNote(phoneNumber, callDate);
+ }
+ } else {
+ mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType,
+ bgResId);
+ }
+
+ getWindow().setSoftInputMode(
+ WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+ | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+ } else {
+ Log.e(TAG, "Intent not specified action, should not support");
+ finish();
+ return false;
+ }
+ mWorkingNote.setOnSettingStatusChangedListener(this);
+ return true;
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ initNoteScreen();
+ }
+
+ private void initNoteScreen() {
+ mNoteEditor.setTextAppearance(this, TextAppearanceResources
+ .getTexAppearanceResource(mFontSizeId));
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ switchToListMode(mWorkingNote.getContent());
+ } else {
+ mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+ mNoteEditor.setSelection(mNoteEditor.getText().length());
+ }
+ for (Integer id : sBgSelectorSelectionMap.keySet()) {
+ findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
+ }
+ mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
+ mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+
+ mNoteHeaderHolder.tvModified.setText(DateUtils.formatDateTime(this,
+ mWorkingNote.getModifiedDate(), DateUtils.FORMAT_SHOW_DATE
+ | DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME
+ | DateUtils.FORMAT_SHOW_YEAR));
+
+ /**
+ * TODO: Add the menu for setting alert. Currently disable it because the DateTimePicker
+ * is not ready
+ */
+ showAlertHeader();
+ }
+
+ private void showAlertHeader() {
+ if (mWorkingNote.hasClockAlert()) {
+ long time = System.currentTimeMillis();
+ if (time > mWorkingNote.getAlertDate()) {
+ mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
+ } else {
+ mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString(
+ mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS));
+ }
+ mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE);
+ mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);
+ } else {
+ mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE);
+ mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE);
+ };
+ }
+
+ @Override
+ protected void onNewIntent(Intent intent) {
+ super.onNewIntent(intent);
+ initActivityState(intent);
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ /**
+ * For new note without note id, we should firstly save it to
+ * generate a id. If the editing note is not worth saving, there
+ * is no id which is equivalent to create new note
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }
+ outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
+ Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
+ }
+
+ @Override
+ public boolean dispatchTouchEvent(MotionEvent ev) {
+ if (mNoteBgColorSelector.getVisibility() == View.VISIBLE
+ && !inRangeOfView(mNoteBgColorSelector, ev)) {
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ return true;
+ }
+
+ if (mFontSizeSelector.getVisibility() == View.VISIBLE
+ && !inRangeOfView(mFontSizeSelector, ev)) {
+ mFontSizeSelector.setVisibility(View.GONE);
+ return true;
+ }
+ return super.dispatchTouchEvent(ev);
+ }
+
+ private boolean inRangeOfView(View view, MotionEvent ev) {
+ int []location = new int[2];
+ view.getLocationOnScreen(location);
+ int x = location[0];
+ int y = location[1];
+ if (ev.getX() < x
+ || ev.getX() > (x + view.getWidth())
+ || ev.getY() < y
+ || ev.getY() > (y + view.getHeight())) {
+ return false;
+ }
+ return true;
+ }
+
+ private void initResources() {
+ mHeadViewPanel = findViewById(R.id.note_title);
+ mNoteHeaderHolder = new HeadViewHolder();
+ mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date);
+ mNoteHeaderHolder.ivAlertIcon = (ImageView) findViewById(R.id.iv_alert_icon);
+ mNoteHeaderHolder.tvAlertDate = (TextView) findViewById(R.id.tv_alert_date);
+
+ mNoteHeaderHolder.editText = (EditText) findViewById(R.id.note_edit_view);
+ mNoteHeaderHolder.textView = (TextView) findViewById(R.id.text_num);
+
+ mNoteHeaderHolder.ibSetBgColor = (ImageView) findViewById(R.id.btn_set_bg_color);
+ mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
+ mNoteEditor = (EditText) findViewById(R.id.note_edit_view);
+ mNoteEditorPanel = findViewById(R.id.sv_note_edit);
+ mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
+ for (int id : sBgSelectorBtnsMap.keySet()) {
+ ImageView iv = (ImageView) findViewById(id);
+ iv.setOnClickListener(this);
+ }
+
+ mFontSizeSelector = findViewById(R.id.font_size_selector);
+ for (int id : sFontSizeBtnsMap.keySet()) {
+ View view = findViewById(id);
+ view.setOnClickListener(this);
+ };
+ mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE);
+ /**
+ * HACKME: Fix bug of store the resource id in shared preference.
+ * The id may larger than the length of resources, in this case,
+ * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE}
+ */
+ if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
+ mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
+ }
+ mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list);
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+ if(saveNote()) {
+ Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length());
+ }
+ clearSettingState();
+ }
+
+ private void updateWidget() {
+ Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+ if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
+ intent.setClass(this, NoteWidgetProvider_2x.class);
+ } else if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_4X) {
+ intent.setClass(this, NoteWidgetProvider_4x.class);
+ } else {
+ Log.e(TAG, "Unspported widget type");
+ return;
+ }
+
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+ mWorkingNote.getWidgetId()
+ });
+
+ sendBroadcast(intent);
+ setResult(RESULT_OK, intent);
+ }
+
+ public void onClick(View v) {
+ int id = v.getId();
+ if (id == R.id.btn_set_bg_color) {
+ mNoteBgColorSelector.setVisibility(View.VISIBLE);
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
+ } else if (sBgSelectorBtnsMap.containsKey(id)) {
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.GONE);
+ mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ } else if (sFontSizeBtnsMap.containsKey(id)) {
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
+ mFontSizeId = sFontSizeBtnsMap.get(id);
+ mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ getWorkingText();
+ switchToListMode(mWorkingNote.getContent());
+ } else {
+ mNoteEditor.setTextAppearance(this,
+ TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ }
+ mFontSizeSelector.setVisibility(View.GONE);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+ if(clearSettingState()) {
+ return;
+ }
+
+ saveNote();
+ super.onBackPressed();
+ }
+
+ private boolean clearSettingState() {
+ if (mNoteBgColorSelector.getVisibility() == View.VISIBLE) {
+ mNoteBgColorSelector.setVisibility(View.GONE);
+ return true;
+ } else if (mFontSizeSelector.getVisibility() == View.VISIBLE) {
+ mFontSizeSelector.setVisibility(View.GONE);
+ return true;
+ }
+ return false;
+ }
+
+ public void onBackgroundColorChanged() {
+ findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+ View.VISIBLE);
+ mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
+ mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ if (isFinishing()) {
+ return true;
+ }
+ clearSettingState();
+ menu.clear();
+ if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
+ getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ } else {
+ getMenuInflater().inflate(R.menu.note_edit, menu);
+ }
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_normal_mode);
+ } else {
+ menu.findItem(R.id.menu_list_mode).setTitle(R.string.menu_list_mode);
+ }
+ if (mWorkingNote.hasClockAlert()) {
+ menu.findItem(R.id.menu_alert).setVisible(false);
+ } else {
+ menu.findItem(R.id.menu_delete_remind).setVisible(false);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ /**
+ * 当选中菜单项时的处理方法
+ * 根据菜单项的ID执行相应的操作
+ * 如果是新建笔记菜单项,则调用createNewNote()方法
+ * 如果是删除菜单项,则弹出确认对话框,确认后调用deleteCurrentNote()方法并结束当前活动
+ * 如果是字体大小菜单项,则显示字体大小选择器
+ * 如果是列表模式菜单项,则切换笔记的列表模式
+ * 如果是分享菜单项,则获取当前笔记内容并分享
+ * 如果是发送到桌面菜单项,则发送到桌面
+ * 如果是提醒菜单项,则设置提醒
+ * 如果是删除提醒菜单项,则清除提醒
+ */
+ int itemId = item.getItemId();
+ if (itemId == R.id.menu_new_note) {
+ createNewNote(); //调用创建新的便签的函数
+ } else if (itemId == R.id.menu_delete) {
+ //弹出确认对话框
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_note));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ deleteCurrentNote();//确认后调用删除笔记的函数
+ finish();//结束当前活动
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();
+ } else if (itemId == R.id.menu_font_size) {
+ mFontSizeSelector.setVisibility(View.VISIBLE);//显示字体大小选择器
+ findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);//根据当前字体大小设置选择器状态
+ } else if (itemId == R.id.menu_list_mode) {
+ mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
+ TextNote.MODE_CHECK_LIST : 0);//切换笔记的列表模式
+ } else if (itemId == R.id.menu_share) {
+ getWorkingText();//获取当前笔记内容
+ sendTo(this, mWorkingNote.getContent());//分享笔记内容
+ } else if (itemId == R.id.menu_send_to_desktop) {
+ sendToDesktop();//发送到桌面
+ } else if (itemId == R.id.menu_alert) {
+ setReminder();//设置提醒
+ } else if (itemId == R.id.menu_delete_remind) {
+ mWorkingNote.setAlertDate(0, false);//清除提醒
+ }
+ return true;
+ }
+
+
+ private void setReminder() {
+ DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis());
+ d.setOnDateTimeSetListener(new OnDateTimeSetListener() {
+ public void OnDateTimeSet(AlertDialog dialog, long date) {
+ mWorkingNote.setAlertDate(date , true);
+ }
+ });
+ d.show();
+ }
+
+ /**
+ * Share note to apps that support {@link Intent#ACTION_SEND} action
+ * and {@text/plain} type
+ */
+ private void sendTo(Context context, String info) {
+ Intent intent = new Intent(Intent.ACTION_SEND);
+ intent.putExtra(Intent.EXTRA_TEXT, info);
+ intent.setType("text/plain");
+ context.startActivity(intent);
+ }
+
+ private void createNewNote() {
+ /**
+ * 创建新的笔记
+ * 首先,保存当前正在编辑的笔记
+ * 为了安全起见,启动一个新的NoteEditActivity
+ * 然后结束当前活动
+ * 创建一个新的Intent,并传递相关参数
+ */
+ // Firstly, save current editing notes
+ saveNote();
+
+ // For safety, start a new NoteEditActivity
+ finish();
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId());
+ startActivity(intent);
+ }
+
+ private void deleteCurrentNote() {
+ if (mWorkingNote.existInDatabase()) {
+ HashSet ids = new HashSet();
+ long id = mWorkingNote.getNoteId();
+ if (id != Notes.ID_ROOT_FOLDER) {
+ ids.add(id);
+ } else {
+ Log.d(TAG, "Wrong note id, should not happen");
+ }
+ if (!isSyncMode()) {
+ if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) {
+ Log.e(TAG, "Delete Note error");
+ }
+ } else {
+ if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) {
+ Log.e(TAG, "Move notes to trash folder error, should not happens");
+ }
+ }
+ }
+ mWorkingNote.markDeleted(true);
+ }
+
+ private boolean isSyncMode() {
+ return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
+ }
+
+ public void onClockAlertChanged(long date, boolean set) {
+ /**
+ * User could set clock to an unsaved note, so before setting the
+ * alert clock, we should save the note first
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }
+ if (mWorkingNote.getNoteId() > 0) {
+ Intent intent = new Intent(this, AlarmReceiver.class);
+ intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+ AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
+ showAlertHeader();
+ if(!set) {
+ alarmManager.cancel(pendingIntent);
+ } else {
+ alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent);
+ }
+ } else {
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
+ Log.e(TAG, "Clock alert setting error");
+ showToast(R.string.error_note_empty_for_clock);
+ }
+ }
+
+ public void onWidgetChanged() {
+ updateWidget();
+ }
+
+ public void onEditTextDelete(int index, String text) {
+ int childCount = mEditTextList.getChildCount();
+ if (childCount == 1) {
+ return;
+ }
+
+ for (int i = index + 1; i < childCount; i++) {
+ ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
+ .setIndex(i - 1);
+ }
+
+ mEditTextList.removeViewAt(index);
+ NoteEditText edit = null;
+ if(index == 0) {
+ edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
+ R.id.et_edit_text);
+ } else {
+ edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
+ R.id.et_edit_text);
+ }
+ int length = edit.length();
+ edit.append(text);
+ edit.requestFocus();
+ edit.setSelection(length);
+ }
+
+ public void onEditTextEnter(int index, String text) {
+ /**
+ * Should not happen, check for debug
+ */
+ if(index > mEditTextList.getChildCount()) {
+ Log.e(TAG, "Index out of mEditTextList boundrary, should not happen");
+ }
+
+ View view = getListItem(text, index);
+ mEditTextList.addView(view, index);
+ NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ edit.requestFocus();
+ edit.setSelection(0);
+ for (int i = index + 1; i < mEditTextList.getChildCount(); i++) {
+ ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text))
+ .setIndex(i);
+ }
+ }
+
+ private void switchToListMode(String text) {
+ mEditTextList.removeAllViews();
+ String[] items = text.split("\n");
+ int index = 0;
+ for (String item : items) {
+ if(!TextUtils.isEmpty(item)) {
+ mEditTextList.addView(getListItem(item, index));
+ index++;
+ }
+ }
+ mEditTextList.addView(getListItem("", index));
+ mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus();
+
+ mNoteEditor.setVisibility(View.GONE);
+ mEditTextList.setVisibility(View.VISIBLE);
+ }
+
+ private Spannable getHighlightQueryResult(String fullText, String userQuery) {
+ SpannableString spannable = new SpannableString(fullText == null ? "" : fullText);
+ if (!TextUtils.isEmpty(userQuery)) {
+ mPattern = Pattern.compile(userQuery);
+ Matcher m = mPattern.matcher(fullText);
+ int start = 0;
+ while (m.find(start)) {
+ spannable.setSpan(
+ new BackgroundColorSpan(this.getResources().getColor(
+ R.color.user_query_highlight)), m.start(), m.end(),
+ Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ start = m.end();
+ }
+ }
+ return spannable;
+ }
+
+ private View getListItem(String item, int index) {
+ View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null);
+ final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId));
+ CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item));
+ cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ if (isChecked) {
+ edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+ } else {
+ edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
+ }
+ }
+ });
+
+ if (item.startsWith(TAG_CHECKED)) {
+ cb.setChecked(true);
+ edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
+ item = item.substring(TAG_CHECKED.length(), item.length()).trim();
+ } else if (item.startsWith(TAG_UNCHECKED)) {
+ cb.setChecked(false);
+ edit.setPaintFlags(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG);
+ item = item.substring(TAG_UNCHECKED.length(), item.length()).trim();
+ }
+
+ edit.setOnTextViewChangeListener(this);
+ edit.setIndex(index);
+ edit.setText(getHighlightQueryResult(item, mUserQuery));
+ return view;
+ }
+
+ public void onTextChange(int index, boolean hasText) {
+ if (index >= mEditTextList.getChildCount()) {
+ Log.e(TAG, "Wrong index, should not happen");
+ return;
+ }
+ if(hasText) {
+ mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE);
+ } else {
+ mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE);
+ }
+ }
+
+ public void onCheckListModeChanged(int oldMode, int newMode) {
+ if (newMode == TextNote.MODE_CHECK_LIST) {
+ switchToListMode(mNoteEditor.getText().toString());
+ } else {
+ if (!getWorkingText()) {
+ mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ",
+ ""));
+ }
+ mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery));
+ mEditTextList.setVisibility(View.GONE);
+ mNoteEditor.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private boolean getWorkingText() {
+ boolean hasChecked = false;
+ if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < mEditTextList.getChildCount(); i++) {
+ View view = mEditTextList.getChildAt(i);
+ NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text);
+ if (!TextUtils.isEmpty(edit.getText())) {
+ if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) {
+ sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n");
+ hasChecked = true;
+ } else {
+ sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n");
+ }
+ }
+ }
+ mWorkingNote.setWorkingText(sb.toString());
+ } else {
+ mWorkingNote.setWorkingText(mNoteEditor.getText().toString());
+ }
+ return hasChecked;
+ }
+
+ private boolean saveNote() {
+ getWorkingText();
+ boolean saved = mWorkingNote.saveNote();
+ if (saved) {
+ /**
+ * There are two modes from List view to edit view, open one note,
+ * create/edit a node. Opening node requires to the original
+ * position in the list when back from edit view, while creating a
+ * new node requires to the top of the list. This code
+ * {@link #RESULT_OK} is used to identify the create/edit state
+ */
+ setResult(RESULT_OK);
+ }
+ return saved;
+ }
+
+ private void sendToDesktop() {
+ /**
+ * Before send message to home, we should make sure that current
+ * editing note is exists in databases. So, for new note, firstly
+ * save it
+ */
+ if (!mWorkingNote.existInDatabase()) {
+ saveNote();
+ }
+
+ if (mWorkingNote.getNoteId() > 0) {
+ Intent sender = new Intent();
+ Intent shortcutIntent = new Intent(this, NoteEditActivity.class);
+ shortcutIntent.setAction(Intent.ACTION_VIEW);
+ shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId());
+ sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+ sender.putExtra(Intent.EXTRA_SHORTCUT_NAME,
+ makeShortcutIconTitle(mWorkingNote.getContent()));
+ sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
+ Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app));
+ sender.putExtra("duplicate", true);
+ sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
+ showToast(R.string.info_note_enter_desktop);
+ sendBroadcast(sender);
+ } else {
+ /**
+ * There is the condition that user has input nothing (the note is
+ * not worthy saving), we have no note id, remind the user that he
+ * should input something
+ */
+ Log.e(TAG, "Send to desktop error");
+ showToast(R.string.error_note_empty_for_send_to_desktop);
+ }
+ }
+
+ private String makeShortcutIconTitle(String content) {
+ content = content.replace(TAG_CHECKED, "");
+ content = content.replace(TAG_UNCHECKED, "");
+ return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0,
+ SHORTCUT_ICON_TITLE_MAX_LEN) : content;
+ }
+
+ private void showToast(int resId) {
+ showToast(resId, Toast.LENGTH_SHORT);
+ }
+
+ private void showToast(int resId, int duration) {
+ Toast.makeText(this, resId, duration).show();
+ }
+
+
+}
diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
new file mode 100644
index 0000000..da9e327
--- /dev/null
+++ b/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -0,0 +1,978 @@
+/*
+ * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.micode.notes.ui;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.appwidget.AppWidgetManager;
+import android.content.AsyncQueryHandler;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.ActionMode;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Display;
+import android.view.HapticFeedbackConstants;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnCreateContextMenuListener;
+import android.view.View.OnTouchListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import net.micode.notes.R;
+import net.micode.notes.data.Notes;
+import net.micode.notes.data.Notes.NoteColumns;
+import net.micode.notes.gtask.remote.GTaskSyncService;
+import net.micode.notes.model.WorkingNote;
+import net.micode.notes.tool.BackupUtils;
+import net.micode.notes.tool.DataUtils;
+import net.micode.notes.tool.ResourceParser;
+import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute;
+import net.micode.notes.widget.NoteWidgetProvider_2x;
+import net.micode.notes.widget.NoteWidgetProvider_4x;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashSet;
+
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+ /* 首页背景切换*/
+ private int mode = -1;
+
+ private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
+
+ private static final int FOLDER_LIST_QUERY_TOKEN = 1;
+
+ private static final int MENU_FOLDER_DELETE = 0;
+
+ private static final int MENU_FOLDER_VIEW = 1;
+
+ private static final int MENU_FOLDER_CHANGE_NAME = 2;
+
+ private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
+
+ private enum ListEditState {
+ NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
+ };
+
+ private ListEditState mState;
+
+ private BackgroundQueryHandler mBackgroundQueryHandler;
+
+ private NotesListAdapter mNotesListAdapter;
+
+ private ListView mNotesListView;
+
+ private Button mAddNewNote;
+
+ private boolean mDispatch;
+
+ private int mOriginY;
+
+ private int mDispatchY;
+
+ private TextView mTitleBar;
+
+ private long mCurrentFolderId;
+
+ private ContentResolver mContentResolver;
+
+ private ModeCallback mModeCallBack;
+
+ private static final String TAG = "NotesListActivity";
+
+ public static final int NOTES_LISTVIEW_SCROLL_RATE = 30;
+
+ private NoteItemData mFocusNoteDataItem;
+
+ private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?";
+
+ private static final String ROOT_FOLDER_SELECTION = "(" + NoteColumns.TYPE + "<>"
+ + Notes.TYPE_SYSTEM + " AND " + NoteColumns.PARENT_ID + "=?)" + " OR ("
+ + NoteColumns.ID + "=" + Notes.ID_CALL_RECORD_FOLDER + " AND "
+ + NoteColumns.NOTES_COUNT + ">0)";
+
+ private final static int REQUEST_CODE_OPEN_NODE = 102;
+ private final static int REQUEST_CODE_NEW_NODE = 103;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.note_list);
+ getWindow().setBackgroundDrawableResource(R.drawable.lanyangyang);
+ initResources();
+
+ /**
+ * Insert an introduction when user firstly use this application
+ */
+ setAppInfoFromRawRes();
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (resultCode == RESULT_OK
+ && (requestCode == REQUEST_CODE_OPEN_NODE || requestCode == REQUEST_CODE_NEW_NODE)) {
+ mNotesListAdapter.changeCursor(null);
+ } else {
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+ }
+
+ private void setAppInfoFromRawRes() {
+ SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+ if (!sp.getBoolean(PREFERENCE_ADD_INTRODUCTION, false)) {
+ StringBuilder sb = new StringBuilder();
+ InputStream in = null;
+ try {
+ in = getResources().openRawResource(R.raw.introduction);
+ if (in != null) {
+ InputStreamReader isr = new InputStreamReader(in);
+ BufferedReader br = new BufferedReader(isr);
+ char [] buf = new char[1024];
+ int len = 0;
+ while ((len = br.read(buf)) > 0) {
+ sb.append(buf, 0, len);
+ }
+ } else {
+ Log.e(TAG, "Read introduction file error");
+ return;
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ return;
+ } finally {
+ if(in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+ WorkingNote note = WorkingNote.createEmptyNote(this, Notes.ID_ROOT_FOLDER,
+ AppWidgetManager.INVALID_APPWIDGET_ID, Notes.TYPE_WIDGET_INVALIDE,
+ ResourceParser.RED);
+ note.setWorkingText(sb.toString());
+ if (note.saveNote()) {
+ sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
+ } else {
+ Log.e(TAG, "Save introduction note error");
+ return;
+ }
+ }
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ startAsyncNotesListQuery();
+ }
+
+ private void initResources() {
+ mContentResolver = this.getContentResolver();
+ mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mNotesListView = (ListView) findViewById(R.id.notes_list);
+ mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null),
+ null, false);
+ mNotesListView.setOnItemClickListener(new OnListItemClickListener());
+ mNotesListView.setOnItemLongClickListener(this);
+ mNotesListAdapter = new NotesListAdapter(this);
+ mNotesListView.setAdapter(mNotesListAdapter);
+ mAddNewNote = (Button) findViewById(R.id.btn_new_note);
+ mAddNewNote.setOnClickListener(this);
+ mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
+ mDispatch = false;
+ mDispatchY = 0;
+ mOriginY = 0;
+ mTitleBar = (TextView) findViewById(R.id.tv_title_bar);
+ mState = ListEditState.NOTE_LIST;
+ mModeCallBack = new ModeCallback();
+
+ }
+
+ private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
+ private DropdownMenu mDropDownMenu;
+ private ActionMode mActionMode;
+ private MenuItem mMoveMenu;
+
+ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ getMenuInflater().inflate(R.menu.note_list_options, menu);
+ menu.findItem(R.id.delete).setOnMenuItemClickListener(this);
+ mMoveMenu = menu.findItem(R.id.move);
+ if (mFocusNoteDataItem.getParentId() == Notes.ID_CALL_RECORD_FOLDER
+ || DataUtils.getUserFolderCount(mContentResolver) == 0) {
+ mMoveMenu.setVisible(false);
+ } else {
+ mMoveMenu.setVisible(true);
+ mMoveMenu.setOnMenuItemClickListener(this);
+ }
+ mActionMode = mode;
+ mNotesListAdapter.setChoiceMode(true);
+ mNotesListView.setLongClickable(false);
+ mAddNewNote.setVisibility(View.GONE);
+
+ View customView = LayoutInflater.from(NotesListActivity.this).inflate(
+ R.layout.note_list_dropdown_menu, null);
+ mode.setCustomView(customView);
+ mDropDownMenu = new DropdownMenu(NotesListActivity.this,
+ (Button) customView.findViewById(R.id.selection_menu),
+ R.menu.note_list_dropdown);
+ mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
+ public boolean onMenuItemClick(MenuItem item) {
+ mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
+ updateMenu();
+ return true;
+ }
+
+ });
+ return true;
+ }
+
+ private void updateMenu() {
+ int selectedCount = mNotesListAdapter.getSelectedCount();
+ // Update dropdown menu
+ String format = getResources().getString(R.string.menu_select_title, selectedCount);
+ mDropDownMenu.setTitle(format);
+ MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
+ if (item != null) {
+ if (mNotesListAdapter.isAllSelected()) {
+ item.setChecked(true);
+ item.setTitle(R.string.menu_deselect_all);
+ } else {
+ item.setChecked(false);
+ item.setTitle(R.string.menu_select_all);
+ }
+ }
+ }
+
+ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void onDestroyActionMode(ActionMode mode) {
+ mNotesListAdapter.setChoiceMode(false);
+ mNotesListView.setLongClickable(true);
+ mAddNewNote.setVisibility(View.VISIBLE);
+ onStart();
+ }
+
+ public void finishActionMode() {
+ mActionMode.finish();
+ }
+
+ public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
+ boolean checked) {
+ mNotesListAdapter.setCheckedItem(position, checked);
+ updateMenu();
+ }
+
+ public boolean onMenuItemClick(MenuItem item) {
+ if (mNotesListAdapter.getSelectedCount() == 0) {
+ Toast.makeText(NotesListActivity.this, getString(R.string.menu_select_none),
+ Toast.LENGTH_SHORT).show();
+ return true;
+ }
+
+ int itemId = item.getItemId();
+ if (itemId == R.id.delete) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_notes,
+ mNotesListAdapter.getSelectedCount()));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+ batchDelete();
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();
+ } else if (itemId == R.id.move) {
+ startQueryDestinationFolders();
+ } else {
+ return false;
+ }
+ return true;
+ }
+ }
+
+ private class NewNoteOnTouchListener implements OnTouchListener {
+
+ public boolean onTouch(View v, MotionEvent event) {
+ switch (event.getAction()) {
+ case MotionEvent.ACTION_DOWN: {
+ Display display = getWindowManager().getDefaultDisplay();
+ int screenHeight = display.getHeight();
+ int newNoteViewHeight = mAddNewNote.getHeight();
+ int start = screenHeight - newNoteViewHeight;
+ int eventY = start + (int) event.getY();
+ /**
+ * Minus TitleBar's height
+ */
+ if (mState == ListEditState.SUB_FOLDER) {
+ eventY -= mTitleBar.getHeight();
+ start -= mTitleBar.getHeight();
+ }
+ /**
+ * HACKME:When click the transparent part of "New Note" button, dispatch
+ * the event to the list view behind this button. The transparent part of
+ * "New Note" button could be expressed by formula y=-0.12x+94(Unit:pixel)
+ * and the line top of the button. The coordinate based on left of the "New
+ * Note" button. The 94 represents maximum height of the transparent part.
+ * Notice that, if the background of the button changes, the formula should
+ * also change. This is very bad, just for the UI designer's strong requirement.
+ */
+ if (event.getY() < (event.getX() * (-0.12) + 94)) {
+ View view = mNotesListView.getChildAt(mNotesListView.getChildCount() - 1
+ - mNotesListView.getFooterViewsCount());
+ if (view != null && view.getBottom() > start
+ && (view.getTop() < (start + 94))) {
+ mOriginY = (int) event.getY();
+ mDispatchY = eventY;
+ event.setLocation(event.getX(), mDispatchY);
+ mDispatch = true;
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ }
+ break;
+ }
+ case MotionEvent.ACTION_MOVE: {
+ if (mDispatch) {
+ mDispatchY += (int) event.getY() - mOriginY;
+ event.setLocation(event.getX(), mDispatchY);
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ break;
+ }
+ default: {
+ if (mDispatch) {
+ event.setLocation(event.getX(), mDispatchY);
+ mDispatch = false;
+ return mNotesListView.dispatchTouchEvent(event);
+ }
+ break;
+ }
+ }
+ return false;
+ }
+
+ };
+
+ private void startAsyncNotesListQuery() {
+ String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION
+ : NORMAL_SELECTION;
+ mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
+ Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
+ String.valueOf(mCurrentFolderId)
+ }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
+ }
+
+ private final class BackgroundQueryHandler extends AsyncQueryHandler {
+ public BackgroundQueryHandler(ContentResolver contentResolver) {
+ super(contentResolver);
+ }
+
+ @Override
+ protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+ switch (token) {
+ case FOLDER_NOTE_LIST_QUERY_TOKEN:
+ mNotesListAdapter.changeCursor(cursor);
+ break;
+ case FOLDER_LIST_QUERY_TOKEN:
+ if (cursor != null && cursor.getCount() > 0) {
+ showFolderListMenu(cursor);
+ } else {
+ Log.e(TAG, "Query folder failed");
+ }
+ break;
+ default:
+ return;
+ }
+ }
+ }
+
+ private void showFolderListMenu(Cursor cursor) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(R.string.menu_title_select_folder);
+ final FoldersListAdapter adapter = new FoldersListAdapter(this, cursor);
+ builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+
+ public void onClick(DialogInterface dialog, int which) {
+ DataUtils.batchMoveToFolder(mContentResolver,
+ mNotesListAdapter.getSelectedItemIds(), adapter.getItemId(which));
+ Toast.makeText(
+ NotesListActivity.this,
+ getString(R.string.format_move_notes_to_folder,
+ mNotesListAdapter.getSelectedCount(),
+ adapter.getFolderName(NotesListActivity.this, which)),
+ Toast.LENGTH_SHORT).show();
+ mModeCallBack.finishActionMode();
+ }
+ });
+ builder.show();
+ }
+
+ private void createNewNote() {
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
+ intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mCurrentFolderId);
+ this.startActivityForResult(intent, REQUEST_CODE_NEW_NODE);
+ }
+
+ private void batchDelete() {
+ new AsyncTask>() {
+ protected HashSet doInBackground(Void... unused) {
+ HashSet widgets = mNotesListAdapter.getSelectedWidget();
+ if (!isSyncMode()) {
+ // if not synced, delete notes directly
+ if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter
+ .getSelectedItemIds())) {
+ } else {
+ Log.e(TAG, "Delete notes error, should not happens");
+ }
+ } else {
+ // in sync mode, we'll move the deleted note into the trash
+ // folder
+ if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter
+ .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) {
+ Log.e(TAG, "Move notes to trash folder error, should not happens");
+ }
+ }
+ return widgets;
+ }
+
+ @Override
+ protected void onPostExecute(HashSet widgets) {
+ if (widgets != null) {
+ for (AppWidgetAttribute widget : widgets) {
+ if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {
+ updateWidget(widget.widgetId, widget.widgetType);
+ }
+ }
+ }
+ mModeCallBack.finishActionMode();
+ }
+ }.execute();
+ }
+
+ /**
+ * 删除文件夹
+ *
+ * @param folderId 要删除的文件夹的ID
+ */
+ private void deleteFolder(long folderId) {
+ if (folderId == Notes.ID_ROOT_FOLDER) {// 如果要删除的文件夹ID是根文件夹的ID,记录错误日志并返回
+ Log.e(TAG, "Wrong folder id, should not happen " + folderId);
+ return;
+ }
+
+ HashSet ids = new HashSet();// 创建一个HashSet对象,用于存储要删除的文件夹ID
+ ids.add(folderId);
+ HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver,
+ folderId);// 获取文件夹中的小部件信息
+ if (!isSyncMode()) {
+ // if not synced, delete folder directly
+ DataUtils.batchDeleteNotes(mContentResolver, ids);// 如果未同步,直接删除文件夹
+ } else {
+ // in sync mode, we'll move the deleted folder into the trash folder
+ DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER);// 如果是同步模式,将要删除的文件夹移动到回收站文件夹(上面那句话的翻译)
+ }
+ if (widgets != null) {// 如果文件夹中有小部件
+ for (AppWidgetAttribute widget : widgets) {// 遍历小部件集合
+ if (widget.widgetId != AppWidgetManager.INVALID_APPWIDGET_ID
+ && widget.widgetType != Notes.TYPE_WIDGET_INVALIDE) {// 如果小部件ID有效且小部件类型有效
+ updateWidget(widget.widgetId, widget.widgetType);// 更新小部件
+ }
+ }
+ }
+ }
+
+ private void openNode(NoteItemData data) {
+ Intent intent = new Intent(this, NoteEditActivity.class);
+ intent.setAction(Intent.ACTION_VIEW);
+ intent.putExtra(Intent.EXTRA_UID, data.getId());
+ this.startActivityForResult(intent, REQUEST_CODE_OPEN_NODE);
+ }
+
+ /**
+ * 这段代码是一个用于打开文件夹的方法。它接收一个NoteItemData对象作为参数,该对象包含了文件夹的数据。
+ * 在方法中,首先将当前文件夹ID设置为传入数据的ID,然后开始异步查询该文件夹的笔记列表。
+ * 接着根据文件夹的ID设置不同的状态,如果是通话记录文件夹,则设置状态为通话记录文件夹并隐藏添加新笔记按钮,否则设置状态为子文件夹。
+ * 根据文件夹的ID设置标题栏的文本,如果是通话记录文件夹则设置为通话记录文件夹名称,否则设置为数据的摘要。最后显示标题栏。
+ * @param data
+ */
+ private void openFolder(NoteItemData data) {
+ mCurrentFolderId = data.getId();// 设置当前文件夹ID为传入数据的ID
+ startAsyncNotesListQuery(); // 开始异步笔记列表查询
+ if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {// 如果数据的ID是通话记录文件夹的ID
+ mState = ListEditState.CALL_RECORD_FOLDER;// 设置状态为通话记录文件夹
+ mAddNewNote.setVisibility(View.GONE);// 隐藏添加新笔记按钮
+ } else {
+ mState = ListEditState.SUB_FOLDER;// 设置状态为子文件夹
+ }
+ if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) { // 如果数据的ID是通话记录文件夹的ID
+ mTitleBar.setText(R.string.call_record_folder_name);// 设置标题栏文本为通话记录文件夹名称
+ } else {
+ mTitleBar.setText(data.getSnippet()); // 设置标题栏文本为数据的摘要
+ }
+ mTitleBar.setVisibility(View.VISIBLE);// 显示标题栏
+ }
+
+ public void onClick(View v) {
+ if (v.getId() == R.id.btn_new_note) {
+ createNewNote();
+ }
+ }
+
+ private void showSoftInput() {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (inputMethodManager != null) {
+ inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+ }
+ }
+
+ private void hideSoftInput(View view) {
+ InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+ inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+
+ /**
+ * 这个函数是用来显示创建或修改文件夹的对话框的。
+ * 如果是创建文件夹,则显示空的EditText控件,并设置对话框标题为"创建文件夹";
+ * 如果是修改文件夹名称,则将EditText控件的文本设置为当前笔记的摘要,并设置对话框标题为"修改文件夹名称"。
+ * 对话框中包含"确定"和"取消"按钮,点击"确定"按钮时会隐藏软键盘并获取EditText中的文本,然后检查文件夹名称是否已存在,如果存在则提示用户。
+ * 如果不是创建文件夹且文件夹名称不为空,则更新数据库中的文件夹名称;如果是创建文件夹且文件夹名称不为空,则向数据库中插入文件夹数据。最后关闭对话框。
+ * 同时,根据EditText中的文本是否为空来启用或禁用"确定"按钮。
+ * @param create
+ */
+ private void showCreateOrModifyFolderDialog(final boolean create) {
+ final AlertDialog.Builder builder = new AlertDialog.Builder(this); // 创建一个AlertDialog.Builder对象
+ View view = LayoutInflater.from(this).inflate(R.layout.dialog_edit_text, null); // 从XML布局文件中加载视图
+ final EditText etName = (EditText) view.findViewById(R.id.et_foler_name); // 获取布局文件中的EditText控件
+ showSoftInput(); // 显示软键盘
+ if (!create) { // 判断是否为修改文件夹名称
+ if (mFocusNoteDataItem != null) {
+ etName.setText(mFocusNoteDataItem.getSnippet()); // 将文件夹名称设置为当前笔记的摘要
+ builder.setTitle(getString(R.string.menu_folder_change_name)); // 设置对话框标题为"修改文件夹名称"
+ } else { // 如果长按数据项为空,则记录错误日志并返回
+ Log.e(TAG, "The long click data item is null");
+ return;
+ }
+ } else {
+ etName.setText(""); // 如果为创建文件夹,则将EditText控件的文本设置为空
+ builder.setTitle(this.getString(R.string.menu_create_folder)); // 设置对话框标题为"创建文件夹"
+ }
+
+ builder.setPositiveButton(android.R.string.ok, null); // 设置对话框的"确定"按钮
+ builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { // 设置对话框的"取消"按钮
+ public void onClick(DialogInterface dialog, int which) {
+ hideSoftInput(etName); // 隐藏软键盘
+ }
+ });
+
+ final Dialog dialog = builder.setView(view).show(); // 创建对话框并显示
+ final Button positive = (Button)dialog.findViewById(android.R.id.button1); // 获取对话框中的"确定"按钮
+ positive.setOnClickListener(new OnClickListener() { // 设置"确定"按钮的点击事件
+ public void onClick(View v) {
+ hideSoftInput(etName); // 隐藏软键盘
+ String name = etName.getText().toString(); // 获取EditText中的文本
+ if (DataUtils.checkVisibleFolderName(mContentResolver, name)) {
+ Toast.makeText(NotesListActivity.this, getString(R.string.folder_exist, name), // 检查文件夹名称是否已存在,如果存在则提示用户
+ Toast.LENGTH_LONG).show();
+ etName.setSelection(0, etName.length()); // 选中EditText中的文本
+ return;
+ }
+ if (!create) {// 如果不是创建文件夹
+ if (!TextUtils.isEmpty(name)) {
+ ContentValues values = new ContentValues();// 更新数据库中的文件夹名称
+ values.put(NoteColumns.SNIPPET, name);
+ values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ values.put(NoteColumns.LOCAL_MODIFIED, 1);
+ mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
+ + "=?", new String[] {
+ String.valueOf(mFocusNoteDataItem.getId())
+ });
+ }
+ } else if (!TextUtils.isEmpty(name)) {
+ ContentValues values = new ContentValues();// 向数据库中插入文件夹数据
+ values.put(NoteColumns.SNIPPET, name);
+ values.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
+ mContentResolver.insert(Notes.CONTENT_NOTE_URI, values);
+ }
+ dialog.dismiss();// 关闭对话框
+ }
+ });
+
+ if (TextUtils.isEmpty(etName.getText())) { // 如果EditText中的文本为空,则禁用"确定"按钮
+ positive.setEnabled(false);
+ }
+ /**
+ * When the name edit text is null, disable the positive button
+ */
+ etName.addTextChangedListener(new TextWatcher() {
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ if (TextUtils.isEmpty(etName.getText())) {
+ positive.setEnabled(false);
+ } else {
+ positive.setEnabled(true);
+ }
+ }
+
+ public void afterTextChanged(Editable s) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+ }
+
+ @Override
+ public void onBackPressed() {
+ switch (mState) {
+ case SUB_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ startAsyncNotesListQuery();
+ mTitleBar.setVisibility(View.GONE);
+ break;
+ case CALL_RECORD_FOLDER:
+ mCurrentFolderId = Notes.ID_ROOT_FOLDER;
+ mState = ListEditState.NOTE_LIST;
+ mAddNewNote.setVisibility(View.VISIBLE);
+ mTitleBar.setVisibility(View.GONE);
+ startAsyncNotesListQuery();
+ break;
+ case NOTE_LIST:
+ super.onBackPressed();
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void updateWidget(int appWidgetId, int appWidgetType) {
+ Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+ if (appWidgetType == Notes.TYPE_WIDGET_2X) {
+ intent.setClass(this, NoteWidgetProvider_2x.class);
+ } else if (appWidgetType == Notes.TYPE_WIDGET_4X) {
+ intent.setClass(this, NoteWidgetProvider_4x.class);
+ } else {
+ Log.e(TAG, "Unspported widget type");
+ return;
+ }
+
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
+ appWidgetId
+ });
+
+ sendBroadcast(intent);
+ setResult(RESULT_OK, intent);
+ }
+
+ private final OnCreateContextMenuListener mFolderOnCreateContextMenuListener = new OnCreateContextMenuListener() {
+ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+ if (mFocusNoteDataItem != null) {
+ menu.setHeaderTitle(mFocusNoteDataItem.getSnippet());
+ menu.add(0, MENU_FOLDER_VIEW, 0, R.string.menu_folder_view);
+ menu.add(0, MENU_FOLDER_DELETE, 0, R.string.menu_folder_delete);
+ menu.add(0, MENU_FOLDER_CHANGE_NAME, 0, R.string.menu_folder_change_name);
+ }
+ }
+ };
+
+ @Override
+ public void onContextMenuClosed(Menu menu) {
+ if (mNotesListView != null) {
+ mNotesListView.setOnCreateContextMenuListener(null);
+ }
+ super.onContextMenuClosed(menu);
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ if (mFocusNoteDataItem == null) {
+ Log.e(TAG, "The long click data item is null");
+ return false;
+ }
+ switch (item.getItemId()) {
+ case MENU_FOLDER_VIEW:
+ openFolder(mFocusNoteDataItem);
+ break;
+ case MENU_FOLDER_DELETE:
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(getString(R.string.alert_title_delete));
+ builder.setIcon(android.R.drawable.ic_dialog_alert);
+ builder.setMessage(getString(R.string.alert_message_delete_folder));
+ builder.setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ deleteFolder(mFocusNoteDataItem.getId());
+ }
+ });
+ builder.setNegativeButton(android.R.string.cancel, null);
+ builder.show();
+ break;
+ case MENU_FOLDER_CHANGE_NAME:
+ showCreateOrModifyFolderDialog(false);
+ break;
+ default:
+ break;
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ menu.clear();
+ if (mState == ListEditState.NOTE_LIST) {
+ getMenuInflater().inflate(R.menu.note_list, menu);
+ // set sync or sync_cancel
+ menu.findItem(R.id.menu_sync).setTitle(
+ GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync);
+ } else if (mState == ListEditState.SUB_FOLDER) {
+ getMenuInflater().inflate(R.menu.sub_folder, menu);
+ } else if (mState == ListEditState.CALL_RECORD_FOLDER) {
+ getMenuInflater().inflate(R.menu.call_record_folder, menu);
+ } else {
+ Log.e(TAG, "Wrong state:" + mState);
+ }
+ if (mode == -1) {
+ menu.findItem(R.id.menu_lanyangyang).setVisible(false);
+ } else if (mode == 0) {
+ menu.findItem(R.id.menu_grass).setVisible(false);
+ }else if (mode == 1) {
+ menu.findItem(R.id.menu_playground1).setVisible(false);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int itemId = item.getItemId();
+ if (itemId == R.id.menu_new_folder) {
+ showCreateOrModifyFolderDialog(true);
+ } else if (itemId == R.id.menu_export_text) {
+ exportNoteToText();
+ } else if (itemId == R.id.menu_sync) {
+ if (isSyncMode()) {
+ if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) {
+ GTaskSyncService.startSync(this);
+ } else {
+ GTaskSyncService.cancelSync(this);
+ }
+ } else {
+ startPreferenceActivity();
+ }
+ } else if (itemId == R.id.menu_setting) {
+ startPreferenceActivity();
+ } else if (itemId == R.id.menu_new_note) {
+ createNewNote();
+ } else if (itemId == R.id.menu_search) {
+ onSearchRequested();
+ } else if (itemId == R.id.menu_lanyangyang) {
+ mode = -1;
+ getWindow().setBackgroundDrawableResource(R.drawable.lanyangyang);
+ } else if (itemId == R.id.menu_grass) {
+ mode = 0;
+ getWindow().setBackgroundDrawableResource(R.drawable.grass);
+ } else if (itemId == R.id.menu_playground1) {
+ mode = 1;
+ getWindow().setBackgroundDrawableResource(R.drawable.playground1);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onSearchRequested() {
+ startSearch(null, false, null /* appData */, false);
+ return true;
+ }
+
+ private void exportNoteToText() {
+ final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
+ new AsyncTask() {
+
+ @Override
+ protected Integer doInBackground(Void... unused) {
+ return backup.exportToText();
+ }
+
+ @Override
+ protected void onPostExecute(Integer result) {
+ if (result == BackupUtils.STATE_SD_CARD_UNMOUONTED) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.failed_sdcard_export));
+ builder.setMessage(NotesListActivity.this
+ .getString(R.string.error_sdcard_unmounted));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ } else if (result == BackupUtils.STATE_SUCCESS) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.success_sdcard_export));
+ builder.setMessage(NotesListActivity.this.getString(
+ R.string.format_exported_file_location, backup
+ .getExportedTextFileName(), backup.getExportedTextFileDir()));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ } else if (result == BackupUtils.STATE_SYSTEM_ERROR) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this);
+ builder.setTitle(NotesListActivity.this
+ .getString(R.string.failed_sdcard_export));
+ builder.setMessage(NotesListActivity.this
+ .getString(R.string.error_sdcard_export));
+ builder.setPositiveButton(android.R.string.ok, null);
+ builder.show();
+ }
+ }
+
+ }.execute();
+ }
+
+ private boolean isSyncMode() {
+ return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
+ }
+
+ private void startPreferenceActivity() {
+ Activity from = getParent() != null ? getParent() : this;
+ Intent intent = new Intent(from, NotesPreferenceActivity.class);
+ from.startActivityIfNeeded(intent, -1);
+ }
+
+ private class OnListItemClickListener implements OnItemClickListener {
+
+ public void onItemClick(AdapterView> parent, View view, int position, long id) {
+ if (view instanceof NotesListItem) {
+ NoteItemData item = ((NotesListItem) view).getItemData();
+ if (mNotesListAdapter.isInChoiceMode()) {
+ if (item.getType() == Notes.TYPE_NOTE) {
+ position = position - mNotesListView.getHeaderViewsCount();
+ mModeCallBack.onItemCheckedStateChanged(null, position, id,
+ !mNotesListAdapter.isSelectedItem(position));
+ }
+ return;
+ }
+
+ switch (mState) {
+ case NOTE_LIST:
+ if (item.getType() == Notes.TYPE_FOLDER
+ || item.getType() == Notes.TYPE_SYSTEM) {
+ openFolder(item);
+ } else if (item.getType() == Notes.TYPE_NOTE) {
+ openNode(item);
+ } else {
+ Log.e(TAG, "Wrong note type in NOTE_LIST");
+ }
+ break;
+ case SUB_FOLDER:
+ case CALL_RECORD_FOLDER:
+ if (item.getType() == Notes.TYPE_NOTE) {
+ openNode(item);
+ } else {
+ Log.e(TAG, "Wrong note type in SUB_FOLDER");
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ }
+
+ private void startQueryDestinationFolders() {
+ String selection = NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>? AND " + NoteColumns.ID + "<>?";
+ selection = (mState == ListEditState.NOTE_LIST) ? selection:
+ "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
+
+ mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
+ null,
+ Notes.CONTENT_NOTE_URI,
+ FoldersListAdapter.PROJECTION,
+ selection,
+ new String[] {
+ String.valueOf(Notes.TYPE_FOLDER),
+ String.valueOf(Notes.ID_TRASH_FOLER),
+ String.valueOf(mCurrentFolderId)
+ },
+ NoteColumns.MODIFIED_DATE + " DESC");
+ }
+
+ public boolean onItemLongClick(AdapterView> parent, View view, int position, long id) {
+ if (view instanceof NotesListItem) {
+ mFocusNoteDataItem = ((NotesListItem) view).getItemData();
+ if (mFocusNoteDataItem.getType() == Notes.TYPE_NOTE && !mNotesListAdapter.isInChoiceMode()) {
+ if (mNotesListView.startActionMode(mModeCallBack) != null) {
+ mModeCallBack.onItemCheckedStateChanged(null, position, id, true);
+ mNotesListView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+ } else {
+ Log.e(TAG, "startActionMode fails");
+ }
+ } else if (mFocusNoteDataItem.getType() == Notes.TYPE_FOLDER) {
+ mNotesListView.setOnCreateContextMenuListener(mFolderOnCreateContextMenuListener);
+ }
+ }
+ return false;
+ }
+}
diff --git a/src/Notes-master1/app/src/main/res/layout/note_edit.xml b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
new file mode 100644
index 0000000..b9ab010
--- /dev/null
+++ b/src/Notes-master1/app/src/main/res/layout/note_edit.xml
@@ -0,0 +1,408 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties
new file mode 100644
index 0000000..f19b5b2
--- /dev/null
+++ b/src/Notes-master1/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Jan 04 00:00:26 CST 2024
+sdk.dir=E\:\\androidsdk