diff --git a/.gradle/7.5.1/executionHistory/executionHistory.bin b/.gradle/7.5.1/executionHistory/executionHistory.bin
index 641d5f8..2fb743f 100644
Binary files a/.gradle/7.5.1/executionHistory/executionHistory.bin and b/.gradle/7.5.1/executionHistory/executionHistory.bin differ
diff --git a/.gradle/7.5.1/executionHistory/executionHistory.lock b/.gradle/7.5.1/executionHistory/executionHistory.lock
index 15874a0..1b534f7 100644
Binary files a/.gradle/7.5.1/executionHistory/executionHistory.lock and b/.gradle/7.5.1/executionHistory/executionHistory.lock differ
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.bin b/.gradle/7.5.1/fileHashes/fileHashes.bin
index 5db0c30..319af91 100644
Binary files a/.gradle/7.5.1/fileHashes/fileHashes.bin and b/.gradle/7.5.1/fileHashes/fileHashes.bin differ
diff --git a/.gradle/7.5.1/fileHashes/fileHashes.lock b/.gradle/7.5.1/fileHashes/fileHashes.lock
index 6f72e28..573c52d 100644
Binary files a/.gradle/7.5.1/fileHashes/fileHashes.lock and b/.gradle/7.5.1/fileHashes/fileHashes.lock differ
diff --git a/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/.gradle/7.5.1/fileHashes/resourceHashesCache.bin
index 968e113..384d99e 100644
Binary files a/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index bf47c1d..9d7fe68 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 19e1cd0..c4f6a8c 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 3646959..f799bdd 100644
Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index eaae39c..eaa7557 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..e756a4d
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a9491cb..e678255 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,11 +2,11 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/MiNotes.iml b/.idea/modules/Mi_Note.iml
similarity index 89%
rename from .idea/modules/MiNotes.iml
rename to .idea/modules/Mi_Note.iml
index c37186b..fad68e5 100644
--- a/.idea/modules/MiNotes.iml
+++ b/.idea/modules/Mi_Note.iml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/modules/app/MiNotes.app.androidTest.iml b/.idea/modules/app/Mi_Note.app.androidTest.iml
similarity index 94%
rename from .idea/modules/app/MiNotes.app.androidTest.iml
rename to .idea/modules/app/Mi_Note.app.androidTest.iml
index d489488..9df0f16 100644
--- a/.idea/modules/app/MiNotes.app.androidTest.iml
+++ b/.idea/modules/app/Mi_Note.app.androidTest.iml
@@ -27,7 +27,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/modules/app/MiNotes.app.iml b/.idea/modules/app/Mi_Note.app.iml
similarity index 94%
rename from .idea/modules/app/MiNotes.app.iml
rename to .idea/modules/app/Mi_Note.app.iml
index c90dafb..71c31ac 100644
--- a/.idea/modules/app/MiNotes.app.iml
+++ b/.idea/modules/app/Mi_Note.app.iml
@@ -1,10 +1,10 @@
-
+
-
+
diff --git a/.idea/modules/app/MiNotes.app.main.iml b/.idea/modules/app/Mi_Note.app.main.iml
similarity index 100%
rename from .idea/modules/app/MiNotes.app.main.iml
rename to .idea/modules/app/Mi_Note.app.main.iml
diff --git a/.idea/modules/app/MiNotes.app.unitTest.iml b/.idea/modules/app/Mi_Note.app.unitTest.iml
similarity index 93%
rename from .idea/modules/app/MiNotes.app.unitTest.iml
rename to .idea/modules/app/Mi_Note.app.unitTest.iml
index 0ea8122..1cf9ff7 100644
--- a/.idea/modules/app/MiNotes.app.unitTest.iml
+++ b/.idea/modules/app/Mi_Note.app.unitTest.iml
@@ -22,7 +22,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6c0b863..288b36b 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk
index a5193ec..35d281e 100644
Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_0/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_0/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_0/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_1/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_1/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_1/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_2/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_2/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_2/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_3/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_3/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_3/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_4/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_4/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_4/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_5/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_5/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_5/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_6/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_6/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_6/graph.bin
diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_7/graph.bin
similarity index 100%
rename from app/build/intermediates/desugar_graph/debug/out/currentProject/jar_db193d80be39c274f43597abbbc339fcb8855a07d57433c0ff092f4888be5d06_bucket_7/graph.bin
rename to app/build/intermediates/desugar_graph/debug/out/currentProject/jar_bd99a1ae0852673e8988695ddb3da6e20640566e0b89888b7e1b87755b0b6e4e_bucket_7/graph.bin
diff --git a/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex b/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
index 7d325da..f5c7518 100644
Binary files a/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex and b/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex differ
diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
index 70ea85a..54bb166 100644
Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index a97c3e0..f67c0f8 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,96 +1,96 @@
-#Thu May 11 17:10:02 CST 2023
-net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
-net.micode.notes.app-main-7\:/menu/sub_folder.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
-net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
-net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
-net.micode.notes.app-main-7\:/layout/widget_4x.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
-net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
-net.micode.notes.app-main-7\:/xml/preferences.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
-net.micode.notes.app-main-7\:/menu/call_record_folder.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
-net.micode.notes.app-main-7\:/layout/widget_2x.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
-net.micode.notes.app-main-7\:/layout/add_account_text.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
-net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/settings_header.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
-net.micode.notes.app-main-7\:/menu/note_list.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
-net.micode.notes.app-main-7\:/menu/call_note_edit.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
-net.micode.notes.app-main-7\:/drawable/new_note.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
-net.micode.notes.app-main-7\:/color/primary_text_dark.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
-net.micode.notes.app-main-7\:/layout/datetime_picker.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
-net.micode.notes.app-main-7\:/raw/introduction=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_options.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
-net.micode.notes.app-main-7\:/layout/note_item.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
-net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
-net.micode.notes.app-main-7\:/layout/note_list_footer.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
-net.micode.notes.app-main-7\:/xml/searchable.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
-net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
-net.micode.notes.app-main-7\:/layout/folder_list_item.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
-net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
-net.micode.notes.app-main-7\:/menu/note_edit.xml=F\:\\git\\MiNotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
+#Thu May 11 21:12:25 CST 2023
+net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
+net.micode.notes.app-main-7\:/menu/sub_folder.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
+net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
+net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat
+net.micode.notes.app-main-7\:/layout/widget_4x.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat
+net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat
+net.micode.notes.app-main-7\:/xml/preferences.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat
+net.micode.notes.app-main-7\:/menu/call_record_folder.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
+net.micode.notes.app-main-7\:/layout/widget_2x.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat
+net.micode.notes.app-main-7\:/layout/add_account_text.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/settings_header.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat
+net.micode.notes.app-main-7\:/menu/note_list.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat
+net.micode.notes.app-main-7\:/menu/call_note_edit.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat
+net.micode.notes.app-main-7\:/drawable/new_note.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat
+net.micode.notes.app-main-7\:/color/primary_text_dark.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
+net.micode.notes.app-main-7\:/layout/datetime_picker.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat
+net.micode.notes.app-main-7\:/raw/introduction=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_options.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat
+net.micode.notes.app-main-7\:/layout/note_item.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat
+net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat
+net.micode.notes.app-main-7\:/layout/note_list_footer.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat
+net.micode.notes.app-main-7\:/xml/searchable.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat
+net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat
+net.micode.notes.app-main-7\:/layout/folder_list_item.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat
+net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat
+net.micode.notes.app-main-7\:/menu/note_edit.xml=F\:\\git\\Mi_Note\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat
diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
index 8d7227e..af02337 100644
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
@@ -1,5 +1,5 @@
-
+
- -%s
- --%s
- --%s
@@ -7,11 +7,11 @@
- Messaging
- Email
- #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
+ #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode,can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel
- %1$s result for \"%2$s\"
- %1$s results for \"%2$s\"
-
+
- 短信
- 邮件
- 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
+ 便签便签2x2便签4x4没有关联内容,点击新建便签。访客模式下,便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项,操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在,请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗?已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用,不能操作导出文本时发生错误,请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败,请检查网络和帐号设置同步失败,发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复同步便签请选择google帐号,便签将与该帐号的google task内容同步。正在同步中,不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消
- %1$s 条符合“%2$s”的搜索结果
-
+
- 短信
- 郵件
- 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
+ 便簽便簽2x2便簽4x4沒有關聯內容,點擊新建便簽。訪客模式下,便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項,操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在,請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎?SD卡被佔用,不能操作導出TXT時發生錯誤,請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗,請檢查網絡和帳號設置同步失敗,發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復同步便簽請選擇google帳號,便簽將與該帳號的google task內容同步。正在同步中,不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消
- %1$s 條符合”%2$s“的搜尋結果
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
index 0e7bfc5..9029fc6 100644
--- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
index 04f27ed..2ab4f70 100644
--- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
index e5eb619..3fcfd52 100644
--- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 9dff166..bf45937 100644
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu May 11 17:11:46 CST 2023
+#Thu May 11 21:20:07 CST 2023
path.4=15/classes.dex
path.3=13/classes.dex
path.2=12/classes.dex
@@ -6,17 +6,17 @@ path.1=11/classes.dex
path.6=5/classes.dex
path.5=4/classes.dex
path.0=0/classes.dex
-base.4=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
-base.3=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
-base.2=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
-base.1=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
-base.0=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
+base.4=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\15\\classes.dex
+base.3=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\13\\classes.dex
+base.2=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\12\\classes.dex
+base.1=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\11\\classes.dex
+base.0=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\0\\classes.dex
renamed.3=classes4.dex
renamed.2=classes3.dex
renamed.1=classes2.dex
renamed.0=classes.dex
renamed.6=classes7.dex
renamed.5=classes6.dex
-base.6=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
+base.6=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\5\\classes.dex
renamed.4=classes5.dex
-base.5=F\:\\git\\MiNotes\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
+base.5=F\:\\git\\Mi_Note\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\4\\classes.dex
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class
index 79598f6..8b03984 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class
index 124eb6a..33f0eb4 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class
index e8e0e45..b78bfb6 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class
index c3ee8d8..ded606b 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class
index 4812c99..3aac42d 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class
index 0754ffc..75f58c1 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class
index dc60fe0..c3d6bcc 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class
index 0784dad..f440793 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class
index 75a9a17..1201f2e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class
index 81d6513..ca04e75 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class
index 66c9e6f..3511a99 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class
index 86cabc1..3fbd9a1 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class
index 4ae491d..80fe0d2 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class
index 354ae8e..c4b00da 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class
index 4064ac0..defa317 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class
index 19383ea..180af56 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class
index 29d4cf9..99c2609 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class
index 432dd4e..36d64dd 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class
index d463ab8..8d15f15 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class
index 6e0f050..35b8340 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class
index 93cd34b..9cc998e 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class
index fea6568..822c110 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class
index 1588b99..19c3daa 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class
index d4e78a1..8205271 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class
index e7ac3f6..ee8133a 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class
index 11e437f..4690bda 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class
index df2d946..9c66300 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class
index dbd12f5..69e1058 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class
index 4981765..29858a9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class
index 64f15ff..ade21d3 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class
index 817bf17..5832006 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class
index 77d2608..ed53914 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class
index e8eaf4b..7a89142 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class
index b243892..8b57753 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class
index d2777ec..9e8223d 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class
index 08ab9fa..706aaa5 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class
index ff543cd..f407e26 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class
index 55e7663..71ec8c3 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class
index 5d8717b..422df08 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class
index b58eac3..f369b9f 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class
index 30aebb9..825b549 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class
index 7598ed0..bc8b0e8 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class
index 573ba34..a285fdb 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class
index a1c7178..65ce916 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class
index c01fcae..e97d275 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class
index d7027b9..f4ca2be 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class
index eb4eff7..c59ed91 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class
index 245633b..22a0995 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class
index bcc1f6d..53b9a97 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class
index 3b21f15..87404e0 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ
diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class
index 5361b59..19fdac9 100644
Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ
diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 5065cfc..e54cdfa 100644
--- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -20,255 +20,255 @@
20 android:versionName="0.1" >
21
22 F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
+22-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
23 android:minSdkVersion="21"
-23-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:15-41
+23-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:15-41
24 android:targetSdkVersion="8" />
-24-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
+24-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
25
26
-26-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:26:5-81
-26-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:26:22-78
+26-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:26:5-81
+26-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:26:22-78
27
-27-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:27:5-88
-27-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:27:22-85
+27-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:27:5-88
+27-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:27:22-85
28
-28-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:28:5-67
-28-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:28:22-64
+28-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:28:5-67
+28-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:28:22-64
29
-29-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:29:5-72
-29-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:29:22-69
+29-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:29:5-72
+29-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:29:22-69
30
-30-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:30:5-74
-30-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:30:22-71
+30-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:30:5-74
+30-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:30:22-71
31
-31-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:31:5-80
-31-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:31:22-77
+31-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:31:5-80
+31-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:31:22-77
32
-32-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:32:5-71
-32-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:32:22-68
+32-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:32:5-71
+32-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:32:22-68
33
-33-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:33:5-74
-33-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:33:22-71
+33-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:33:5-74
+33-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:33:22-71
34
-34-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:34:5-81
-34-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:34:22-78
+34-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:34:5-81
+34-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:34:22-78
35
36 F:\git\MiNotes\app\src\main\AndroidManifest.xml:36:5-150:19
+36-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:36:5-150:19
37 android:debuggable="true"
38 android:icon="@drawable/icon_app"
-38-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:37:9-42
+38-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:37:9-42
39 android:label="@string/app_name"
-39-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:38:9-41
+39-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:38:9-41
40 android:testOnly="true" >
41 F:\git\MiNotes\app\src\main\AndroidManifest.xml:39:9-52:20
+41-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:39:9-52:20
42 android:name="net.micode.notes.ui.NotesListActivity"
-42-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:40:13-49
+42-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:40:13-49
43 android:configChanges="keyboardHidden|orientation|screenSize"
-43-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:41:13-74
+43-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:41:13-74
44 android:label="@string/app_name"
-44-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:42:13-45
+44-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:42:13-45
45 android:launchMode="singleTop"
-45-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:43:13-43
+45-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:43:13-43
46 android:theme="@style/NoteTheme"
-46-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:44:13-45
+46-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:44:13-45
47 android:uiOptions="splitActionBarWhenNarrow"
-47-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:45:13-57
+47-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:45:13-57
48 android:windowSoftInputMode="adjustPan" >
-48-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:46:13-52
+48-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:46:13-52
49
-49-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:48:13-51:29
+49-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:48:13-51:29
50
-50-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:49:17-69
-50-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:49:25-66
+50-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:49:17-69
+50-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:49:25-66
51
52
-52-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:50:17-77
-52-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:50:27-74
+52-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:50:17-77
+52-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:50:27-74
53
54
55 F:\git\MiNotes\app\src\main\AndroidManifest.xml:54:9-82:20
+55-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:54:9-82:20
56 android:name="net.micode.notes.ui.NoteEditActivity"
-56-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:55:13-48
+56-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:55:13-48
57 android:configChanges="keyboardHidden|orientation|screenSize"
-57-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:56:13-74
+57-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:56:13-74
58 android:launchMode="singleTop"
-58-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:57:13-43
+58-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:57:13-43
59 android:theme="@style/NoteTheme" >
-59-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:58:13-45
+59-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:58:13-45
60
-60-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:60:13-65:29
-60-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:60:28-49
+60-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:60:13-65:29
+60-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:60:28-49
61
-61-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:61:17-69
-61-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:61:25-66
+61-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:61:17-69
+61-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:61:25-66
62
63
-63-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:17-76
-63-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:27-73
+63-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:17-76
+63-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:27-73
64
65
-65-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:17-78
-65-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:23-75
+65-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:17-78
+65-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:23-75
66
-66-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:17-78
-66-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:23-75
+66-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:17-78
+66-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:23-75
67
68
-68-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:67:13-72:29
+68-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:67:13-72:29
69
-69-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:68:17-79
-69-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:68:25-76
+69-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:68:17-79
+69-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:68:25-76
70
71
-71-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:17-76
-71-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:27-73
+71-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:17-76
+71-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:27-73
72
73
-73-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:17-78
-73-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:23-75
+73-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:17-78
+73-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:23-75
74
-74-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:17-78
-74-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:23-75
+74-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:17-78
+74-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:23-75
75
76
-76-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:74:13-77:29
+76-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:74:13-77:29
77
-77-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:75:17-71
-77-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:75:25-68
+77-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:75:17-71
+77-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:75:25-68
78
79
-79-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:17-76
-79-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:27-73
+79-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:17-76
+79-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:27-73
80
81
82 F:\git\MiNotes\app\src\main\AndroidManifest.xml:79:13-81:54
+82-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:79:13-81:54
83 android:name="android.app.searchable"
-83-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:80:17-54
+83-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:80:17-54
84 android:resource="@xml/searchable" />
-84-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:81:17-51
+84-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:81:17-51
85
86
87 F:\git\MiNotes\app\src\main\AndroidManifest.xml:84:9-87:43
+87-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:84:9-87:43
88 android:name="net.micode.notes.data.NotesProvider"
-88-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:85:13-63
+88-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:85:13-63
89 android:authorities="micode_notes"
-89-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:86:13-47
+89-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:86:13-47
90 android:multiprocess="true" />
-90-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:87:13-40
+90-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:87:13-40
91
92 F:\git\MiNotes\app\src\main\AndroidManifest.xml:89:9-101:20
+92-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:89:9-101:20
93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x"
-93-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:90:13-57
+93-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:90:13-57
94 android:label="@string/app_widget2x2" >
-94-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:91:13-50
+94-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:91:13-50
95
-95-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:92:13-96:29
+95-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:92:13-96:29
96
-96-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:17-84
-96-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:25-81
+96-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:17-84
+96-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:25-81
97
-97-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:17-85
-97-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:25-82
+97-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:17-85
+97-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:25-82
98
-98-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:17-85
-98-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:25-82
+98-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:17-85
+98-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:25-82
99
100
101 F:\git\MiNotes\app\src\main\AndroidManifest.xml:98:13-100:58
+101-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:98:13-100:58
102 android:name="android.appwidget.provider"
-102-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:99:17-58
+102-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:99:17-58
103 android:resource="@xml/widget_2x_info" />
-103-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:100:17-55
+103-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:100:17-55
104
105 F:\git\MiNotes\app\src\main\AndroidManifest.xml:102:9-115:20
+105-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:102:9-115:20
106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x"
-106-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:103:13-57
+106-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:103:13-57
107 android:label="@string/app_widget4x4" >
-107-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:104:13-50
+107-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:104:13-50
108
-108-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:92:13-96:29
+108-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:92:13-96:29
109
-109-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:17-84
-109-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:25-81
+109-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:17-84
+109-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:25-81
110
-110-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:17-85
-110-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:25-82
+110-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:17-85
+110-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:25-82
111
-111-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:17-85
-111-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:25-82
+111-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:17-85
+111-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:25-82
112
113
114 F:\git\MiNotes\app\src\main\AndroidManifest.xml:98:13-100:58
+114-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:98:13-100:58
115 android:name="android.appwidget.provider"
-115-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:99:17-58
+115-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:99:17-58
116 android:resource="@xml/widget_4x_info" />
-116-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:100:17-55
+116-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:100:17-55
117
118
-118-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:117:9-121:20
-118-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:117:19-55
+118-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:117:9-121:20
+118-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:117:19-55
119
-119-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:118:13-120:29
+119-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:118:13-120:29
120
-120-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:119:17-79
-120-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:119:25-76
+120-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:119:17-79
+120-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:119:25-76
121
122
123 F:\git\MiNotes\app\src\main\AndroidManifest.xml:123:9-126:20
+123-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:123:9-126:20
124 android:name="net.micode.notes.ui.AlarmReceiver"
-124-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:124:13-61
+124-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:124:13-61
125 android:process=":remote" >
-125-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:125:13-38
+125-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:125:13-38
126
127
128 F:\git\MiNotes\app\src\main\AndroidManifest.xml:128:9-133:20
+128-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:128:9-133:20
129 android:name="net.micode.notes.ui.AlarmAlertActivity"
-129-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:129:13-50
+129-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:129:13-50
130 android:label="@string/app_name"
-130-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:130:13-45
+130-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:130:13-45
131 android:launchMode="singleInstance"
-131-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:131:13-48
+131-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:131:13-48
132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" >
-132-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:132:13-75
+132-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:132:13-75
133
134 F:\git\MiNotes\app\src\main\AndroidManifest.xml:135:9-140:20
+134-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:135:9-140:20
135 android:name="net.micode.notes.ui.NotesPreferenceActivity"
-135-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:136:13-71
+135-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:136:13-71
136 android:label="@string/preferences_title"
-136-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:137:13-54
+136-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:137:13-54
137 android:launchMode="singleTop"
-137-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:138:13-43
+137-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:138:13-43
138 android:theme="@android:style/Theme.Holo.Light" >
-138-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:139:13-60
+138-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:139:13-60
139
140
141 F:\git\MiNotes\app\src\main\AndroidManifest.xml:142:9-145:19
+141-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:142:9-145:19
142 android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-142-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:143:13-74
+142-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:143:13-74
143 android:exported="false" >
-143-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:144:13-37
+143-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:144:13-37
144
145
146 F:\git\MiNotes\app\src\main\AndroidManifest.xml:147:9-149:52
+146-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:147:9-149:52
147 android:name="android.app.default_searchable"
-147-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:148:13-58
+147-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:148:13-58
148 android:value=".ui.NoteEditActivity" />
-148-->F:\git\MiNotes\app\src\main\AndroidManifest.xml:149:13-49
+148-->F:\git\Mi_Note\app\src\main\AndroidManifest.xml:149:13-49
149
150
151
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
index 08aaaa0..c916037 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
@@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,6 +21,25 @@
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
+ },
+ {
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
}
]
},
@@ -47,7 +47,26 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ }
+ },
+ {
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -64,26 +83,24 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -102,39 +119,22 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\styles.xml",
- "from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\dimens.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
},
"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"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
}
}
]
@@ -143,7 +143,7 @@
"outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -162,7 +162,7 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
index 55c63e1..2bdcab9 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
@@ -4,26 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
- "from": {
- "startLines": "18",
- "startColumns": "4",
- "startOffsets": "712",
- "endLines": "21",
- "endColumns": "19",
- "endOffsets": "817"
- },
- "to": {
- "startLines": "2",
- "startColumns": "4",
- "startOffsets": "105",
- "endLines": "5",
- "endColumns": "19",
- "endOffsets": "210"
- }
- },
- {
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -40,6 +21,25 @@
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
}
+ },
+ {
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
+ "from": {
+ "startLines": "18",
+ "startColumns": "4",
+ "startOffsets": "712",
+ "endLines": "21",
+ "endColumns": "19",
+ "endOffsets": "817"
+ },
+ "to": {
+ "startLines": "2",
+ "startColumns": "4",
+ "startOffsets": "105",
+ "endLines": "5",
+ "endColumns": "19",
+ "endOffsets": "210"
+ }
}
]
}
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
index 9c556a0..09d1110 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
@@ -4,7 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -23,7 +23,7 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": {
"startLines": "18",
"startColumns": "4",
diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
index f9fe53b..91e90e5 100644
--- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
+++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
@@ -4,7 +4,26 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml",
"map": [
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\colors.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\styles.xml",
+ "from": {
+ "startLines": "50,55,64,60,22,26,30,35,40,18,45",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
+ "endLines": "53,58,67,62,25,29,33,38,43,21,48",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
+ },
+ "to": {
+ "startLines": "125,129,133,137,140,144,148,152,156,160,164",
+ "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
+ "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
+ "endLines": "128,132,136,139,143,147,151,155,159,163,167",
+ "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
+ "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
+ }
+ },
+ {
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\colors.xml",
"from": {
"startLines": "18",
"startColumns": "4",
@@ -21,26 +40,24 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\arrays.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\dimens.xml",
"from": {
- "startLines": "19,26",
- "startColumns": "4,4",
- "startOffsets": "739,1047",
- "endLines": "24,29",
- "endColumns": "19,19",
- "endOffsets": "1041,1162"
+ "startLines": "19,20,21,22,18",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "764,816,869,922,712",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "811,864,917,969,759"
},
"to": {
- "startLines": "2,8",
- "startColumns": "4,4",
- "startOffsets": "105,300",
- "endLines": "7,11",
- "endColumns": "19,19",
- "endOffsets": "295,415"
+ "startLines": "13,14,15,16,17",
+ "startColumns": "4,4,4,4,4",
+ "startOffsets": "477,529,582,635,687",
+ "endColumns": "51,52,52,51,51",
+ "endOffsets": "524,577,630,682,734"
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\strings.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\strings.xml",
"from": {
"startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23",
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
@@ -59,39 +76,22 @@
}
},
{
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\styles.xml",
+ "source": "F:\\git\\Mi_Note\\app\\src\\main\\res\\values\\arrays.xml",
"from": {
- "startLines": "50,55,64,60,22,26,30,35,40,18,45",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860",
- "endLines": "53,58,67,62,25,29,33,38,43,21,48",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056"
- },
- "to": {
- "startLines": "125,129,133,137,140,144,148,152,156,160,164",
- "startColumns": "4,4,4,4,4,4,4,4,4,4,4",
- "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051",
- "endLines": "128,132,136,139,143,147,151,155,159,163,167",
- "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
- "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247"
- }
- },
- {
- "source": "F:\\git\\MiNotes\\app\\src\\main\\res\\values\\dimens.xml",
- "from": {
- "startLines": "19,20,21,22,18",
- "startColumns": "4,4,4,4,4",
- "startOffsets": "764,816,869,922,712",
- "endColumns": "51,52,52,51,51",
- "endOffsets": "811,864,917,969,759"
+ "startLines": "19,26",
+ "startColumns": "4,4",
+ "startOffsets": "739,1047",
+ "endLines": "24,29",
+ "endColumns": "19,19",
+ "endOffsets": "1041,1162"
},
"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"
+ "startLines": "2,8",
+ "startColumns": "4,4",
+ "startOffsets": "105,300",
+ "endLines": "7,11",
+ "endColumns": "19,19",
+ "endOffsets": "295,415"
}
}
]
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex
index 93f17cb..0ed37f9 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex
index 54adcf9..72d019c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex
index c6e8fd8..964ee81 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex
index c38244b..8b1f009 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex
index b7482d9..155652f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex
index 2d3dad9..74f295a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex
index 288c6fd..feea3ea 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex
index 4ebe6a1..31621ad 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex
index ac6117e..f89907c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex
index 1fb0182..c126d1a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex
index 1cbdbb2..615e8d4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex
index 6c5293d..beed9d7 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex
index a2bbfeb..8aba576 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex
index c64b75d..fb9eb3d 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex
index d76f231..9281265 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex
index 0d3d400..4ca673a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex
index 33ac2d5..26e21bd 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex
index 5c48404..4f148c0 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex
index 2c6dbb6..965ffd0 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex
index 6f0d01c..99f8383 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex
index 5b91144..2c236da 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex
index feb5c80..7ab69b4 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex
index 6b44eab..2bf2392 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex
index 54e30f8..c06ca5f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex
index 59d7247..52edcf5 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex
index 115709e..a90017a 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex
index 8c202a1..7f0b2a3 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex
index fb8b80e..a96db34 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex
index 76dc737..b179661 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex
index 99d12e8..a120fbd 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex
index 97ed6fa..e398416 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex
index 8d7e1d8..d2503b8 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex
index 4c8920b..b12d5ac 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex
index 9dee3c8..272aee8 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex
index 9fcd0de..184f681 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex
index 768eac9..b99f9a6 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex
index 4a109e9..1525740 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex
index af1955a..35f3888 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex
index dd72238..d6bb19c 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex
index ab39c99..9dd975f 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex
index f69c510..bd9786b 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex
index 3884261..2caf649 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex
index b125b7f..fbac5de 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex
index ea4d3bb..8327a2b 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex
index 303cd9e..5e17358 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex
index 55eeca3..0488300 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex
index 4ff53c2..f6008db 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex
index 2559347..49b02cc 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex
index 1b88930..9d18dbe 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex
index 79b819a..dbdf5fc 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex
index b27ee9b..1f46b09 100644
Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ
diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt
index 0976c8f..17f2b6c 100644
--- a/app/build/intermediates/source_set_path_map/debug/file-map.txt
+++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt
@@ -1,8 +1,8 @@
-net.micode.notes.app-pngs-0 F:\git\MiNotes\app\build\generated\res\pngs\debug
-net.micode.notes.app-resValues-1 F:\git\MiNotes\app\build\generated\res\resValues\debug
-net.micode.notes.app-rs-2 F:\git\MiNotes\app\build\generated\res\rs\debug
-net.micode.notes.app-mergeDebugResources-3 F:\git\MiNotes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
-net.micode.notes.app-mergeDebugResources-4 F:\git\MiNotes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
-net.micode.notes.app-merged_res-5 F:\git\MiNotes\app\build\intermediates\merged_res\debug
-net.micode.notes.app-debug-6 F:\git\MiNotes\app\src\debug\res
-net.micode.notes.app-main-7 F:\git\MiNotes\app\src\main\res
+net.micode.notes.app-pngs-0 F:\git\Mi_Note\app\build\generated\res\pngs\debug
+net.micode.notes.app-resValues-1 F:\git\Mi_Note\app\build\generated\res\resValues\debug
+net.micode.notes.app-rs-2 F:\git\Mi_Note\app\build\generated\res\rs\debug
+net.micode.notes.app-mergeDebugResources-3 F:\git\Mi_Note\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir
+net.micode.notes.app-mergeDebugResources-4 F:\git\Mi_Note\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir
+net.micode.notes.app-merged_res-5 F:\git\Mi_Note\app\build\intermediates\merged_res\debug
+net.micode.notes.app-debug-6 F:\git\Mi_Note\app\src\debug\res
+net.micode.notes.app-main-7 F:\git\Mi_Note\app\src\main\res
diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk
index 28cc3db..e655c05 100644
Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
index 3727471..55b3958 100644
--- a/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,241 +1,241 @@
-- Merging decision tree log ---
manifest
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:1-151:12
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:1-151:12
package
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:20:5-31
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:20:5-31
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
android:versionName
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:22:5-30
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:22:5-30
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
xmlns:tools
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:19:5-51
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:19:5-51
xmlns:android
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:18:11-69
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:18:11-69
android:versionCode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:21:5-28
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:21:5-28
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
uses-sdk
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
-INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
+INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
android:targetSdkVersion
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:5-44
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:5-44
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
android:minSdkVersion
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:24:15-41
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
- INJECTED from F:\git\MiNotes\app\src\main\AndroidManifest.xml
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:24:15-41
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
+ INJECTED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:26:5-81
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:26:5-81
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:26:22-78
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:26:22-78
uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:27:5-88
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:27:5-88
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:27:22-85
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:27:22-85
uses-permission#android.permission.INTERNET
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:28:5-67
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:28:5-67
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:28:22-64
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:28:22-64
uses-permission#android.permission.READ_CONTACTS
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:29:5-72
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:29:5-72
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:29:22-69
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:29:22-69
uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:30:5-74
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:30:5-74
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:30:22-71
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:30:22-71
uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:31:5-80
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:31:5-80
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:31:22-77
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:31:22-77
uses-permission#android.permission.GET_ACCOUNTS
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:32:5-71
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:32:5-71
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:32:22-68
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:32:22-68
uses-permission#android.permission.USE_CREDENTIALS
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:33:5-74
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:33:5-74
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:33:22-71
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:33:22-71
uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:34:5-81
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:34:5-81
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:34:22-78
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:34:22-78
application
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:36:5-150:19
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:36:5-150:19
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:38:9-41
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:38:9-41
android:icon
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:37:9-42
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:37:9-42
activity#net.micode.notes.ui.NotesListActivity
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:39:9-52:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:39:9-52:20
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:42:13-45
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:42:13-45
android:launchMode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:43:13-43
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:43:13-43
android:windowSoftInputMode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:46:13-52
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:46:13-52
android:uiOptions
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:45:13-57
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:45:13-57
android:configChanges
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:41:13-74
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:41:13-74
android:theme
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:44:13-45
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:44:13-45
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:40:13-49
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:40:13-49
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:48:13-51:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:48:13-51:29
action#android.intent.action.MAIN
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:49:17-69
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:49:17-69
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:49:25-66
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:49:25-66
category#android.intent.category.LAUNCHER
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:50:17-77
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:50:17-77
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:50:27-74
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:50:27-74
activity#net.micode.notes.ui.NoteEditActivity
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:54:9-82:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:54:9-82:20
android:launchMode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:57:13-43
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:57:13-43
android:configChanges
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:56:13-74
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:56:13-74
android:theme
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:58:13-45
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:58:13-45
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:55:13-48
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:55: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 F:\git\MiNotes\app\src\main\AndroidManifest.xml:60:13-65:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:60:13-65:29
android:scheme
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:60:28-49
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:60:28-49
tools:ignore
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:60:50-80
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:60:50-80
action#android.intent.action.VIEW
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:61:17-69
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:61:17-69
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:61:25-66
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:61:25-66
category#android.intent.category.DEFAULT
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:17-76
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:17-76
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:62:27-73
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:62:27-73
data
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:17-78
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63:17-78
android:mimeType
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:63:23-75
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:63: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 F:\git\MiNotes\app\src\main\AndroidManifest.xml:67:13-72:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:67:13-72:29
action#android.intent.action.INSERT_OR_EDIT
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:68:17-79
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:68:17-79
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:68:25-76
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:68:25-76
intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:74:13-77:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:74:13-77:29
action#android.intent.action.SEARCH
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:75:17-71
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:75:17-71
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:75:25-68
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:75:25-68
meta-data#android.app.searchable
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:79:13-81:54
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:79:13-81:54
android:resource
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:81:17-51
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:81:17-51
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:80:17-54
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:80:17-54
provider#net.micode.notes.data.NotesProvider
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:84:9-87:43
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:84:9-87:43
android:authorities
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:86:13-47
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:86:13-47
android:multiprocess
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:87:13-40
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:87:13-40
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:85:13-63
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:85:13-63
receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:89:9-101:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:89:9-101:20
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:91:13-50
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:91:13-50
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:90:13-57
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:90: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 F:\git\MiNotes\app\src\main\AndroidManifest.xml:92:13-96:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:92:13-96:29
action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:17-84
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:17-84
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:93:25-81
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:93:25-81
action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:17-85
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:17-85
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:94:25-82
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:94:25-82
action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:17-85
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:17-85
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:95:25-82
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:95:25-82
meta-data#android.appwidget.provider
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:98:13-100:58
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:98:13-100:58
android:resource
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:100:17-55
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:100:17-55
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:99:17-58
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:99:17-58
receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:102:9-115:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:102:9-115:20
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:104:13-50
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:104:13-50
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:103:13-57
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:103:13-57
receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:117:9-121:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:117:9-121:20
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:117:19-55
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:117:19-55
intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:118:13-120:29
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:118:13-120:29
action#android.intent.action.BOOT_COMPLETED
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:119:17-79
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:119:17-79
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:119:25-76
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:119:25-76
receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:123:9-126:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:123:9-126:20
android:process
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:125:13-38
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:125:13-38
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:124:13-61
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:124:13-61
activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:128:9-133:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:128:9-133:20
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:130:13-45
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:130:13-45
android:launchMode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:131:13-48
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:131:13-48
android:theme
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:132:13-75
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:132:13-75
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:129:13-50
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:129:13-50
activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:135:9-140:20
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:135:9-140:20
android:label
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:137:13-54
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:137:13-54
android:launchMode
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:138:13-43
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:138:13-43
android:theme
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:139:13-60
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:139:13-60
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:136:13-71
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:136:13-71
service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:142:9-145:19
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:142:9-145:19
android:exported
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:144:13-37
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:144:13-37
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:143:13-74
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:143:13-74
meta-data#android.app.default_searchable
-ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:147:9-149:52
+ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:147:9-149:52
android:value
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:149:13-49
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:149:13-49
android:name
- ADDED from F:\git\MiNotes\app\src\main\AndroidManifest.xml:148:13-58
+ ADDED from F:\git\Mi_Note\app\src\main\AndroidManifest.xml:148:13-58
diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index b7b49c2..7719ea7 100644
Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
index 85723be..6134124 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
@@ -42,33 +42,47 @@ import java.io.IOException;
public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener {
private long mNoteId;
+ //文本在数据库存储中的ID号
private String mSnippet;
+ //闹钟提示时出现的文本片段
private static final int SNIPPET_PREW_MAX_LEN = 60;
MediaPlayer mPlayer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ //Bundle类型的数据与Map类型的数据相似,都是以key-value的形式存储数据的
+ //onsaveInstanceState方法是用来保存Activity的状态的
+ //能从onCreate的参数savedInsanceState中获得状态数据
requestWindowFeature(Window.FEATURE_NO_TITLE);
+ //界面显示——无标题
final Window win = getWindow();
win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
if (!isScreenOn()) {
win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+ //保持窗体点亮
| WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+ //将窗体点亮
| WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+ //允许窗体点亮时锁屏
| WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR);
+ //在手机锁屏后如果到了闹钟提示时间,点亮屏幕
}
+
Intent intent = getIntent();
try {
mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1));
mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId);
+ //根据ID从数据库中获取标签的内容;
+ //getContentResolver()是实现数据共享,实例存储。
mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0,
SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info)
: mSnippet;
+ //判断标签片段是否达到符合长度
} catch (IllegalArgumentException e) {
e.printStackTrace();
return;
@@ -77,20 +91,25 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
mPlayer = new MediaPlayer();
if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) {
showActionDialog();
+ //弹出对话框
playAlarmSound();
+ //闹钟提示音激发
} else {
finish();
+ //完成闹钟动作
}
}
private boolean isScreenOn() {
+ //判断屏幕是否锁屏,调用系统函数判断,最后返回值是布尔类型
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
return pm.isScreenOn();
}
private void playAlarmSound() {
+ //闹钟提示音激发
Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM);
-
+ //调用系统的铃声管理URI,得到闹钟提示音
int silentModeStreams = Settings.System.getInt(getContentResolver(),
Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
@@ -101,15 +120,22 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
}
try {
mPlayer.setDataSource(this, url);
+ //方法:setDataSource(Context context, Uri uri)
+ //解释:无返回值,设置多媒体数据来源【根据 Uri】
mPlayer.prepare();
+ //准备同步
mPlayer.setLooping(true);
+ //设置是否循环播放
mPlayer.start();
+ //开始播放
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
+ //e.printStackTrace()函数功能是抛出异常, 还将显示出更深的调用信息
+ //System.out.println(e),这个方法打印出异常,并且输出在哪里出现的异常
} catch (IllegalStateException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -121,37 +147,58 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD
private void showActionDialog() {
AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+ //AlertDialog的构造方法全部是Protected的
+ //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。
+ //要创建一个AlertDialog,就要用到AlertDialog.Builder中的create()方法
+ //如这里的dialog就是新建了一个AlertDialog
dialog.setTitle(R.string.app_name);
+ //为对话框设置标题
dialog.setMessage(mSnippet);
+ //为对话框设置内容
dialog.setPositiveButton(R.string.notealert_ok, this);
+ //给对话框添加"Yes"按钮
if (isScreenOn()) {
dialog.setNegativeButton(R.string.notealert_enter, this);
}
+ //对话框添加"No"按钮
dialog.show().setOnDismissListener(this);
}
public void onClick(DialogInterface dialog, int which) {
switch (which) {
+ //用which来选择click后下一步的操作
case DialogInterface.BUTTON_NEGATIVE:
+ //这是取消操作
Intent intent = new Intent(this, NoteEditActivity.class);
+ //实现两个类间的数据传输
intent.setAction(Intent.ACTION_VIEW);
+ //设置动作属性
intent.putExtra(Intent.EXTRA_UID, mNoteId);
+ //实现key-value对
+ //EXTRA_UID为key;mNoteId为键
startActivity(intent);
+ //开始动作
break;
default:
+ //这是确定操作
break;
}
}
public void onDismiss(DialogInterface dialog) {
+ //忽略
stopAlarmSound();
+ //停止闹钟声音
finish();
+ //完成该动作
}
private void stopAlarmSound() {
if (mPlayer != null) {
mPlayer.stop();
+ //停止播放
mPlayer.release();
+ //释放MediaPlayer对象
mPlayer = null;
}
}
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
index f221202..c20a36b 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
@@ -34,18 +34,22 @@ public class AlarmInitReceiver extends BroadcastReceiver {
NoteColumns.ID,
NoteColumns.ALERTED_DATE
};
-
+ //对数据库的操作,调用标签ID和闹钟时间
private static final int COLUMN_ID = 0;
private static final int COLUMN_ALERTED_DATE = 1;
@Override
public void onReceive(Context context, Intent intent) {
long currentDate = System.currentTimeMillis();
+ //System.currentTimeMillis()产生一个当前的毫秒
+ //这个毫秒其实就是自1970年1月1日0时起的毫秒数
Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI,
PROJECTION,
NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE,
new String[] { String.valueOf(currentDate) },
+ //将long变量currentDate转化为字符串
null);
+ //Cursor在这里的作用是通过查找数据库中的标签内容,找到和当前系统时间相等的标签
if (c != null) {
if (c.moveToFirst()) {
@@ -61,5 +65,8 @@ public class AlarmInitReceiver extends BroadcastReceiver {
}
c.close();
}
+ //然而通过网上查找资料发现,对于闹钟机制的启动,通常需要上面的几个步骤
+ //如新建Intent、PendingIntent以及AlarmManager等
+ //这里就是根据数据库里的闹钟时间创建一个闹钟机制
}
}
diff --git a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
index 54e503b..981a59a 100644
--- a/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
@@ -24,7 +24,12 @@ public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
intent.setClass(context, AlarmAlertActivity.class);
+ //启动AlarmAlertActivity
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ //activity要存在于activity的栈中,而非activity的途径启动activity时必然不存在一个activity的栈
+ //所以要新起一个栈装入启动的activity
context.startActivity(intent);
}
}
+//这是实现alarm这个功能最接近用户层的包,基于上面的两个包,
+//作用还需要深究但是对于setClass和addFlags的
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
index 496b0cd..60484bd 100644
--- a/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
@@ -29,7 +29,8 @@ import android.widget.FrameLayout;
import android.widget.NumberPicker;
public class DateTimePicker extends FrameLayout {
-
+ //FrameLayout是布局模板之一
+ //所有的子元素全部在屏幕的右上方
private static final boolean DEFAULT_ENABLE_STATE = true;
private static final int HOURS_IN_HALF_DAY = 12;
@@ -45,13 +46,15 @@ public class DateTimePicker extends FrameLayout {
private static final int MINUT_SPINNER_MAX_VAL = 59;
private static final int AMPM_SPINNER_MIN_VAL = 0;
private static final int AMPM_SPINNER_MAX_VAL = 1;
-
+ //初始化控件
private final NumberPicker mDateSpinner;
private final NumberPicker mHourSpinner;
private final NumberPicker mMinuteSpinner;
private final NumberPicker mAmPmSpinner;
+ //NumberPicker是数字选择器
+ //这里定义的四个变量全部是在设置闹钟时需要选择的变量(如日期、时、分、上午或者下午)
private Calendar mDate;
-
+ //定义了Calendar类型的变量mDate,用于操作时间
private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
private boolean mIsAm;
@@ -72,40 +75,48 @@ public class DateTimePicker extends FrameLayout {
onDateTimeChanged();
}
};
-
+ //OnValueChangeListener,这是时间改变监听器,这里主要是对日期的监听
+ //将现在日期的值传递给mDate;updateDateControl是同步操作
private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() {
+ //这里是对 小时(Hour) 的监听
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
boolean isDateChanged = false;
Calendar cal = Calendar.getInstance();
+ //声明一个Calendar的变量cal,便于后续的操作
if (!mIs24HourView) {
if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
+ //这里是对于12小时制时,晚上11点和12点交替时对日期的更改
} else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
}
+ //这里是对于12小时制时,凌晨11点和12点交替时对日期的更改
if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY ||
oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) {
mIsAm = !mIsAm;
updateAmPmControl();
- }
+ }//这里是对于12小时制时,中午11点和12点交替时对AM和PM的更改
} else {
if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, 1);
isDateChanged = true;
+ //这里是对于24小时制时,晚上11点和12点交替时对日期的更改
} else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) {
cal.setTimeInMillis(mDate.getTimeInMillis());
cal.add(Calendar.DAY_OF_YEAR, -1);
isDateChanged = true;
}
- }
+ }//这里是对于12小时制时,凌晨11点和12点交替时对日期的更改
int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY);
+ //通过数字选择器对newHour的赋值
mDate.set(Calendar.HOUR_OF_DAY, newHour);
+ //通过set函数将新的Hour值传给mDate
onDateTimeChanged();
if (isDateChanged) {
setCurrentYear(cal.get(Calendar.YEAR));
@@ -117,15 +128,19 @@ public class DateTimePicker extends FrameLayout {
private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() {
@Override
+ //这里是对 分钟(Minute)改变的监听
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
int minValue = mMinuteSpinner.getMinValue();
int maxValue = mMinuteSpinner.getMaxValue();
int offset = 0;
+ //设置offset,作为小时改变的一个记录数据
if (oldVal == maxValue && newVal == minValue) {
offset += 1;
} else if (oldVal == minValue && newVal == maxValue) {
offset -= 1;
}
+ //如果原值为59,新值为0,则offset加1
+ //如果原值为0,新值为59,则offset减1
if (offset != 0) {
mDate.add(Calendar.HOUR_OF_DAY, offset);
mHourSpinner.setValue(getCurrentHour());
@@ -145,6 +160,7 @@ public class DateTimePicker extends FrameLayout {
};
private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() {
+ //对AM和PM的监听
@Override
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
mIsAm = !mIsAm;
@@ -165,19 +181,22 @@ public class DateTimePicker extends FrameLayout {
public DateTimePicker(Context context) {
this(context, System.currentTimeMillis());
- }
+ }//通过对数据库的访问,获取当前的系统时间
public DateTimePicker(Context context, long date) {
this(context, date, DateFormat.is24HourFormat(context));
- }
+ }//上面函数的得到的是一个天文数字(1970至今的秒数),需要DateFormat将其变得有意义
public DateTimePicker(Context context, long date, boolean is24HourView) {
super(context);
+ //获取系统时间
mDate = Calendar.getInstance();
mInitialising = true;
mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
inflate(context, R.layout.datetime_picker, this);
-
+ //如果当前Activity里用到别的layout,比如对话框layout
+ //还要设置这个layout上的其他组件的内容,就必须用inflate()方法先将对话框的layout找出来
+ //然后再用findViewById()找到它上面的其它组件
mDateSpinner = (NumberPicker) findViewById(R.id.date);
mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
@@ -226,7 +245,7 @@ public class DateTimePicker extends FrameLayout {
mAmPmSpinner.setEnabled(enabled);
mIsEnabled = enabled;
}
-
+ //下面的各函数主要是对上面代码引用到的各函数功能的实现
@Override
public boolean isEnabled() {
return mIsEnabled;
@@ -239,7 +258,7 @@ public class DateTimePicker extends FrameLayout {
*/
public long getCurrentDateInTimeMillis() {
return mDate.getTimeInMillis();
- }
+ }//实现函数——得到当前的秒数
/**
* Set the current date
@@ -251,7 +270,7 @@ public class DateTimePicker extends FrameLayout {
cal.setTimeInMillis(date);
setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH),
cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
- }
+ }//实现函数功能——设置当前的时间,参数是date
/**
* Set the current date
@@ -269,13 +288,14 @@ public class DateTimePicker extends FrameLayout {
setCurrentDay(dayOfMonth);
setCurrentHour(hourOfDay);
setCurrentMinute(minute);
- }
+ }//实现函数功能——设置当前的时间,参数是各详细的变量
/**
* Get current year
*
* @return The current year
*/
+ //下面是得到year、month、day等值
public int getCurrentYear() {
return mDate.get(Calendar.YEAR);
}
@@ -446,7 +466,7 @@ public class DateTimePicker extends FrameLayout {
mDateSpinner.setDisplayedValues(mDateDisplayValues);
mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2);
mDateSpinner.invalidate();
- }
+ }// 对于星期几的算法
private void updateAmPmControl() {
if (mIs24HourView) {
@@ -455,7 +475,7 @@ public class DateTimePicker extends FrameLayout {
int index = mIsAm ? Calendar.AM : Calendar.PM;
mAmPmSpinner.setValue(index);
mAmPmSpinner.setVisibility(View.VISIBLE);
- }
+ }// 对于上下午操作的算法
}
private void updateHourControl() {
@@ -465,7 +485,7 @@ public class DateTimePicker extends FrameLayout {
} else {
mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW);
mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW);
- }
+ }// 对与小时的算法
}
/**
diff --git a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
index 2c47ba4..824b66a 100644
--- a/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
@@ -32,18 +32,24 @@ import android.text.format.DateUtils;
public class DateTimePickerDialog extends AlertDialog implements OnClickListener {
private Calendar mDate = Calendar.getInstance();
+ //创建一个Calendar类型的变量 mDate,方便时间的操作
private boolean mIs24HourView;
private OnDateTimeSetListener mOnDateTimeSetListener;
+ //声明一个时间日期滚动选择控件 mOnDateTimeSetListener
private DateTimePicker mDateTimePicker;
-
+ //DateTimePicker控件,控件一般用于让用户可以从日期列表中选择单个值。
+ //运行时,单击控件边上的下拉箭头,会显示为两个部分:一个下拉列表,一个用于选择日期的
public interface OnDateTimeSetListener {
void OnDateTimeSet(AlertDialog dialog, long date);
}
public DateTimePickerDialog(Context context, long date) {
+ //对该界面对话框的实例化
super(context);
+ //对数据库的操作
mDateTimePicker = new DateTimePicker(context);
setView(mDateTimePicker);
+ //添加一个子视图
mDateTimePicker.setOnDateTimeChangedListener(new OnDateTimeChangedListener() {
public void onDateTimeChanged(DateTimePicker view, int year, int month,
int dayOfMonth, int hourOfDay, int minute) {
@@ -52,15 +58,20 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
mDate.set(Calendar.HOUR_OF_DAY, hourOfDay);
mDate.set(Calendar.MINUTE, minute);
+ //将视图中的各选项设置为系统当前时间
updateTitle(mDate.getTimeInMillis());
}
});
mDate.setTimeInMillis(date);
+ //得到系统时间
mDate.set(Calendar.SECOND, 0);
+ //将秒数设置为0
mDateTimePicker.setCurrentDate(mDate.getTimeInMillis());
setButton(context.getString(R.string.datetime_dialog_ok), this);
setButton2(context.getString(R.string.datetime_dialog_cancel), (OnClickListener)null);
+ //设置按钮
set24HourView(DateFormat.is24HourFormat(this.getContext()));
+ //时间标准化打印
updateTitle(mDate.getTimeInMillis());
}
@@ -70,7 +81,7 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
mOnDateTimeSetListener = callBack;
- }
+ }//将时间日期滚动选择控件实例化
private void updateTitle(long date) {
int flag =
@@ -79,12 +90,14 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
DateUtils.FORMAT_SHOW_TIME;
flag |= mIs24HourView ? DateUtils.FORMAT_24HOUR : DateUtils.FORMAT_24HOUR;
setTitle(DateUtils.formatDateTime(this.getContext(), date, flag));
- }
+ }//android开发中常见日期管理工具类(API)——DateUtils:按照上下午显示时间
public void onClick(DialogInterface arg0, int arg1) {
if (mOnDateTimeSetListener != null) {
mOnDateTimeSetListener.OnDateTimeSet(this, mDate.getTimeInMillis());
}
}
+ //第一个参数arg0是接收到点击事件的对话框
+ //第二个参数arg1是该对话框上的按钮
}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
index 613dc74..3e7386c 100644
--- a/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
@@ -30,14 +30,18 @@ import net.micode.notes.R;
public class DropdownMenu {
private Button mButton;
private PopupMenu mPopupMenu;
+ //声明一个下拉菜单
private Menu mMenu;
public DropdownMenu(Context context, Button button, int menuId) {
mButton = button;
mButton.setBackgroundResource(R.drawable.dropdown_icon);
+ //设置这个view的背景
mPopupMenu = new PopupMenu(context, mButton);
mMenu = mPopupMenu.getMenu();
mPopupMenu.getMenuInflater().inflate(menuId, mMenu);
+ //MenuInflater是用来实例化Menu目录下的Menu布局文件
+ //根据ID来确认menu的内容选项
mButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
mPopupMenu.show();
@@ -48,14 +52,14 @@ public class DropdownMenu {
public void setOnDropdownMenuItemClickListener(OnMenuItemClickListener listener) {
if (mPopupMenu != null) {
mPopupMenu.setOnMenuItemClickListener(listener);
- }
+ }//设置菜单的监听
}
public MenuItem findItem(int id) {
return mMenu.findItem(id);
- }
+ }//对于菜单选项的初始化,根据索引搜索菜单需要的选项
public void setTitle(CharSequence title) {
mButton.setText(title);
- }
+ }//布局文件,设置标题
}
diff --git a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
index 96b77da..ab83701 100644
--- a/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
@@ -30,10 +30,14 @@ import net.micode.notes.data.Notes.NoteColumns;
public class FoldersListAdapter extends CursorAdapter {
+ //CursorAdapter是Cursor和ListView的接口
+ //FoldersListAdapter继承了CursorAdapter的类
+ //主要作用是便签数据库和用户的交互
+ //这里就是用folder(文件夹)的形式展现给用户
public static final String [] PROJECTION = {
NoteColumns.ID,
NoteColumns.SNIPPET
- };
+ };//调用数据库中便签的ID和片段
public static final int ID_COLUMN = 0;
public static final int NAME_COLUMN = 1;
@@ -41,12 +45,13 @@ public class FoldersListAdapter extends CursorAdapter {
public FoldersListAdapter(Context context, Cursor c) {
super(context, c);
// TODO Auto-generated constructor stub
- }
+ }//数据库操作
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
+ //ViewGroup是容器
return new FolderListItem(context);
- }
+ }//创建一个文件夹,对于各文件夹中子标签的初始化
@Override
public void bindView(View view, Context context, Cursor cursor) {
@@ -55,20 +60,22 @@ public class FoldersListAdapter extends CursorAdapter {
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
((FolderListItem) view).bind(folderName);
}
- }
+ }//将各个布局文件绑定起来
public String getFolderName(Context context, int position) {
Cursor cursor = (Cursor) getItem(position);
return (cursor.getLong(ID_COLUMN) == Notes.ID_ROOT_FOLDER) ? context
.getString(R.string.menu_move_parent_folder) : cursor.getString(NAME_COLUMN);
- }
+ }//根据数据库中标签的ID得到标签的各项内容
private class FolderListItem extends LinearLayout {
private TextView mName;
public FolderListItem(Context context) {
super(context);
+ //操作数据库
inflate(context, R.layout.folder_list_item, this);
+ //根据布局文件的名字等信息将其找出来
mName = (TextView) findViewById(R.id.tv_folder_name);
}
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..db1fc20 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -74,6 +74,8 @@ import java.util.regex.Pattern;
public class NoteEditActivity extends Activity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
+ //该类主要是针对标签的编辑
+ //继承了系统内部许多和监听有关的类
private class HeadViewHolder {
public TextView tvModified;
@@ -83,7 +85,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public ImageView ibSetBgColor;
}
-
+ //使用Map实现数据存储
private static final Map sBgSelectorBtnsMap = new HashMap();
static {
sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW);
@@ -91,6 +93,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
+ //put函数是将指定值和指定键相连
}
private static final Map sBgSelectorSelectionMap = new HashMap();
@@ -100,6 +103,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSizeBtnsMap = new HashMap();
@@ -108,6 +112,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
+ //put函数是将指定值和指定键相连
}
private static final Map sFontSelectorSelectionMap = new HashMap();
@@ -116,6 +121,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
+ //put函数是将指定值和指定键相连
}
private static final String TAG = "NoteEditActivity";
@@ -123,20 +129,23 @@ public class NoteEditActivity extends Activity implements OnClickListener,
private HeadViewHolder mNoteHeaderHolder;
private View mHeadViewPanel;
-
+ //私有化一个界面操作mHeadViewPanel,对表头的操作
private View mNoteBgColorSelector;
-
+ //私有化一个界面操作mNoteBgColorSelector,对背景颜色的操作
private View mFontSizeSelector;
-
+ //私有化一个界面操作mFontSizeSelector,对标签字体的操作
private EditText mNoteEditor;
-
+ //声明编辑控件,对文本操作
private View mNoteEditorPanel;
-
- private WorkingNote mWorkingNote;
-
+ //私有化一个界面操作mNoteEditorPanel,文本编辑的控制板
+ //private WorkingNote mWorkingNote;
+ public WorkingNote mWorkingNote;
+ //对模板WorkingNote的初始化
private SharedPreferences mSharedPrefs;
+ //私有化SharedPreferences的数据存储方式
+ //它的本质是基于XML文件存储key-value键值对数据
private int mFontSizeId;
-
+ //用于操作字体的大小
private static final String PREFERENCE_FONT_SIZE = "pref_font_size";
private static final int SHORTCUT_ICON_TITLE_MAX_LEN = 10;
@@ -145,7 +154,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
public static final String TAG_UNCHECKED = String.valueOf('\u25A1');
private LinearLayout mEditTextList;
-
+ //线性布局
private String mUserQuery;
private Pattern mPattern;
@@ -153,7 +162,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.note_edit);
-
+ //对数据库的访问操作
if (savedInstanceState == null && !initActivityState(getIntent())) {
finish();
return;
@@ -176,7 +185,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
return;
}
Log.d(TAG, "Restoring from killed activity");
- }
+ }//为防止内存不足时程序的终止,在这里有一个保存现场的函数
}
private boolean initActivityState(Intent intent) {
@@ -188,34 +197,42 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) {
long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0);
mUserQuery = "";
-
+ //如果用户实例化标签时,系统并未给出标签ID
/**
* Starting from the searched result
*/
+ //根据键值查找ID
if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) {
noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY));
mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY);
}
-
+ //如果ID在数据库中未找到
if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) {
Intent jump = new Intent(this, NotesListActivity.class);
startActivity(jump);
+ //程序将跳转到上面声明的intent——jump
showToast(R.string.error_note_not_exist);
finish();
return false;
- } else {
+ }
+ //ID在数据库中找到
+ else {
mWorkingNote = WorkingNote.load(this, noteId);
if (mWorkingNote == null) {
Log.e(TAG, "load note failed with note id" + noteId);
+ //打印出红色的错误信息
finish();
return false;
}
}
+ //setSoftInputMode——软键盘输入模式
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
+ // intent.getAction()
+ // 大多用于broadcast发送广播时给机制(intent)设置一个action,就是一个字符串
+ // 用户可以通过receive(接受)intent,通过 getAction得到的字符串,来决定做什么
long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0);
int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID,
AppWidgetManager.INVALID_APPWIDGET_ID);
@@ -223,7 +240,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
Notes.TYPE_WIDGET_INVALIDE);
int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID,
ResourceParser.getDefaultBgId(this));
-
+ // intent.getInt(Long、String)Extra是对各变量的语法分析
// Parse call-record note
String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER);
long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0);
@@ -240,15 +257,17 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
- }
+ }//创建一个新的WorkingNote
getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -269,8 +288,10 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
private void initNoteScreen() {
+ //对界面的初始化操作
mNoteEditor.setTextAppearance(this, TextAppearanceResources
.getTexAppearanceResource(mFontSizeId));
+ //设置外观
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
switchToListMode(mWorkingNote.getContent());
} else {
@@ -294,18 +315,21 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
showAlertHeader();
}
-
+ //设置闹钟的显示
private void showAlertHeader() {
if (mWorkingNote.hasClockAlert()) {
long time = System.currentTimeMillis();
if (time > mWorkingNote.getAlertDate()) {
mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired);
- } else {
+ }
+ //如果系统时间大于了闹钟设置的时间,那么闹钟失效
+ 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);
@@ -329,26 +353,29 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (!mWorkingNote.existInDatabase()) {
saveNote();
}
+ //在创建一个新的标签时,先在数据库中匹配
+ //如果不存在,那么先在数据库中存储
outState.putLong(Intent.EXTRA_UID, mWorkingNote.getNoteId());
Log.d(TAG, "Save working note id: " + mWorkingNote.getNoteId() + " onSaveInstanceState");
}
@Override
+ //MotionEvent是对屏幕触控的传递机制
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);
@@ -357,9 +384,11 @@ public class NoteEditActivity extends Activity implements OnClickListener,
if (ev.getX() < x
|| ev.getX() > (x + view.getWidth())
|| ev.getY() < y
- || ev.getY() > (y + view.getHeight())) {
- return false;
- }
+ || ev.getY() > (y + view.getHeight()))
+ //如果触控的位置超出了给定的范围,返回false
+ {
+ return false;
+ }
return true;
}
@@ -377,13 +406,13 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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);
/**
@@ -405,7 +434,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
clearSettingState();
}
-
+ //和桌面小工具的同步
private void updateWidget() {
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) {
@@ -418,7 +447,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- mWorkingNote.getWidgetId()
+ mWorkingNote.getWidgetId()
});
sendBroadcast(intent);
@@ -450,7 +479,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
mFontSizeSelector.setVisibility(View.GONE);
}
- }
+ }//************************存在问题
@Override
public void onBackPressed() {
@@ -481,6 +510,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ //对选择菜单的准备
public boolean onPrepareOptionsMenu(Menu menu) {
if (isFinishing()) {
return true;
@@ -489,6 +519,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
menu.clear();
if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) {
getMenuInflater().inflate(R.menu.call_note_edit, menu);
+ // MenuInflater是用来实例化Menu目录下的Menu布局文件的
} else {
getMenuInflater().inflate(R.menu.note_edit, menu);
}
@@ -506,45 +537,71 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
@Override
+ /*
+ * 函数功能:动态改变菜单选项内容
+ * 函数实现:如下注释
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ //根据菜单的id来编剧相关项目
case R.id.menu_new_note:
+ //创建一个新的便签
createNewNote();
break;
case R.id.menu_delete:
+ //删除便签
AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ //创建关于删除操作的对话框
builder.setTitle(getString(R.string.alert_title_delete));
+ // 设置标签的标题为alert_title_delete
builder.setIcon(android.R.drawable.ic_dialog_alert);
+ //设置对话框图标
builder.setMessage(getString(R.string.alert_message_delete_note));
+ //设置对话框内容
builder.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
+ //建立按键监听器
public void onClick(DialogInterface dialog, int which) {
+ //点击所触发事件
deleteCurrentNote();
+ // 删除单签便签
finish();
}
});
+ //添加“YES”按钮
builder.setNegativeButton(android.R.string.cancel, null);
+ //添加“NO”的按钮
builder.show();
+ //显示对话框
break;
case R.id.menu_font_size:
+ //字体大小的编辑
mFontSizeSelector.setVisibility(View.VISIBLE);
+ // 将字体选择器置为可见
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
+ // 通过id找到相应的大小
break;
case R.id.menu_list_mode:
+ //选择列表模式
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?
TextNote.MODE_CHECK_LIST : 0);
break;
case R.id.menu_share:
+ //菜单共享
getWorkingText();
sendTo(this, mWorkingNote.getContent());
+ // 用sendto函数将运行文本发送到遍历的本文内
break;
case R.id.menu_send_to_desktop:
+ //发送到桌面
sendToDesktop();
break;
case R.id.menu_alert:
+ //创建提醒器
setReminder();
break;
case R.id.menu_delete_remind:
+ //删除日期提醒
mWorkingNote.setAlertDate(0, false);
break;
default:
@@ -553,111 +610,170 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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链接选项
intent.putExtra(Intent.EXTRA_TEXT, info);
+ //将需要传递的便签信息放入text文件中
intent.setType("text/plain");
+ //编辑连接器的类型
context.startActivity(intent);
+ //在acti中进行链接
}
+ /*
+ * 函数功能:创建一个新的便签
+ * 函数实现:如下注释
+ */
private void createNewNote() {
// 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());
+ //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中
startActivity(intent);
+ //开始activity并链接
}
+ /*
+ * 函数功能:删除当前便签
+ * 函数实现:如下注释
+ */
private void deleteCurrentNote() {
if (mWorkingNote.existInDatabase()) {
+ //假如当前运行的便签内存有数据
HashSet ids = new HashSet();
long id = mWorkingNote.getNoteId();
if (id != Notes.ID_ROOT_FOLDER) {
ids.add(id);
+ //如果不是头文件夹建立一个hash表把便签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);
+ //将这些标签的删除标记置为true
}
+ /*
+ * 函数功能:判断是否为同步模式
+ * 函数实现:直接看NotesPreferenceActivity中同步名称是否为空
+ */
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()));
+ //若有有运行的便签就是建立一个链接器将标签id都存在uri中
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);
}
}
+ /*
+ * 函数功能:Widget发生改变的所触发的事件
+ */
public void onWidgetChanged() {
- updateWidget();
+ updateWidget();//更新Widget
}
+ /*
+ * 函数功能: 删除编辑文本框所触发的事件
+ * 函数实现:如下注释
+ */
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);
+ //通过id把编辑框存在便签编辑框中
}
mEditTextList.removeViewAt(index);
+ //删除特定位置的视图
NoteEditText edit = null;
if(index == 0) {
edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById(
@@ -666,69 +782,101 @@ public class NoteEditActivity extends Activity implements OnClickListener,
edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById(
R.id.et_edit_text);
}
+ //通过id把编辑框存在空的NoteEditText中
int length = edit.length();
edit.append(text);
- edit.requestFocus();
- edit.setSelection(length);
+ edit.requestFocus();//请求优先完成该此 编辑
+ edit.setSelection(length);//定位到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);
+ 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);
+ //建立一个状态机检查Pattern并进行匹配
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) {
@@ -739,12 +887,15 @@ public class NoteEditActivity extends Activity implements OnClickListener,
}
}
});
+ //建立一个打钩框并设置监听器
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();
@@ -753,61 +904,94 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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;
+ //初始化check标记
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
+ // 若模式为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;
+ //扩展字符串为已打钩并把标记置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();
+ //运行 getWorkingText()之后保存
if (saved) {
/**
* There are two modes from List view to edit view, open one note,
@@ -816,11 +1000,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
* new node requires to the top of the list. This code
* {@link #RESULT_OK} is used to identify the create/edit state
*/
+ //如英文注释所说链接RESULT_OK是为了识别保存的2种情况,一是创建后保存,二是修改后保存
setResult(RESULT_OK);
}
return saved;
}
+ /*
+ * 函数功能:将便签发送至桌面
+ * 函数实现:如下注释
+ */
private void sendToDesktop() {
/**
* Before send message to home, we should make sure that current
@@ -829,12 +1018,16 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
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,
@@ -842,9 +1035,12 @@ public class NoteEditActivity extends Activity implements OnClickListener,
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");
+ //设置sneder的行为是发送
showToast(R.string.info_note_enter_desktop);
sendBroadcast(sender);
+ //显示到桌面
} else {
/**
* There is the condition that user has input nothing (the note is
@@ -853,21 +1049,35 @@ public class NoteEditActivity extends Activity implements OnClickListener,
*/
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;
+ //直接设置为content中的内容并返回,有勾选和未勾选2种
}
+ /*
+ * 函数功能:显示提示的视图
+ * 函数实现:根据下标显示对应的提示
+ */
private void showToast(int resId) {
showToast(resId, Toast.LENGTH_SHORT);
}
+ /*
+ * 函数功能:持续显示提示的视图
+ * 函数实现:根据下标和持续的时间(duration)编辑提示视图并显示
+ */
private void showToast(int resId, int duration) {
Toast.makeText(this, resId, duration).show();
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
index 2afe2a8..ccbf2c3 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteEditText.java
@@ -37,6 +37,7 @@ import net.micode.notes.R;
import java.util.HashMap;
import java.util.Map;
+//继承edittext,设置便签设置文本框
public class NoteEditText extends EditText {
private static final String TAG = "NoteEditText";
private int mIndex;
@@ -46,6 +47,7 @@ public class NoteEditText extends EditText {
private static final String SCHEME_HTTP = "http:" ;
private static final String SCHEME_EMAIL = "mailto:" ;
+ ///建立一个字符和整数的hash表,用于链接电话,网站,还有邮箱
private static final Map sSchemaActionResMap = new HashMap();
static {
sSchemaActionResMap.put(SCHEME_TEL, R.string.note_link_tel);
@@ -56,17 +58,20 @@ public class NoteEditText extends EditText {
/**
* Call by the {@link NoteEditActivity} to delete or add edit text
*/
+ //在NoteEditActivity中删除或添加文本的操作,可以看做是一个文本是否被变的标记,英文注释已说明的很清楚
public interface OnTextViewChangeListener {
/**
* Delete current edit text when {@link KeyEvent#KEYCODE_DEL} happens
* and the text is null
*/
+ //处理删除按键时的操作
void onEditTextDelete(int index, String text);
/**
* Add edit text after current edit text when {@link KeyEvent#KEYCODE_ENTER}
* happen
*/
+ //处理进入按键时的操作
void onEditTextEnter(int index, String text);
/**
@@ -77,33 +82,43 @@ public class NoteEditText extends EditText {
private OnTextViewChangeListener mOnTextViewChangeListener;
+ //根据context设置文本
public NoteEditText(Context context) {
- super(context, null);
+ super(context, null);//用super引用父类变量
mIndex = 0;
}
+ //设置当前光标
public void setIndex(int index) {
mIndex = index;
}
+ //初始化文本修改标记
public void setOnTextViewChangeListener(OnTextViewChangeListener listener) {
mOnTextViewChangeListener = listener;
}
- public NoteEditText(Context context, AttributeSet attrs) {
+ //AttributeSet 百度了一下是自定义空控件属性,用于维护便签动态变化的属性
+ //初始化便签
+ public NoteEditText(Context context, AttributeSet attrs) {
super(context, attrs, android.R.attr.editTextStyle);
}
+ // 根据defstyle自动初始化
public NoteEditText(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
- // TODO Auto-generated constructor stub
+ // TODO Auto-generated construct or stub
}
@Override
+ //view里的函数,处理手机屏幕的所有事件
+ /*参数event为手机屏幕触摸事件封装类的对象,其中封装了该事件的所有信息,
+ 例如触摸的位置、触摸的类型以及触摸的时间等。该对象会在用户触摸手机屏幕时被创建。*/
public boolean onTouchEvent(MotionEvent event) {
switch (event.getAction()) {
+ //重写了需要处理屏幕被按下的事件
case MotionEvent.ACTION_DOWN:
-
+ //跟新当前坐标值
int x = (int) event.getX();
int y = (int) event.getY();
x -= getTotalPaddingLeft();
@@ -111,9 +126,12 @@ public class NoteEditText extends EditText {
x += getScrollX();
y += getScrollY();
+ //用布局控件layout根据x,y的新值设置新的位置
Layout layout = getLayout();
int line = layout.getLineForVertical(y);
int off = layout.getOffsetForHorizontal(line, x);
+
+ //更新光标新的位置
Selection.setSelection(getText(), off);
break;
}
@@ -122,96 +140,147 @@ public class NoteEditText extends EditText {
}
@Override
+ /*
+ * 函数功能:处理用户按下一个键盘按键时会触发 的事件
+ * 实现过程:如下注释
+ */
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
+ //根据按键的 Unicode 编码值来处理
case KeyEvent.KEYCODE_ENTER:
+ //“进入”按键
if (mOnTextViewChangeListener != null) {
return false;
}
break;
case KeyEvent.KEYCODE_DEL:
+ //“删除”按键
mSelectionStartBeforeDelete = getSelectionStart();
break;
default:
break;
}
+ //继续执行父类的其他点击事件
return super.onKeyDown(keyCode, event);
}
@Override
+ /*
+ * 函数功能:处理用户松开一个键盘按键时会触发 的事件
+ * 实现方式:如下注释
+ */
public boolean onKeyUp(int keyCode, KeyEvent event) {
switch(keyCode) {
+ //根据按键的 Unicode 编码值来处理,有删除和进入2种操作
case KeyEvent.KEYCODE_DEL:
if (mOnTextViewChangeListener != null) {
+ //若是被修改过
if (0 == mSelectionStartBeforeDelete && mIndex != 0) {
+ //若之前有被修改并且文档不为空
mOnTextViewChangeListener.onEditTextDelete(mIndex, getText().toString());
+ //利用上文OnTextViewChangeListener对KEYCODE_DEL按键情况的删除函数进行删除
return true;
}
} else {
Log.d(TAG, "OnTextViewChangeListener was not seted");
+ //其他情况报错,文档的改动监听器并没有建立
}
break;
case KeyEvent.KEYCODE_ENTER:
+ //同上也是分为监听器是否建立2种情况
if (mOnTextViewChangeListener != null) {
int selectionStart = getSelectionStart();
+ //获取当前位置
String text = getText().subSequence(selectionStart, length()).toString();
+ //获取当前文本
setText(getText().subSequence(0, selectionStart));
+ //根据获取的文本设置当前文本
mOnTextViewChangeListener.onEditTextEnter(mIndex + 1, text);
+ //当{@link KeyEvent#KEYCODE_ENTER}添加新文本
} else {
Log.d(TAG, "OnTextViewChangeListener was not seted");
+ //其他情况报错,文档的改动监听器并没有建立
}
break;
default:
break;
}
+ //继续执行父类的其他按键弹起的事件
return super.onKeyUp(keyCode, event);
}
@Override
+ /*
+ * 函数功能:当焦点发生变化时,会自动调用该方法来处理焦点改变的事件
+ * 实现方式:如下注释
+ * 参数:focused表示触发该事件的View是否获得了焦点,当该控件获得焦点时,Focused等于true,否则等于false。
+ direction表示焦点移动的方向,用数值表示
+ Rect:表示在触发事件的View的坐标系中,前一个获得焦点的矩形区域,即表示焦点是从哪里来的。如果不可用则为null
+ */
protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
if (mOnTextViewChangeListener != null) {
+ //若监听器已经建立
if (!focused && TextUtils.isEmpty(getText())) {
+ //获取到焦点并且文本不为空
mOnTextViewChangeListener.onTextChange(mIndex, false);
+ //mOnTextViewChangeListener子函数,置false隐藏事件选项
} else {
mOnTextViewChangeListener.onTextChange(mIndex, true);
+ //mOnTextViewChangeListener子函数,置true显示事件选项
}
}
+ //继续执行父类的其他焦点变化的事件
super.onFocusChanged(focused, direction, previouslyFocusedRect);
}
@Override
+ /*
+ * 函数功能:生成上下文菜单
+ * 函数实现:如下注释
+ */
protected void onCreateContextMenu(ContextMenu menu) {
if (getText() instanceof Spanned) {
+ //有文本存在
int selStart = getSelectionStart();
int selEnd = getSelectionEnd();
+ //获取文本开始和结尾位置
int min = Math.min(selStart, selEnd);
int max = Math.max(selStart, selEnd);
+ //获取开始到结尾的最大值和最小值
final URLSpan[] urls = ((Spanned) getText()).getSpans(min, max, URLSpan.class);
+ //设置url的信息的范围值
if (urls.length == 1) {
int defaultResId = 0;
for(String schema: sSchemaActionResMap.keySet()) {
+ //获取计划表中所有的key值
if(urls[0].getURL().indexOf(schema) >= 0) {
+ //若url可以添加则在添加后将defaultResId置为key所映射的值
defaultResId = sSchemaActionResMap.get(schema);
break;
}
}
if (defaultResId == 0) {
+ //defaultResId == 0则说明url并没有添加任何东西,所以置为连接其他SchemaActionResMap的值
defaultResId = R.string.note_link_other;
}
+ //建立菜单
menu.add(0, 0, 0, defaultResId).setOnMenuItemClickListener(
new OnMenuItemClickListener() {
+ //新建按键监听器
public boolean onMenuItemClick(MenuItem item) {
// goto a new intent
urls[0].onClick(NoteEditText.this);
+ //根据相应的文本设置菜单的按键
return true;
}
});
}
}
+ //继续执行父类的其他菜单创建的事件
super.onCreateContextMenu(menu);
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
index 0f5a878..2a48593 100644
--- a/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/app/src/main/java/net/micode/notes/ui/NoteItemData.java
@@ -28,20 +28,20 @@ import net.micode.notes.tool.DataUtils;
public class NoteItemData {
static final String [] PROJECTION = new String [] {
- NoteColumns.ID,
- NoteColumns.ALERTED_DATE,
- NoteColumns.BG_COLOR_ID,
- NoteColumns.CREATED_DATE,
- NoteColumns.HAS_ATTACHMENT,
- NoteColumns.MODIFIED_DATE,
- NoteColumns.NOTES_COUNT,
- NoteColumns.PARENT_ID,
- NoteColumns.SNIPPET,
- NoteColumns.TYPE,
- NoteColumns.WIDGET_ID,
- NoteColumns.WIDGET_TYPE,
+ NoteColumns.ID,
+ NoteColumns.ALERTED_DATE,
+ NoteColumns.BG_COLOR_ID,
+ NoteColumns.CREATED_DATE,
+ NoteColumns.HAS_ATTACHMENT,
+ NoteColumns.MODIFIED_DATE,
+ NoteColumns.NOTES_COUNT,
+ NoteColumns.PARENT_ID,
+ NoteColumns.SNIPPET,
+ NoteColumns.TYPE,
+ NoteColumns.WIDGET_ID,
+ NoteColumns.WIDGET_TYPE,
};
-
+ //常量标记和数据就不一一标记了,意义翻译基本就知道
private static final int ID_COLUMN = 0;
private static final int ALERTED_DATE_COLUMN = 1;
private static final int BG_COLOR_ID_COLUMN = 2;
@@ -75,8 +75,9 @@ public class NoteItemData {
private boolean mIsOnlyOneItem;
private boolean mIsOneNoteFollowingFolder;
private boolean mIsMultiNotesFollowingFolder;
-
- public NoteItemData(Context context, Cursor cursor) {
+ //初始化NoteItemData,主要利用光标cursor获取的东西
+ public NoteItemData(Context context, Cursor cursor) {
+ //getxxx为转换格式
mId = cursor.getLong(ID_COLUMN);
mAlertDate = cursor.getLong(ALERTED_DATE_COLUMN);
mBgColorId = cursor.getInt(BG_COLOR_ID_COLUMN);
@@ -92,10 +93,11 @@ public class NoteItemData {
mWidgetId = cursor.getInt(WIDGET_ID_COLUMN);
mWidgetType = cursor.getInt(WIDGET_TYPE_COLUMN);
+ //初始化电话号码的信息
mPhoneNumber = "";
if (mParentId == Notes.ID_CALL_RECORD_FOLDER) {
mPhoneNumber = DataUtils.getCallNumberByNoteId(context.getContentResolver(), mId);
- if (!TextUtils.isEmpty(mPhoneNumber)) {
+ if (!TextUtils.isEmpty(mPhoneNumber)) {//mphonenumber里有符合字符串,则用contart功能连接
mName = Contact.getContact(context, mPhoneNumber);
if (mName == null) {
mName = mPhoneNumber;
@@ -108,32 +110,35 @@ public class NoteItemData {
}
checkPostion(cursor);
}
-
+ ///根据鼠标的位置设置标记,和位置
private void checkPostion(Cursor cursor) {
+ //初始化几个标记,cursor具体功能笔记中已提到,不一一叙述
mIsLastItem = cursor.isLast() ? true : false;
mIsFirstItem = cursor.isFirst() ? true : false;
mIsOnlyOneItem = (cursor.getCount() == 1);
+ //初始化“多重子文件”“单一子文件”2个标记
mIsMultiNotesFollowingFolder = false;
mIsOneNoteFollowingFolder = false;
- if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {
+ //主要是设置上诉2标记
+ if (mType == Notes.TYPE_NOTE && !mIsFirstItem) {//若是note格式并且不是第一个元素
int position = cursor.getPosition();
- if (cursor.moveToPrevious()) {
+ if (cursor.moveToPrevious()) {//获取光标位置后看上一行
if (cursor.getInt(TYPE_COLUMN) == Notes.TYPE_FOLDER
- || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {
+ || cursor.getInt(TYPE_COLUMN) == Notes.TYPE_SYSTEM) {//若光标满足系统或note格式
if (cursor.getCount() > (position + 1)) {
- mIsMultiNotesFollowingFolder = true;
+ mIsMultiNotesFollowingFolder = true;//若是数据行数大于但前位置+1则设置成正确
} else {
- mIsOneNoteFollowingFolder = true;
+ mIsOneNoteFollowingFolder = true;//否则单一文件夹标记为true
}
}
- if (!cursor.moveToNext()) {
+ if (!cursor.moveToNext()) {//若不能再往下走则报错
throw new IllegalStateException("cursor move to previous but can't move back");
}
}
}
}
-
+ ///以下都是获取标记没什么好说的,不过倒数第二个需要说明下,很具体看下面
public boolean isOneFollowingFolder() {
return mIsOneNoteFollowingFolder;
}
@@ -214,6 +219,7 @@ public class NoteItemData {
return (mAlertDate > 0);
}
+ //若数据父id为保存至文件夹模式的id且满足电话号码单元不为空,则isCallRecord为true
public boolean isCallRecord() {
return (mParentId == Notes.ID_CALL_RECORD_FOLDER && !TextUtils.isEmpty(mPhoneNumber));
}
@@ -221,4 +227,4 @@ public class NoteItemData {
public static int getNoteType(Cursor cursor) {
return cursor.getInt(TYPE_COLUMN);
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..f3b6e82 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -78,7 +78,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.HashSet;
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { //娌℃湁鐢ㄧ壒瀹氱殑鏍囩鍔犳敞閲娿€傘€傘€傛劅瑙夋病鏈変粈涔堢敤
private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
private static final int FOLDER_LIST_QUERY_TOKEN = 1;
@@ -89,7 +89,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private static final int MENU_FOLDER_CHANGE_NAME = 2;
- private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction";
+ private static final String PREFERENCE_ADD_INTRODUCTION = "net.micode.notes.introduction"; //鍗曡瓒呰繃80涓瓧绗�
private enum ListEditState {
NOTE_LIST, SUB_FOLDER, CALL_RECORD_FOLDER
@@ -136,8 +136,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
private final static int REQUEST_CODE_NEW_NODE = 103;
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ // 鍒涘缓绫�
+ protected void onCreate(final Bundle savedInstanceState) { //闇€瑕佹槸final绫诲瀷 鏍规嵁绋嬪簭涓婁笅鏂囩幆澧冿紝Java鍏抽敭瀛梖inal鏈夆€滆繖鏄棤娉曟敼鍙樼殑鈥濇垨鑰呪€滅粓鎬佺殑鈥濆惈涔夛紝瀹冨彲浠ヤ慨楗伴潪鎶借薄绫汇€侀潪鎶借薄绫绘垚鍛樻柟娉曞拰鍙橀噺銆備綘鍙兘鍑轰簬涓ょ鐞嗚В鑰岄渶瑕侀樆姝㈡敼鍙橈細璁捐鎴栨晥鐜囥€�
+ // final绫讳笉鑳借缁ф壙锛屾病鏈夊瓙绫伙紝final绫讳腑鐨勬柟娉曢粯璁ゆ槸final鐨勩€�
+ //final鏂规硶涓嶈兘琚瓙绫荤殑鏂规硶瑕嗙洊锛屼絾鍙互琚户鎵裤€�
+ //final鎴愬憳鍙橀噺琛ㄧず甯搁噺锛屽彧鑳借璧嬪€间竴娆★紝璧嬪€煎悗鍊间笉鍐嶆敼鍙樸€�
+ //final涓嶈兘鐢ㄤ簬淇グ鏋勯€犳柟娉曘€�
+ super.onCreate(savedInstanceState); // 璋冪敤鐖剁被鐨刼nCreate鍑芥暟
setContentView(R.layout.note_list);
initResources();
@@ -148,26 +153,32 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
@Override
+ // 杩斿洖涓€浜涘瓙妯″潡瀹屾垚鐨勬暟鎹氦缁欎富Activity澶勭悊
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);
+ // 璋冪敤 Activity 鐨刼nActivityResult锛堬級
}
}
private void setAppInfoFromRawRes() {
+ // Android骞冲彴缁欐垜浠彁渚涗簡涓€涓猄haredPreferences绫伙紝瀹冩槸涓€涓交閲忕骇鐨勫瓨鍌ㄧ被锛岀壒鍒€傚悎鐢ㄤ簬淇濆瓨杞欢閰嶇疆鍙傛暟銆�
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);
+ // 鎶婅祫婧愭枃浠舵斁鍒板簲鐢ㄧ▼搴忕殑/raw/raw涓嬶紝閭d箞灏卞彲浠ュ湪搴旂敤涓娇鐢╣etResources鑾峰彇璧勬簮鍚�,
+ // 浠penRawResource鏂规硶锛堜笉甯﹀悗缂€鐨勮祫婧愭枃浠跺悕锛夋墦寮€杩欎釜鏂囦欢銆�
+ in = getResources().openRawResource(R.raw.introduction);
if (in != null) {
InputStreamReader isr = new InputStreamReader(in);
BufferedReader br = new BufferedReader(isr);
- char [] buf = new char[1024];
+ char [] buf = new char[1024]; // 鑷瀹氫箟鐨勬暟鍊硷紝浣跨敤鑰呬笉鐭ラ亾鏈変粈涔堟剰涔�
int len = 0;
while ((len = br.read(buf)) > 0) {
sb.append(buf, 0, len);
@@ -180,7 +191,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
e.printStackTrace();
return;
} finally {
- if(in != null) {
+ if (in != null) {
try {
in.close();
} catch (IOException e) {
@@ -190,11 +201,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
}
+ // 鍒涘缓绌虹殑WorkingNote
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()) {
+ // 鏇存柊淇濆瓨note鐨勪俊鎭�
sp.edit().putBoolean(PREFERENCE_ADD_INTRODUCTION, true).commit();
} else {
Log.e(TAG, "Save introduction note error");
@@ -209,18 +222,21 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
startAsyncNotesListQuery();
}
+ // 鍒濆鍖栬祫婧�
private void initResources() {
- mContentResolver = this.getContentResolver();
+ mContentResolver = this.getContentResolver(); // 鑾峰彇搴旂敤绋嬪簭鐨勬暟鎹紝寰楀埌绫讳技鏁版嵁琛ㄧ殑涓滆タ
mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver());
mCurrentFolderId = Notes.ID_ROOT_FOLDER;
- mNotesListView = (ListView) findViewById(R.id.notes_list);
+
+ // findViewById 鏄畨鍗撶紪绋嬬殑瀹氫綅鍑芥暟锛屼富瑕佹槸寮曠敤.R鏂囦欢閲岀殑寮曠敤鍚�
+ mNotesListView = (ListView) findViewById(R.id.notes_list); // 缁戝畾XML涓殑ListView锛屼綔涓篒tem鐨勫鍣�
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 = (Button) findViewById(R.id.btn_new_note);// 鍦╝ctivity涓鑾峰彇璇ユ寜閽�
mAddNewNote.setOnClickListener(this);
mAddNewNote.setOnTouchListener(new NewNoteOnTouchListener());
mDispatch = false;
@@ -231,6 +247,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
mModeCallBack = new ModeCallback();
}
+ // 缁ф壙鑷狶istView.MultiChoiceModeListener 鍜� OnMenuItemClickListener
private class ModeCallback implements ListView.MultiChoiceModeListener, OnMenuItemClickListener {
private DropdownMenu mDropDownMenu;
private ActionMode mActionMode;
@@ -259,7 +276,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
(Button) customView.findViewById(R.id.selection_menu),
R.menu.note_list_dropdown);
mDropDownMenu.setOnDropdownMenuItemClickListener(new PopupMenu.OnMenuItemClickListener(){
- public boolean onMenuItemClick(MenuItem item) {
+ public boolean onMenuItemClick(final MenuItem item) {
mNotesListAdapter.selectAll(!mNotesListAdapter.isAllSelected());
updateMenu();
return true;
@@ -269,11 +286,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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);
+ mDropDownMenu.setTitle(format); // 鏇存敼鏍囬
MenuItem item = mDropDownMenu.findItem(R.id.action_select_all);
if (item != null) {
if (mNotesListAdapter.isAllSelected()) {
@@ -307,7 +325,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
public void onItemCheckedStateChanged(ActionMode mode, int position, long id,
- boolean checked) {
+ boolean checked) {
mNotesListAdapter.setCheckedItem(position, checked);
updateMenu();
}
@@ -325,14 +343,14 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
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()));
+ mNotesListAdapter.getSelectedCount()));
builder.setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog,
- int which) {
- batchDelete();
- }
- });
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog,
+ int which) {
+ batchDelete();
+ }
+ });
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
break;
@@ -366,7 +384,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
/**
* 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)
+ * "New Note" button could be expressed by formula y=-0.12x+94閿涘湶nit: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
@@ -413,7 +431,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
: NORMAL_SELECTION;
mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null,
Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] {
- String.valueOf(mCurrentFolderId)
+ String.valueOf(mCurrentFolderId)
}, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC");
}
@@ -624,7 +642,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
values.put(NoteColumns.LOCAL_MODIFIED, 1);
mContentResolver.update(Notes.CONTENT_NOTE_URI, values, NoteColumns.ID
+ "=?", new String[] {
- String.valueOf(mFocusNoteDataItem.getId())
+ String.valueOf(mFocusNoteDataItem.getId())
});
}
} else if (!TextUtils.isEmpty(name)) {
@@ -664,30 +682,38 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
});
}
+ /* (non-Javadoc)
+ * @see android.app.Activity#onBackPressed()
+ * 鎸夎繑鍥為敭鏃舵牴鎹儏鍐垫洿鏀圭被涓殑鏁版嵁
+ */
@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;
- }
+ 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;
+ }
}
+ /**
+ * @param appWidgetId
+ * @param appWidgetType
+ * 鏍规嵁涓嶅悓绫诲瀷鐨剋idget鏇存柊鎻掍欢锛岄€氳繃intent浼犻€佹暟鎹�
+ */
private void updateWidget(int appWidgetId, int appWidgetType) {
Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
if (appWidgetType == Notes.TYPE_WIDGET_2X) {
@@ -700,13 +726,16 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {
- appWidgetId
+ 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) {
@@ -726,6 +755,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
super.onContextMenuClosed(menu);
}
+ /* (non-Javadoc)
+ * @see android.app.Activity#onContextItemSelected(android.view.MenuItem)
+ * 閽堝menu涓笉鍚岀殑閫夋嫨杩涜涓嶅悓鐨勫鐞嗭紝閲岄潰璇︾粏娉ㄩ噴
+ */
@Override
public boolean onContextItemSelected(MenuItem item) {
if (mFocusNoteDataItem == null) {
@@ -734,10 +767,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
switch (item.getItemId()) {
case MENU_FOLDER_VIEW:
- openFolder(mFocusNoteDataItem);
+ openFolder(mFocusNoteDataItem);//鎵撳紑瀵瑰簲鏂囦欢
break;
case MENU_FOLDER_DELETE:
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ 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));
@@ -748,7 +781,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
});
builder.setNegativeButton(android.R.string.cancel, null);
- builder.show();
+ builder.show();//鏄剧ず瀵硅瘽妗�
break;
case MENU_FOLDER_CHANGE_NAME:
showCreateOrModifyFolderDialog(false);
@@ -818,12 +851,19 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
return true;
}
+ /* (non-Javadoc)
+ * @see android.app.Activity#onSearchRequested()
+ * 鐩存帴璋冪敤startSearch鍑芥暟
+ */
@Override
public boolean onSearchRequested() {
startSearch(null, false, null /* appData */, false);
return true;
}
+ /**
+ * 鍑芥暟鍔熻兘锛氬疄鐜板皢渚跨瀵煎嚭鍒版枃鏈姛鑳�
+ */
private void exportNoteToText() {
final BackupUtils backup = BackupUtils.getInstance(NotesListActivity.this);
new AsyncTask() {
@@ -866,16 +906,27 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}.execute();
}
+ /**
+ * @return
+ * 鍔熻兘锛氬垽鏂槸鍚︽鍦ㄥ悓姝�
+ */
private boolean isSyncMode() {
return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0;
}
+ /**
+ * 鍔熻兘锛氳烦杞埌PreferenceActivity鐣岄潰
+ */
private void startPreferenceActivity() {
Activity from = getParent() != null ? getParent() : this;
Intent intent = new Intent(from, NotesPreferenceActivity.class);
from.startActivityIfNeeded(intent, -1);
}
+ /**
+ * @author k
+ * 鍑芥暟鍔熻兘锛氬疄鐜板渚跨鍒楄〃椤圭殑鐐瑰嚮浜嬩欢锛堢煭鎸夛級
+ */
private class OnListItemClickListener implements OnItemClickListener {
public void onItemClick(AdapterView> parent, View view, int position, long id) {
@@ -917,10 +968,13 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
+ /**
+ * 鏌ヨ鐩爣鏂囦欢
+ */
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 + ")";
+ "(" + selection + ") OR (" + NoteColumns.ID + "=" + Notes.ID_ROOT_FOLDER + ")";
mBackgroundQueryHandler.startQuery(FOLDER_LIST_QUERY_TOKEN,
null,
@@ -935,6 +989,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
NoteColumns.MODIFIED_DATE + " DESC");
}
+ /* (non-Javadoc)
+ * @see android.widget.AdapterView.OnItemLongClickListener#onItemLongClick(android.widget.AdapterView, android.view.View, int, long)
+ * 闀挎寜鏌愪竴椤规椂杩涜鐨勬搷浣�
+ * 濡傛灉闀挎寜鐨勬槸渚跨锛屽垯閫氳繃ActionMode鑿滃崟瀹炵幇锛涘鏋滈暱鎸夌殑鏄枃浠跺す锛屽垯閫氳繃ContextMenu鑿滃崟瀹炵幇锛�
+ * 鍏蜂綋ActionMOde鑿滃崟鍜孋ontextMenu鑿滃崟鐨勮缁嗚绮惧害绗旇
+ */
public boolean onItemLongClick(AdapterView> parent, View view, int position, long id) {
if (view instanceof NotesListItem) {
mFocusNoteDataItem = ((NotesListItem) view).getItemData();
@@ -951,4 +1011,4 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
}
return false;
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
index 51c9cb9..99af732 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
@@ -31,55 +31,94 @@ import java.util.HashSet;
import java.util.Iterator;
+/*
+ * 功能:直译为便签表连接器,继承了CursorAdapter,它为cursor和ListView提供了连接的桥梁。
+ * 所以NotesListAdapter实现的是鼠标和编辑便签链接的桥梁
+ */
public class NotesListAdapter extends CursorAdapter {
private static final String TAG = "NotesListAdapter";
private Context mContext;
private HashMap mSelectedIndex;
- private int mNotesCount;
- private boolean mChoiceMode;
+ private int mNotesCount; //便签数
+ private boolean mChoiceMode; //选择模式标记
+ /*
+ * 桌面widget的属性,包括编号和类型
+ */
public static class AppWidgetAttribute {
public int widgetId;
public int widgetType;
};
+ /*
+ * 函数功能:初始化便签链接器
+ * 函数实现:根据传进来的内容设置相关变量
+ */
public NotesListAdapter(Context context) {
- super(context, null);
- mSelectedIndex = new HashMap();
+ super(context, null); //父类对象置空
+ mSelectedIndex = new HashMap(); //新建选项下标的hash表
mContext = context;
mNotesCount = 0;
}
@Override
+ /*
+ * 函数功能:新建一个视图来存储光标所指向的数据
+ * 函数实现:使用兄弟类NotesListItem新建一个项目选项
+ */
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return new NotesListItem(context);
}
+ /*
+ * 函数功能:将已经存在的视图和鼠标指向的数据进行捆绑
+ * 函数实现:如下注释
+ */
@Override
public void bindView(View view, Context context, Cursor cursor) {
if (view instanceof NotesListItem) {
+ //若view是NotesListItem的一个实例
NoteItemData itemData = new NoteItemData(context, cursor);
((NotesListItem) view).bind(context, itemData, mChoiceMode,
isSelectedItem(cursor.getPosition()));
+ //则新建一个项目选项并且用bind跟将view和鼠标,内容,便签数据捆绑在一起
}
}
+ /*
+ * 函数功能:设置勾选框
+ * 函数实现:如下注释
+ */
public void setCheckedItem(final int position, final boolean checked) {
mSelectedIndex.put(position, checked);
+ //根据定位和是否勾选设置下标
notifyDataSetChanged();
+ //在修改后刷新activity
}
+ /*
+ * 函数功能:判断单选按钮是否勾选
+ */
public boolean isInChoiceMode() {
return mChoiceMode;
}
+ /*
+ * 函数功能:设置单项选项框
+ * 函数实现:重置下标并且根据参数mode设置选项
+ */
public void setChoiceMode(boolean mode) {
mSelectedIndex.clear();
mChoiceMode = mode;
}
+ /*
+ * 函数功能:选择全部选项
+ * 函数实现:如下注释
+ */
public void selectAll(boolean checked) {
Cursor cursor = getCursor();
+ //获取光标位置
for (int i = 0; i < getCount(); i++) {
if (cursor.moveToPosition(i)) {
if (NoteItemData.getNoteType(cursor) == Notes.TYPE_NOTE) {
@@ -87,30 +126,47 @@ public class NotesListAdapter extends CursorAdapter {
}
}
}
+ //遍历所有光标可用的位置在判断为便签类型之后勾选单项框
}
+ /*
+ * 函数功能:建立选择项的下标列表
+ * 函数实现:如下注释
+ */
public HashSet getSelectedItemIds() {
HashSet itemSet = new HashSet();
+ //建立hash表
for (Integer position : mSelectedIndex.keySet()) {
+ //遍历所有的关键
if (mSelectedIndex.get(position) == true) {
+ //若光标位置可用
Long id = getItemId(position);
if (id == Notes.ID_ROOT_FOLDER) {
+ //原文件不需要添加
Log.d(TAG, "Wrong item id, should not happen");
} else {
itemSet.add(id);
}
+ //则将id该下标假如选项集合中
+
}
}
return itemSet;
}
+ /*
+ * 函数功能:建立桌面Widget的选项表
+ * 函数实现:如下注释
+ */
public HashSet getSelectedWidget() {
HashSet itemSet = new HashSet();
for (Integer position : mSelectedIndex.keySet()) {
if (mSelectedIndex.get(position) == true) {
Cursor c = (Cursor) getItem(position);
+ //以上4句和getSelectedItemIds一样,不再重复
if (c != null) {
+ //光标位置可用的话就建立新的Widget属性并编辑下标和类型,最后添加到选项集中
AppWidgetAttribute widget = new AppWidgetAttribute();
NoteItemData item = new NoteItemData(mContext, c);
widget.widgetId = item.getWidgetId();
@@ -128,26 +184,42 @@ public class NotesListAdapter extends CursorAdapter {
return itemSet;
}
+ /*
+ * 函数功能:获取选项个数
+ * 函数实现:如下注释
+ */
public int getSelectedCount() {
Collection values = mSelectedIndex.values();
+ //首先获取选项下标的值
if (null == values) {
return 0;
}
Iterator iter = values.iterator();
+ //初始化叠加器
int count = 0;
while (iter.hasNext()) {
if (true == iter.next()) {
+ //若value值为真计数+1
count++;
}
}
return count;
}
+ /*
+ * 函数功能:判断是否全部选中
+ * 函数实现:如下注释
+ */
public boolean isAllSelected() {
int checkedCount = getSelectedCount();
return (checkedCount != 0 && checkedCount == mNotesCount);
+ //获取选项数看是否等于便签的个数
}
+ /*
+ * 函数功能:判断是否为选项表
+ * 函数实现:通过传递的下标来确定
+ */
public boolean isSelectedItem(final int position) {
if (null == mSelectedIndex.get(position)) {
return false;
@@ -156,29 +228,45 @@ public class NotesListAdapter extends CursorAdapter {
}
@Override
+ /*
+ * 函数功能:在activity内容发生局部变动的时候回调该函数计算便签的数量
+ * 函数实现:如下注释
+ */
protected void onContentChanged() {
super.onContentChanged();
+ //执行基类函数
calcNotesCount();
}
@Override
+ /*
+ * 函数功能:在activity光标发生局部变动的时候回调该函数计算便签的数量
+ */
public void changeCursor(Cursor cursor) {
super.changeCursor(cursor);
+ //执行基类函数
calcNotesCount();
}
+ /*
+ * 函数功能:计算便签数量
+ *
+ */
private void calcNotesCount() {
mNotesCount = 0;
for (int i = 0; i < getCount(); i++) {
+ //获取总数同时遍历
Cursor c = (Cursor) getItem(i);
if (c != null) {
if (NoteItemData.getNoteType(c) == Notes.TYPE_NOTE) {
mNotesCount++;
+ //若该位置不为空并且文本类型为便签就+1
}
} else {
Log.e(TAG, "Invalid cursor");
return;
}
+ //否则报错
}
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
index 1221e80..81c356a 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListItem.java
@@ -30,37 +30,43 @@ import net.micode.notes.tool.DataUtils;
import net.micode.notes.tool.ResourceParser.NoteItemBgResources;
+//创建便签列表项目选项
public class NotesListItem extends LinearLayout {
- private ImageView mAlert;
- private TextView mTitle;
- private TextView mTime;
- private TextView mCallName;
- private NoteItemData mItemData;
- private CheckBox mCheckBox;
+ private ImageView mAlert;//闹钟图片
+ private TextView mTitle; //标题
+ private TextView mTime; //时间
+ private TextView mCallName; //
+ private NoteItemData mItemData; //标签数据
+ private CheckBox mCheckBox; //打钩框
+ /*初始化基本信息*/
public NotesListItem(Context context) {
- super(context);
- inflate(context, R.layout.note_item, this);
+ super(context); //super()它的主要作用是调整调用父类构造函数的顺序
+ inflate(context, R.layout.note_item, this);//Inflate可用于将一个xml中定义的布局控件找出来,这里的xml是r。layout
+ //findViewById用于从contentView中查找指定ID的View,转换出来的形式根据需要而定;
mAlert = (ImageView) findViewById(R.id.iv_alert_icon);
mTitle = (TextView) findViewById(R.id.tv_title);
mTime = (TextView) findViewById(R.id.tv_time);
mCallName = (TextView) findViewById(R.id.tv_name);
mCheckBox = (CheckBox) findViewById(android.R.id.checkbox);
}
-
+ ///根据data的属性对各个控件的属性的控制,主要是可见性Visibility,内容setText,格式setTextAppearance
public void bind(Context context, NoteItemData data, boolean choiceMode, boolean checked) {
if (choiceMode && data.getType() == Notes.TYPE_NOTE) {
- mCheckBox.setVisibility(View.VISIBLE);
- mCheckBox.setChecked(checked);
+ mCheckBox.setVisibility(View.VISIBLE); ///设置可见行为可见
+ mCheckBox.setChecked(checked); ///格子打钩
} else {
mCheckBox.setVisibility(View.GONE);
}
mItemData = data;
+ ///设置控件属性,一共三种情况,由data的id和父id是否与保存到文件夹的id一致来决定
if (data.getId() == Notes.ID_CALL_RECORD_FOLDER) {
mCallName.setVisibility(View.GONE);
mAlert.setVisibility(View.VISIBLE);
+ //设置该textview的style
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
+ //settext为设置内容
mTitle.setText(context.getString(R.string.call_record_folder_name)
+ context.getString(R.string.format_folder_files_count, data.getNotesCount()));
mAlert.setImageResource(R.drawable.call_record);
@@ -69,8 +75,9 @@ public class NotesListItem extends LinearLayout {
mCallName.setText(data.getCallName());
mTitle.setTextAppearance(context,R.style.TextAppearanceSecondaryItem);
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
+ ///关于闹钟的设置
if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);
+ mAlert.setImageResource(R.drawable.clock);//图片来源的设置
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
@@ -78,45 +85,48 @@ public class NotesListItem extends LinearLayout {
} else {
mCallName.setVisibility(View.GONE);
mTitle.setTextAppearance(context, R.style.TextAppearancePrimaryItem);
-
+ ///设置title格式
if (data.getType() == Notes.TYPE_FOLDER) {
mTitle.setText(data.getSnippet()
+ context.getString(R.string.format_folder_files_count,
- data.getNotesCount()));
+ data.getNotesCount()));
mAlert.setVisibility(View.GONE);
} else {
mTitle.setText(DataUtils.getFormattedSnippet(data.getSnippet()));
if (data.hasAlert()) {
- mAlert.setImageResource(R.drawable.clock);
+ mAlert.setImageResource(R.drawable.clock);///设置图片来源
mAlert.setVisibility(View.VISIBLE);
} else {
mAlert.setVisibility(View.GONE);
}
}
}
- mTime.setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
+ ///设置内容,获取相关时间,从data里编辑的日期中获取
+ mTime. setText(DateUtils.getRelativeTimeSpanString(data.getModifiedDate()));
setBackground(data);
}
-
+ //根据data的文件属性来设置背景
private void setBackground(NoteItemData data) {
int id = data.getBgColorId();
+ //,若是note型文件,则4种情况,对于4种不同情况的背景来源
if (data.getType() == Notes.TYPE_NOTE) {
+ //单个数据并且只有一个子文件夹
if (data.isSingle() || data.isOneFollowingFolder()) {
setBackgroundResource(NoteItemBgResources.getNoteBgSingleRes(id));
- } else if (data.isLast()) {
+ } else if (data.isLast()) {//是最后一个数据
setBackgroundResource(NoteItemBgResources.getNoteBgLastRes(id));
- } else if (data.isFirst() || data.isMultiFollowingFolder()) {
+ } else if (data.isFirst() || data.isMultiFollowingFolder()) {//是一个数据并有多个子文件夹
setBackgroundResource(NoteItemBgResources.getNoteBgFirstRes(id));
} else {
setBackgroundResource(NoteItemBgResources.getNoteBgNormalRes(id));
}
} else {
+ //若不是note直接调用文件夹的背景来源
setBackgroundResource(NoteItemBgResources.getFolderBgRes());
}
}
-
public NoteItemData getItemData() {
return mItemData;
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
index 07c5f7e..46ff52d 100644
--- a/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
@@ -48,65 +48,92 @@ import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.gtask.remote.GTaskSyncService;
+/*
+ *该类功能:NotesPreferenceActivity,在小米便签中主要实现的是对背景颜色和字体大小的数据储存。
+ * 继承了PreferenceActivity主要功能为对系统信息和配置进行自动保存的Activity
+ */
public class NotesPreferenceActivity extends PreferenceActivity {
public static final String PREFERENCE_NAME = "notes_preferences";
-
+ //优先名
public static final String PREFERENCE_SYNC_ACCOUNT_NAME = "pref_key_account_name";
-
+ //同步账号
public static final String PREFERENCE_LAST_SYNC_TIME = "pref_last_sync_time";
-
+ //同步时间
public static final String PREFERENCE_SET_BG_COLOR_KEY = "pref_key_bg_random_appear";
private static final String PREFERENCE_SYNC_ACCOUNT_KEY = "pref_sync_account_key";
-
+ //同步密码
private static final String AUTHORITIES_FILTER_KEY = "authorities";
-
+ //本地密码
private PreferenceCategory mAccountCategory;
-
+ //账户分组
private GTaskReceiver mReceiver;
-
+ //同步任务接收器
private Account[] mOriAccounts;
-
+ //账户
private boolean mHasAddedAccount;
+ //账户的hash标记
@Override
+ /*
+ *函数功能:创建一个activity,在函数里要完成所有的正常静态设置
+ *参数:Bundle icicle:存放了 activity 当前的状态
+ *函数实现:如下注释
+ */
protected void onCreate(Bundle icicle) {
+ //先执行父类的创建函数
super.onCreate(icicle);
/* using the app icon for navigation */
getActionBar().setDisplayHomeAsUpEnabled(true);
+ //给左上角图标的左边加上一个返回的图标
addPreferencesFromResource(R.xml.preferences);
+ //添加xml来源并显示 xml
mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY);
+ //根据同步账户关键码来初始化分组
mReceiver = new GTaskReceiver();
IntentFilter filter = new IntentFilter();
filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME);
registerReceiver(mReceiver, filter);
+ //初始化同步组件
mOriAccounts = null;
View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
+ //获取listvivew,ListView的作用:用于列出所有选择
getListView().addHeaderView(header, null, true);
+ //在listview组件上方添加其他组件
}
@Override
+ /*
+ * 函数功能:activity交互功能的实现,用于接受用户的输入
+ * 函数实现:如下注释
+ */
protected void onResume() {
+ //先执行父类 的交互实现
super.onResume();
// need to set sync account automatically if user has added a new
// account
if (mHasAddedAccount) {
+ //若用户新加了账户则自动设置同步账户
Account[] accounts = getGoogleAccounts();
+ //获取google同步账户
if (mOriAccounts != null && accounts.length > mOriAccounts.length) {
+ //若原账户不为空且当前账户有增加
for (Account accountNew : accounts) {
boolean found = false;
for (Account accountOld : mOriAccounts) {
if (TextUtils.equals(accountOld.name, accountNew.name)) {
+ //更新账户
found = true;
break;
}
}
if (!found) {
setSyncAccount(accountNew.name);
+ //若是没有找到旧的账户,那么同步账号中就只添加新账户
break;
}
}
@@ -114,58 +141,83 @@ public class NotesPreferenceActivity extends PreferenceActivity {
}
refreshUI();
+ //刷新标签界面
}
@Override
+ /*
+ * 函数功能:销毁一个activity
+ * 函数实现:如下注释
+ */
protected void onDestroy() {
if (mReceiver != null) {
unregisterReceiver(mReceiver);
+ //注销接收器
}
super.onDestroy();
+ //执行父类的销毁动作
}
+ /*
+ * 函数功能:重新设置账户信息
+ * 函数实现:如下注释
+ */
private void loadAccountPreference() {
mAccountCategory.removeAll();
-
+ //销毁所有的分组
Preference accountPref = new Preference(this);
+ //建立首选项
final String defaultAccount = getSyncAccountName(this);
accountPref.setTitle(getString(R.string.preferences_account_title));
accountPref.setSummary(getString(R.string.preferences_account_summary));
+ //设置首选项的大标题和小标题
accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
public boolean onPreferenceClick(Preference preference) {
+ //建立监听器
if (!GTaskSyncService.isSyncing()) {
if (TextUtils.isEmpty(defaultAccount)) {
// the first time to set account
+ //若是第一次建立账户显示选择账户提示对话框
showSelectAccountAlertDialog();
} else {
// if the account has already been set, we need to promp
// user about the risk
+ //若是已经建立则显示修改对话框并进行修改操作
showChangeAccountConfirmAlertDialog();
}
} else {
+ //若在没有同步的情况下,则在toast中显示不能修改
Toast.makeText(NotesPreferenceActivity.this,
- R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
+ R.string.preferences_toast_cannot_change_account, Toast.LENGTH_SHORT)
.show();
}
return true;
}
});
+ //根据新建首选项编辑新的账户分组
mAccountCategory.addPreference(accountPref);
}
+ /*
+ *函数功能:设置按键的状态和最后同步的时间
+ *函数实现:如下注释
+ */
private void loadSyncButton() {
Button syncButton = (Button) findViewById(R.id.preference_sync_button);
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
-
+ //获取同步按钮控件和最终同步时间的的窗口
// set button state
+ //设置按钮的状态
if (GTaskSyncService.isSyncing()) {
+ //若是在同步状态下
syncButton.setText(getString(R.string.preferences_button_sync_cancel));
syncButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
GTaskSyncService.cancelSync(NotesPreferenceActivity.this);
}
});
+ //设置按钮显示的文本为“取消同步”以及监听器
} else {
syncButton.setText(getString(R.string.preferences_button_sync_immediately));
syncButton.setOnClickListener(new View.OnClickListener() {
@@ -173,50 +225,67 @@ public class NotesPreferenceActivity extends PreferenceActivity {
GTaskSyncService.startSync(NotesPreferenceActivity.this);
}
});
+ //若是不同步则设置按钮显示的文本为“立即同步”以及对应监听器
}
syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this)));
+ //设置按键可用还是不可用
// set last sync time
+ // 设置最终同步时间
if (GTaskSyncService.isSyncing()) {
+ //若是在同步的情况下
lastSyncTimeView.setText(GTaskSyncService.getProgressString());
lastSyncTimeView.setVisibility(View.VISIBLE);
+ // 根据当前同步服务器设置时间显示框的文本以及可见性
} else {
+ //若是非同步情况
long lastSyncTime = getLastSyncTime(this);
if (lastSyncTime != 0) {
lastSyncTimeView.setText(getString(R.string.preferences_last_sync_time,
DateFormat.format(getString(R.string.preferences_last_sync_time_format),
lastSyncTime)));
lastSyncTimeView.setVisibility(View.VISIBLE);
+ //则根据最后同步时间的信息来编辑时间显示框的文本内容和可见性
} else {
+ //若时间为空直接设置为不可见状态
lastSyncTimeView.setVisibility(View.GONE);
}
}
}
-
+ /*
+ *函数功能:刷新标签界面
+ *函数实现:调用上文设置账号和设置按键两个函数来实现
+ */
private void refreshUI() {
loadAccountPreference();
loadSyncButton();
}
+ /*
+ * 函数功能:显示账户选择的对话框并进行账户的设置
+ * 函数实现:如下注释
+ */
private void showSelectAccountAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
+ //创建一个新的对话框
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_select_account_title));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_select_account_tips));
-
+ //设置标题以及子标题的内容
dialogBuilder.setCustomTitle(titleView);
dialogBuilder.setPositiveButton(null, null);
-
+ //设置对话框的自定义标题,建立一个YES的按钮
Account[] accounts = getGoogleAccounts();
String defAccount = getSyncAccountName(this);
-
+ //获取同步账户信息
mOriAccounts = accounts;
mHasAddedAccount = false;
if (accounts.length > 0) {
+ //若账户不为空
CharSequence[] items = new CharSequence[accounts.length];
final CharSequence[] itemMapping = items;
int checkedItem = -1;
@@ -224,83 +293,119 @@ public class NotesPreferenceActivity extends PreferenceActivity {
for (Account account : accounts) {
if (TextUtils.equals(account.name, defAccount)) {
checkedItem = index;
+ //在账户列表中查询到所需账户
}
items[index++] = account.name;
}
dialogBuilder.setSingleChoiceItems(items, checkedItem,
+ //在对话框建立一个单选的复选框
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
setSyncAccount(itemMapping[which].toString());
dialog.dismiss();
+ //取消对话框
refreshUI();
}
+ //设置点击后执行的事件,包括检录新同步账户和刷新标签界面
});
+ //建立对话框网络版的监听器
}
View addAccountView = LayoutInflater.from(this).inflate(R.layout.add_account_text, null);
dialogBuilder.setView(addAccountView);
+ //给新加账户对话框设置自定义样式
final AlertDialog dialog = dialogBuilder.show();
+ //显示对话框
addAccountView.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mHasAddedAccount = true;
+ //将新加账户的hash置true
Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");
+ //建立网络建立组件
intent.putExtra(AUTHORITIES_FILTER_KEY, new String[] {
- "gmail-ls"
+ "gmail-ls"
});
startActivityForResult(intent, -1);
+ //跳回上一个选项
dialog.dismiss();
}
});
+ //建立新加账户对话框的监听器
}
+ /*
+ * 函数功能:显示账户选择对话框和相关账户操作
+ * 函数实现:如下注释
+ */
private void showChangeAccountConfirmAlertDialog() {
AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(this);
-
+ //创建一个新的对话框
View titleView = LayoutInflater.from(this).inflate(R.layout.account_dialog_title, null);
TextView titleTextView = (TextView) titleView.findViewById(R.id.account_dialog_title);
titleTextView.setText(getString(R.string.preferences_dialog_change_account_title,
getSyncAccountName(this)));
TextView subtitleTextView = (TextView) titleView.findViewById(R.id.account_dialog_subtitle);
subtitleTextView.setText(getString(R.string.preferences_dialog_change_account_warn_msg));
+ //根据同步修改的账户信息设置标题以及子标题的内容
dialogBuilder.setCustomTitle(titleView);
-
+ //设置对话框的自定义标题
CharSequence[] menuItemArray = new CharSequence[] {
getString(R.string.preferences_menu_change_account),
getString(R.string.preferences_menu_remove_account),
getString(R.string.preferences_menu_cancel)
};
+ //定义一些标记字符串
dialogBuilder.setItems(menuItemArray, new DialogInterface.OnClickListener() {
+ //设置对话框要显示的一个list,用于显示几个命令时,即change,remove,cancel
public void onClick(DialogInterface dialog, int which) {
+ //按键功能,由which来决定
if (which == 0) {
+ //进入账户选择对话框
showSelectAccountAlertDialog();
} else if (which == 1) {
+ //删除账户并且跟新便签界面
removeSyncAccount();
refreshUI();
}
}
});
dialogBuilder.show();
+ //显示对话框
}
+ /*
+ *函数功能:获取谷歌账户
+ *函数实现:通过账户管理器直接获取
+ */
private Account[] getGoogleAccounts() {
AccountManager accountManager = AccountManager.get(this);
return accountManager.getAccountsByType("com.google");
}
+ /*
+ * 函数功能:设置同步账户
+ * 函数实现:如下注释:
+ */
private void setSyncAccount(String account) {
if (!getSyncAccountName(this).equals(account)) {
+ //假如该账号不在同步账号列表中
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ //编辑共享的首选项
if (account != null) {
editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, account);
} else {
editor.putString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ //将该账号加入到首选项中
+
editor.commit();
+ //提交修改的数据
+
- // clean up last sync time
setLastSyncTime(this, 0);
+ //将最后同步时间清零
// clean up local gtask related info
new Thread(new Runnable() {
@@ -311,23 +416,33 @@ public class NotesPreferenceActivity extends PreferenceActivity {
getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
}
}).start();
+ //重置当地同步任务的信息
Toast.makeText(NotesPreferenceActivity.this,
getString(R.string.preferences_toast_success_set_accout, account),
Toast.LENGTH_SHORT).show();
+ //将toast的文本信息置为“设置账户成功”并显示出来
}
}
-
+ /*
+ * 函数功能:删除同步账户
+ * 函数实现:如下注释:
+ */
private void removeSyncAccount() {
SharedPreferences settings = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ //设置共享首选项
+
if (settings.contains(PREFERENCE_SYNC_ACCOUNT_NAME)) {
editor.remove(PREFERENCE_SYNC_ACCOUNT_NAME);
+ //假如当前首选项中有账户就删除
}
if (settings.contains(PREFERENCE_LAST_SYNC_TIME)) {
editor.remove(PREFERENCE_LAST_SYNC_TIME);
+ //删除当前首选项中有账户时间
}
editor.commit();
+ //提交更新后的数据
// clean up local gtask related info
new Thread(new Runnable() {
@@ -338,51 +453,79 @@ public class NotesPreferenceActivity extends PreferenceActivity {
getContentResolver().update(Notes.CONTENT_NOTE_URI, values, null, null);
}
}).start();
+ //重置当地同步任务的信息
}
+ /*
+ * 函数功能:获取同步账户名称
+ * 函数实现:通过共享的首选项里的信息直接获取
+ */
public static String getSyncAccountName(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getString(PREFERENCE_SYNC_ACCOUNT_NAME, "");
}
+ /*
+ * 函数功能:设置最终同步的时间
+ * 函数实现:如下注释
+ */
public static void setLastSyncTime(Context context, long time) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
SharedPreferences.Editor editor = settings.edit();
+ // 从共享首选项中找到相关账户并获取其编辑器
editor.putLong(PREFERENCE_LAST_SYNC_TIME, time);
editor.commit();
+ //编辑最终同步时间并提交更新
}
-
+ /*
+ * 函数功能:获取最终同步时间
+ * 函数实现:通过共享的首选项里的信息直接获取
+ */
public static long getLastSyncTime(Context context) {
SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME,
Context.MODE_PRIVATE);
return settings.getLong(PREFERENCE_LAST_SYNC_TIME, 0);
}
+ /*
+ * 函数功能:接受同步信息
+ * 函数实现:继承BroadcastReceiver
+ */
private class GTaskReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
refreshUI();
if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) {
+ //获取随广播而来的Intent中的同步服务的数据
TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
syncStatus.setText(intent
.getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG));
+ //通过获取的数据在设置系统的状态
}
}
}
+ /*
+ * 函数功能:处理菜单的选项
+ * 函数实现:如下注释
+ * 参数:MenuItem菜单选项
+ */
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
+ //根据选项的id选择,这里只有一个主页
case android.R.id.home:
Intent intent = new Intent(this, NotesListActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
return true;
+ //在主页情况下在创建连接组件intent,发出清空的信号并开始一个相应的activity
default:
return false;
}
}
}
+
\ No newline at end of file