diff --git a/model/新功能体系结构.png b/model/新功能体系结构.png new file mode 100644 index 0000000..2a5d4f0 Binary files /dev/null and b/model/新功能体系结构.png differ diff --git a/model/新功能分析类图.png b/model/新功能分析类图.png new file mode 100644 index 0000000..47203ec Binary files /dev/null and b/model/新功能分析类图.png differ diff --git a/model/新功能分析类图2.png b/model/新功能分析类图2.png new file mode 100644 index 0000000..be085ad Binary files /dev/null and b/model/新功能分析类图2.png differ diff --git a/model/新功能分析类图UI.png b/model/新功能分析类图UI.png new file mode 100644 index 0000000..a8e9656 Binary files /dev/null and b/model/新功能分析类图UI.png differ diff --git a/model/新功能顺序图.png b/model/新功能顺序图.png new file mode 100644 index 0000000..65616a7 Binary files /dev/null and b/model/新功能顺序图.png differ diff --git a/model/软工.png b/model/软工.png deleted file mode 100644 index e440fea..0000000 Binary files a/model/软工.png and /dev/null differ diff --git a/model/软工1.png b/model/软工1.png deleted file mode 100644 index 6dfe0f1..0000000 Binary files a/model/软工1.png and /dev/null differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock index c704e4b..b4b8a41 100644 Binary files a/src/Notes-master1/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master1/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin new file mode 100644 index 0000000..a5e7c33 Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin new file mode 100644 index 0000000..8f8db5b Binary files /dev/null and b/src/Notes-master1/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin index 49cb4a2..8566cec 100644 Binary files a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock index 7573f89..9e28af7 100644 Binary files a/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master1/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin index 29d469c..5772f7c 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock index c67971f..14d3061 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master1/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin index 1b220eb..2d5b13d 100644 Binary files a/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master1/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index ebb05b8..9b27092 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin index cf996d9..ec0d14e 100644 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe index 76b524f..9a80e40 100644 Binary files a/src/Notes-master1/.gradle/file-system.probe and b/src/Notes-master1/.gradle/file-system.probe differ diff --git a/src/Notes-master1/.idea/render.experimental.xml b/src/Notes-master1/.idea/render.experimental.xml new file mode 100644 index 0000000..8ec256a --- /dev/null +++ b/src/Notes-master1/.idea/render.experimental.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/Notes-master1/.idea/vcs.xml b/src/Notes-master1/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/src/Notes-master1/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle index 2924db4..8c5d4ae 100644 --- a/src/Notes-master1/app/build.gradle +++ b/src/Notes-master1/app/build.gradle @@ -18,3 +18,7 @@ android { } } } + +dependencies { + implementation 'androidx.recyclerview:recyclerview:1.2.1' +} diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk index cd85620..f24ed22 100644 Binary files a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index ab2b057..1cc30ef 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 108f5ce..48a142c 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index ddf75bb..b6fabc9 100644 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_0/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_0/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_0/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_1/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_1/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_1/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_2/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_2/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_2/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_3/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_3/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_3/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_4/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_4/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_4/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_5/graph.bin similarity index 100% rename from src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_6cd080a137cd6c47b2aa34ddc45cb2f114d21cdc14a2e8250cbf75372ad7b9da_bucket_5/graph.bin rename to src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_5749a1235ed03cd179ea4f3c365f661b2371bc5fef07fdae1888e24f71aa20ed_bucket_5/graph.bin diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 1277f85..3a6f21e 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index ed43bb9..f01a802 100644 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index d894ce7..d960cea 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Fri Mar 24 15:01:16 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\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=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Fri Apr 14 16:51:59 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml index e49b0c3..c71fd03 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml @@ -132,8 +132,8 @@ @color/secondary_text_dark + + visible + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index a8b31e9..8075e68 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 005f194..bf1781c 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 6e816be..b685066 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 9d8fc27..5d91bd0 100644 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Mar 24 15:01:41 CST 2023 -base.0=D\:\\ZIP\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Apr 14 16:52:00 CST 2023 +base.0=D\:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 44d33ab..22c8c43 100644 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class index 6e28b50..89bf491 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class index 534af6e..b763545 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class index 0d9547b..9a1bf33 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class index a78b61a..ac497c9 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class index bdc56b1..ef1f16b 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index 1f3ea0b..2cd5c4a 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 976265d..0101cfc 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class index 30318fc..54b4705 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class index bbbea2e..db04c03 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index bfb671c..3f99916 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index ed4ac8e..6a14b7d 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index fc1d9a2..7fe7a78 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index 1714fc2..bc6e463 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index fabc84f..3bb4970 100644 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index d21b3ec..7b94063 100644 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-150:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-52:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 -47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 -48 android:windowSoftInputMode="adjustPan" > -48-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 -49 -49-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 -50 -50-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 -51 -52 -52-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 -53 -54 -55 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 -56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 -57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 -58 android:launchMode="singleTop" -58-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 -59 android:theme="@style/NoteTheme" > -59-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 -60 -60-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 -61 -61-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 -62 -63 -63-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -64 -65 -65-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -66 -66-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -67 -68 -68-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 -69 -69-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 -70 -71 -71-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -72 -73 -73-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -74 -74-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -75 -76 -76-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 -77 -77-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 -78 -79 -79-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -80 -81 -82 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 -83 android:name="android.app.searchable" -83-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 -84 android:resource="@xml/searchable" /> -84-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 -85 -86 -87 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 -88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 -89 android:authorities="micode_notes" -89-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 -90 android:multiprocess="true" /> -90-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 -91 -92 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 -93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 -94 android:label="@string/app_widget2x2" > -94-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 -95 -95-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -96 -96-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -97 -97-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -98 -98-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -99 -100 -101 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -102 android:name="android.appwidget.provider" -102-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -103 android:resource="@xml/widget_2x_info" /> -103-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -104 -105 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 -106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 -107 android:label="@string/app_widget4x4" > -107-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 -108 -108-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -109 -109-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -110 -110-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -111 -111-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -112 -113 -114 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -115 android:name="android.appwidget.provider" -115-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -116 android:resource="@xml/widget_4x_info" /> -116-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -117 -118 -118-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 -119 -119-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 -120 -120-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 -121 -122 -123 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 -124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 -125 android:process=":remote" > -125-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 -126 -127 -128 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 -129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 -130 android:label="@string/app_name" -130-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 -131 android:launchMode="singleInstance" -131-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 -132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 -133 -134 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 -135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 -136 android:label="@string/preferences_title" -136-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 -137 android:launchMode="singleTop" -137-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 -138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 -139 -140 -141 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 -142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 -143 android:exported="false" > -143-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 -144 -145 -146 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 -147 android:name="android.app.default_searchable" -147-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 -148 android:value=".ui.NoteEditActivity" /> -148-->D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +46-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 +47 android:windowSoftInputMode="adjustPan" > +47-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 +48 +49 +50 +50-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:48:13-51:29 +51 +51-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-69 +51-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:49:25-66 +52 +53 +53-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:50:17-77 +53-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:50:27-74 +54 +55 +56 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:54:9-82:20 +57 android:name="net.micode.notes.ui.NoteEditActivity" +57-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:55:13-48 +58 android:configChanges="keyboardHidden|orientation|screenSize" +58-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-74 +59 android:launchMode="singleTop" +59-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-43 +60 android:theme="@style/NoteTheme" > +60-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:58:13-45 +61 +61-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:60:13-65:29 +62 +62-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-69 +62-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:61:25-66 +63 +64 +64-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-76 +64-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:27-73 +65 +66 +66-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:17-78 +66-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:23-75 +67 +67-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:17-78 +67-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:23-75 +68 +69 +69-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-72:29 +70 +70-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:68:17-79 +70-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:68:25-76 +71 +72 +72-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-76 +72-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:27-73 +73 +74 +74-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:17-78 +74-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:23-75 +75 +75-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:17-78 +75-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:23-75 +76 +77 +77-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:74:13-77:29 +78 +78-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:75:17-71 +78-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:75:25-68 +79 +80 +80-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-76 +80-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:27-73 +81 +82 +83 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:79:13-81:54 +84 android:name="android.app.searchable" +84-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-54 +85 android:resource="@xml/searchable" /> +85-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:81:17-51 +86 +87 +88 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:84:9-87:43 +89 android:name="net.micode.notes.data.NotesProvider" +89-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-63 +90 android:authorities="micode_notes" +90-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-47 +91 android:multiprocess="true" /> +91-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:87:13-40 +92 +93 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:89:9-101:20 +94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" +94-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:90:13-57 +95 android:label="@string/app_widget2x2" > +95-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-50 +96 +96-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:92:13-96:29 +97 +97-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-84 +97-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-81 +98 +98-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +99 +99-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:17-85 +99-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:25-82 +100 +101 +102 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:98:13-100:58 +103 android:name="android.appwidget.provider" +103-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-58 +104 android:resource="@xml/widget_2x_info" /> +104-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:100:17-55 +105 +106 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:102:9-115:20 +107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" +107-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-57 +108 android:label="@string/app_widget4x4" > +108-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:104:13-50 +109 +109-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:92:13-96:29 +110 +110-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-84 +110-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-81 +111 +111-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 +112 +112-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:17-85 +112-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:25-82 +113 +114 +115 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:98:13-100:58 +116 android:name="android.appwidget.provider" +116-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-58 +117 android:resource="@xml/widget_4x_info" /> +117-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:100:17-55 +118 +119 +119-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:117:9-121:20 +119-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:117:19-55 +120 +120-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:118:13-120:29 +121 +121-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:119:17-79 +121-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:119:25-76 +122 +123 +124 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:123:9-126:20 +125 android:name="net.micode.notes.ui.AlarmReceiver" +125-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-61 +126 android:process=":remote" > +126-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:125:13-38 +127 +128 +129 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:128:9-133:20 +130 android:name="net.micode.notes.ui.AlarmAlertActivity" +130-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-50 +131 android:label="@string/app_name" +131-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-45 +132 android:launchMode="singleInstance" +132-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-48 +133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > +133-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:132:13-75 +134 +135 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:135:9-140:20 +136 android:name="net.micode.notes.ui.NotesPreferenceActivity" +136-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-71 +137 android:label="@string/preferences_title" +137-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-54 +138 android:launchMode="singleTop" +138-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-43 +139 android:theme="@android:style/Theme.Holo.Light" > +139-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:139:13-60 +140 +141 +142 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:142:9-145:19 +143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" +143-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-74 +144 android:exported="false" > +144-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:144:13-37 +145 +146 +147 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:147:9-149:52 +148 android:name="android.app.default_searchable" +148-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-58 +149 android:value=".ui.NoteEditActivity" /> +149-->D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:149:13-49 +150 +151 +152 diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index f237bf5..bb3eb72 100644 --- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -44,8 +44,9 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > + + diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index f237bf5..bb3eb72 100644 --- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -44,8 +44,9 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > + + diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat index ea0ebfc..c0e5804 100644 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 5bc9678..9dcfc6b 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,10 +1,29 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "C:\\Users\\86147\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -21,25 +40,6 @@ "endColumns": "19", "endOffsets": "210" } - }, - { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } } ] }, @@ -47,14 +47,42 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -66,32 +94,30 @@ } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "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" + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2853,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", "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" + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", @@ -100,9 +126,14 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } - }, + } + ] + }, + { + "outputFile": "C:\\Users\\86147\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -119,7 +150,7 @@ } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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", @@ -136,33 +167,88 @@ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "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,2853,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,8704,8864,9047,9232,9417,9620,9826,10009", + "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,8699,8859,9042,9227,9412,9615,9821,10004,10205" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "C:\\Users\\86147\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\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", + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index e791c2e..e164377 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\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": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -40,6 +21,25 @@ "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 55e6a32..8047a2d 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 41b0ba2..b22486f 100644 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,14 +4,42 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -23,32 +51,30 @@ } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "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" + "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,2640,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "-1,-1,2853,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", + "startOffsets": "8124,8328,8539,8704,8864,9047,9232,9417,9620,9826,10009", "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" + "endOffsets": "8323,8534,8699,8859,9042,9227,9412,9615,9821,10004,10205" } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" }, "to": { "startLines": "13,14,15,16,17", @@ -57,9 +83,14 @@ "endColumns": "51,52,52,51,51", "endOffsets": "524,577,630,682,734" } - }, + } + ] + }, + { + "outputFile": "C:\\Users\\86147\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", + "map": [ { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -76,7 +107,7 @@ } }, { - "source": "D:\\ZIP\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\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", @@ -93,6 +124,61 @@ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", + "from": { + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "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,2853,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,8704,8864,9047,9232,9417,9620,9826,10009", + "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,8699,8859,9042,9227,9412,9615,9821,10004,10205" + } + }, + { + "source": "D:\\gitProject\\CJR_DXW_CYW\\src\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } } ] } diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index f237bf5..bb3eb72 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -44,8 +44,9 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" android:windowSoftInputMode="adjustPan" > + + diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index c31ed29..76f607d 100644 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex index 9fa0620..e8f3aac 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex index d8ec2c4..d828cec 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex index eceecda..48a2224 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex index 2f5ecfb..e257f1a 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex index e9e44c0..99b9005 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 21ea4c4..f094058 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 7adac34..c67c505 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex index 0139b42..7e427b7 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex index 452e2d0..e0c80a0 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 2b85968..13bbdf9 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 7f9fa34..b270127 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 5ed9619..1155d25 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index ae6e2a4..537fabc 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index b1c5096..0d58b07 100644 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt index 8d0ae0c..6df606a 100644 --- a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\ZIP\Notes-master1\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\ZIP\Notes-master1\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\ZIP\Notes-master1\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\ZIP\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\ZIP\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\ZIP\Notes-master1\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\ZIP\Notes-master1\app\src\debug\res -net.micode.notes.app-main-7 D:\ZIP\Notes-master1\app\src\main\res +net.micode.notes.app-pngs-0 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\debug\res +net.micode.notes.app-main-7 D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\res diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 4461006..b9e1d92 100644 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,129 +1,134 @@ -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/menu_export_text = 0x7f0a0023 +net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:string/file_path = 0x7f0a0016 +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:id/tv_title_bar = 0x7f050040 +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:xml/preferences = 0x7f0c0000 net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:menu/sub_folder = 0x7f070006 net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:string/search_label = 0x7f0a0058 +net.micode.notes:id/selection_menu = 0x7f050038 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:id/note_title = 0x7f050034 +net.micode.notes:string/menu_search = 0x7f0a0031 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:id/menu_search = 0x7f050028 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:string/notelist_menu_new = 0x7f0a0042 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/note_link_email = 0x7f0a003c net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e +net.micode.notes:string/notelist_string_info = 0x7f0a0043 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 +net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:string/menu_move = 0x7f0a002d +net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:id/iv_bg_blue_select = 0x7f05000f +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:id/menu_share = 0x7f05002b +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/hint_foler_name = 0x7f0a001d +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:id/menu_send_to_desktop = 0x7f050029 net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/menu_select_title = 0x7f0a0034 net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/menu_font_normal = 0x7f0a0028 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/notealert_enter = 0x7f0a0040 +net.micode.notes:id/sv_note_edit = 0x7f050039 +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:dimen/text_font_size_super = 0x7f030004 net.micode.notes:drawable/selected = 0x7f040035 net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:dimen/text_font_size_super = 0x7f030004 +net.micode.notes:layout/widget_4x = 0x7f06000d +net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:id/iv_bg_blue = 0x7f05000e net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:id/move = 0x7f05002e +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:color/secondary_text_dark = 0x7f020001 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:id/widget_text = 0x7f050042 net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/tv_title_bar = 0x7f050040 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:id/tv_time = 0x7f05003e net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:id/selection_menu = 0x7f050038 net.micode.notes:string/error_sdcard_export = 0x7f0a000f net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f net.micode.notes:id/note_edit_view = 0x7f050032 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f net.micode.notes:id/navigation_bar = 0x7f05002f net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/font_normal = 0x7f040011 net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:drawable/font_normal = 0x7f040011 net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:id/menu_share = 0x7f05002b net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:id/menu_search = 0x7f050028 net.micode.notes:drawable/list_green_down = 0x7f04001d net.micode.notes:id/menu_new_note = 0x7f050027 net.micode.notes:string/error_note_not_exist = 0x7f0a000e @@ -133,14 +138,14 @@ net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/menu_export_text = 0x7f050023 net.micode.notes:string/menu_folder_view = 0x7f0a0026 net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:drawable/edit_blue = 0x7f040006 +net.micode.notes:id/menu_alert = 0x7f050020 net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:string/success_sync_account = 0x7f0a005c net.micode.notes:id/ll_font_super = 0x7f05001f net.micode.notes:id/ll_font_small = 0x7f05001e @@ -148,49 +153,44 @@ net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:drawable/search_result = 0x7f040034 net.micode.notes:id/iv_super_select = 0x7f05001b +net.micode.notes:drawable/search_result = 0x7f040034 net.micode.notes:id/iv_bg_yellow = 0x7f050016 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:id/iv_bg_white_select = 0x7f050015 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:id/tv_alert_date = 0x7f05003a net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050012 +net.micode.notes:id/iv_large_select = 0x7f050018 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050041 net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c +net.micode.notes:id/widget_bg_image = 0x7f050041 net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c net.micode.notes:id/font_size_selector = 0x7f05000b +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/search = 0x7f0a0056 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:id/iv_bg_green = 0x7f050010 net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:id/hour = 0x7f05000c net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 +net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt index 0f7f88e..4f79ec2 100644 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,233 @@ -- Merging decision tree log --- manifest -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:1-151:12 package - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml - INJECTED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml + INJECTED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:35:5-150:19 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:38:9-52:20 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 android:configChanges - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:48:13-51:29 action#android.intent.action.MAIN -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:49:17-69 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:49:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:50:17-77 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:50:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:54:9-82:20 android:launchMode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:57:13-43 android:configChanges - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:58:13-45 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\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 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:60:13-65:29 action#android.intent.action.VIEW -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:61:17-69 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:61:25-66 category#android.intent.category.DEFAULT -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:17-76 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:62:27-73 data -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:63:17-78 android:mimeType - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\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 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:67:13-72:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:68:17-79 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:68:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:74:13-77:29 action#android.intent.action.SEARCH -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:75:17-71 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:75:25-68 meta-data#android.app.searchable -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:79:13-81:54 android:resource - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:81:17-51 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:80:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:84:9-87:43 android:authorities - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:86:13-47 android:multiprocess - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:87:13-40 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:85:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:89:9-101:20 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:91:13-50 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\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 D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:92:13-96:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:17-84 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:93:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:17-85 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:95:25-82 meta-data#android.appwidget.provider -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:98:13-100:58 android:resource - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:100:17-55 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:99:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:102:9-115:20 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:104:13-50 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:103:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:117:9-121:20 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:117:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:118:13-120:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:119:17-79 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:119:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:123:9-126:20 android:process - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:125:13-38 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:124:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:128:9-133:20 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:130:13-45 android:launchMode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:131:13-48 android:theme - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:132:13-75 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:129:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:135:9-140:20 android:label - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:137:13-54 android:launchMode - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:138:13-43 android:theme - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:139:13-60 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:136:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:142:9-145:19 android:exported - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:144:13-37 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:143:13-74 meta-data#android.app.default_searchable -ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:147:9-149:52 android:value - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:149:13-49 android:name - ADDED from D:\ZIP\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\gitProject\CJR_DXW_CYW\src\Notes-master1\app\src\main\AndroidManifest.xml:148:13-58 diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 978ffc8..cb35302 100644 Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/Notes-master1/app/src/main/AndroidManifest.xml index e5c7d47..101890a 100644 --- a/src/Notes-master1/app/src/main/AndroidManifest.xml +++ b/src/Notes-master1/app/src/main/AndroidManifest.xml @@ -41,9 +41,10 @@ android:label="@string/app_name" android:launchMode="singleTop" android:theme="@style/NoteTheme" - android:uiOptions="splitActionBarWhenNarrow" + android:windowSoftInputMode="adjustPan" > + diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java index d97ac5d..b21679b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java @@ -25,47 +25,52 @@ import android.util.Log; import java.util.HashMap; -public class Contact { +public class Contact {//创建一个 联系人 类 private static HashMap sContactCache; private static final String TAG = "Contact"; + //定义字符串CALLER_ID_SELECTION private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER - + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" - + " AND " + Data.RAW_CONTACT_ID + " IN " + + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + + " AND " + Data.RAW_CONTACT_ID + " IN " + "(SELECT raw_contact_id " + " FROM phone_lookup" + " WHERE min_match = '+')"; + //获取联系人 public static String getContact(Context context, String phoneNumber) { if(sContactCache == null) { sContactCache = new HashMap(); } - + //查找HashMap中是否已经有了phoneNumber的信息 if(sContactCache.containsKey(phoneNumber)) { return sContactCache.get(phoneNumber); } String selection = CALLER_ID_SELECTION.replace("+", PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); + //查找数据库中phoneNumber的信息 Cursor cursor = context.getContentResolver().query( Data.CONTENT_URI, new String [] { Phone.DISPLAY_NAME }, selection, new String[] { phoneNumber }, null); - + //如果查询结果不为空，就输出电话号码和联系人姓名 + //否则就按照异常catch if (cursor != null && cursor.moveToFirst()) { try { String name = cursor.getString(0); sContactCache.put(phoneNumber, name); return name; + //异常处理 } catch (IndexOutOfBoundsException e) { Log.e(TAG, " Cursor get string error " + e.toString()); return null; } finally { cursor.close(); } - } else { + } else { //未找到相关信息 Log.d(TAG, "No contact matched with number:" + phoneNumber); return null; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java index f240604..7c1a57b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java @@ -18,6 +18,7 @@ package net.micode.notes.data; import android.net.Uri; public class Notes { + //定义静态成员和静态成员函数 public static final String AUTHORITY = "micode_notes"; public static final String TAG = "Notes"; public static final int TYPE_NOTE = 0; @@ -52,15 +53,15 @@ public class Notes { } /** - * Uri to query all notes and folders + * Uri to query all notes and folders 查询所有笔记和文件夹 */ public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); - + //定义查询便签和文件夹的指针 /** - * Uri to query data + * Uri to query data 查询数据 */ public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); - + //定义查找数据的指针 public interface NoteColumns { /** * The unique ID for a row @@ -165,7 +166,7 @@ public class Notes { *

Type : INTEGER (long)

*/ public static final String VERSION = "version"; - } + }//定义便签属性 public interface DataColumns { /** @@ -239,7 +240,7 @@ public class Notes { *

Type: TEXT

*/ public static final String DATA5 = "data5"; - } + }//定义存储便签内容数据不可修改变量 public static final class TextNote implements DataColumns { /** @@ -255,7 +256,7 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/text_note"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/text_note"); - } + }//文本内容的数据结构 public static final class CallNote implements DataColumns { /** @@ -275,5 +276,5 @@ public class Notes { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note"; public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); - } + }//电话内容的数据结构 } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java index ffe5d57..ee47e51 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java @@ -61,7 +61,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { NoteColumns.ORIGIN_PARENT_ID + " INTEGER NOT NULL DEFAULT 0," + NoteColumns.GTASK_ID + " TEXT NOT NULL DEFAULT ''," + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0" + - ")"; + ")";//数据库中需要存储的项目名称，相当于创建一个表格的表头 private static final String CREATE_DATA_TABLE_SQL = "CREATE TABLE " + TABLE.DATA + "(" + @@ -76,7 +76,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { DataColumns.DATA3 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA4 + " TEXT NOT NULL DEFAULT ''," + DataColumns.DATA5 + " TEXT NOT NULL DEFAULT ''" + - ")"; + ")";//和上面一样，存储项目不同而已 private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = "CREATE INDEX IF NOT EXISTS note_id_index ON " + @@ -92,7 +92,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + " END";//在文件夹中移入一个note之后需要更改的数据表格 /** * Decrease folder's note count when move note from folder @@ -105,7 +105,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + " AND " + NoteColumns.NOTES_COUNT + ">0" + ";" + - " END"; + " END";//在文件夹中移出一个note之后需要更改的数据表格 /** * Increase folder's note count when insert new note to the folder @@ -117,7 +117,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + " + 1" + " WHERE " + NoteColumns.ID + "=new." + NoteColumns.PARENT_ID + ";" + - " END"; + " END";//在文件夹中插入一个note需要更改的数据表格 /** * Decrease folder's note count when delete note from the folder @@ -130,7 +130,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " SET " + NoteColumns.NOTES_COUNT + "=" + NoteColumns.NOTES_COUNT + "-1" + " WHERE " + NoteColumns.ID + "=old." + NoteColumns.PARENT_ID + " AND " + NoteColumns.NOTES_COUNT + ">0;" + - " END"; + " END";//在文件夹中删除一个note之后需要更改的数据表格 /** * Update note's content when insert data with type {@link DataConstants#NOTE} @@ -143,7 +143,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + " END";//在文件夹中对note导入新数据之后需要更改的数据表格 /** * Update note's content when data with {@link DataConstants#NOTE} type has changed @@ -156,7 +156,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.SNIPPET + "=new." + DataColumns.CONTENT + " WHERE " + NoteColumns.ID + "=new." + DataColumns.NOTE_ID + ";" + - " END"; + " END";//note数据被删除之后需要更改的数据表格 /** * Update note's content when data with {@link DataConstants#NOTE} type has deleted @@ -169,7 +169,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.SNIPPET + "=''" + " WHERE " + NoteColumns.ID + "=old." + DataColumns.NOTE_ID + ";" + - " END"; + " END";//note数据被修改之后需要被更改的数据表格 /** * Delete datas belong to note which has been deleted @@ -180,7 +180,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " BEGIN" + " DELETE FROM " + TABLE.DATA + " WHERE " + DataColumns.NOTE_ID + "=old." + NoteColumns.ID + ";" + - " END"; + " END";//删除已删除的便签的数据之后需要更改的表格数据 /** * Delete notes belong to folder which has been deleted @@ -191,7 +191,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " BEGIN" + " DELETE FROM " + TABLE.NOTE + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + " END";//删除已删除的文件的便签之后需要被更改的表格数据 /** * Move notes belong to folder which has been moved to trash folder @@ -204,7 +204,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { " UPDATE " + TABLE.NOTE + " SET " + NoteColumns.PARENT_ID + "=" + Notes.ID_TRASH_FOLER + " WHERE " + NoteColumns.PARENT_ID + "=old." + NoteColumns.ID + ";" + - " END"; + " END";//还原垃圾桶中便签后需要更改的表格数据 public NotesDatabaseHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); @@ -215,7 +215,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { reCreateNoteTableTriggers(db); createSystemFolder(db); Log.d(TAG, "note table has been created"); - } + }//创建表格 private void reCreateNoteTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); @@ -268,14 +268,14 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { values.put(NoteColumns.ID, Notes.ID_TRASH_FOLER); values.put(NoteColumns.TYPE, Notes.TYPE_SYSTEM); db.insert(TABLE.NOTE, null, values); - } + }//创建几个系统文件夹 public void createDataTable(SQLiteDatabase db) { db.execSQL(CREATE_DATA_TABLE_SQL); reCreateDataTableTriggers(db); db.execSQL(CREATE_DATA_NOTE_ID_INDEX_SQL); Log.d(TAG, "data table has been created"); - } + }//创建用来存储标签内容 private void reCreateDataTableTriggers(SQLiteDatabase db) { db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); @@ -292,7 +292,11 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { mInstance = new NotesDatabaseHelper(context); } return mInstance; - } + }/* + 为了解决同一时刻只有一个线程执行的问题 + 在写代码时，有时一个类需要被所有的其他类使用， + 但又要求这个类只能被实例化一次，是个服务类，定义一次，其他类使用同一个这个类的实例 + */ @Override public void onCreate(SQLiteDatabase db) { @@ -331,7 +335,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { throw new IllegalStateException("Upgrade notes database to version " + newVersion + "fails"); } - } + } //数据库更新 private void upgradeToV2(SQLiteDatabase db) { db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); @@ -358,5 +362,5 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper { private void upgradeToV4(SQLiteDatabase db) { db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION + " INTEGER NOT NULL DEFAULT 0"); - } + }//这是最新版 } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java index edb0a60..39e063b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java @@ -35,8 +35,8 @@ import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.NotesDatabaseHelper.TABLE; -public class NotesProvider extends ContentProvider { - private static final UriMatcher mMatcher; +public class NotesProvider extends ContentProvider {//用来拓展查询 + private static final UriMatcher mMatcher;//用于匹配URI private NotesDatabaseHelper mHelper; @@ -50,7 +50,7 @@ public class NotesProvider extends ContentProvider { private static final int URI_SEARCH = 5; private static final int URI_SEARCH_SUGGEST = 6; - static { + static {//注册需要匹配的URI路径 mMatcher = new UriMatcher(UriMatcher.NO_MATCH); mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note/#", URI_NOTE_ITEM); @@ -72,26 +72,26 @@ public class NotesProvider extends ContentProvider { + R.drawable.search_result + " AS " + SearchManager.SUGGEST_COLUMN_ICON_1 + "," + "'" + Intent.ACTION_VIEW + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_ACTION + "," + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; - + //声明NOTES_SNIPPET_SEARCH_QUERY private static String NOTES_SNIPPET_SEARCH_QUERY = "SELECT " + NOTES_SEARCH_PROJECTION + " FROM " + TABLE.NOTE + " WHERE " + NoteColumns.SNIPPET + " LIKE ?" + " AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER + " AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE; - @Override + @Override//对mHelper进行实例化 public boolean onCreate() { mHelper = NotesDatabaseHelper.getInstance(getContext()); return true; } - @Override + @Override//查询uri在数据库中的位置 public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { Cursor c = null; - SQLiteDatabase db = mHelper.getReadableDatabase(); + SQLiteDatabase db = mHelper.getReadableDatabase();//获取可读数据库 String id = null; - switch (mMatcher.match(uri)) { + switch (mMatcher.match(uri)) {//匹配URI，对不同的URI有不同的查找条目 case URI_NOTE: c = db.query(TABLE.NOTE, projection, selection, selectionArgs, null, null, sortOrder); @@ -138,7 +138,7 @@ public class NotesProvider extends ContentProvider { Log.e(TAG, "got exception: " + ex.toString()); } break; - default: + default://抛出异常 throw new IllegalArgumentException("Unknown URI " + uri); } if (c != null) { @@ -149,9 +149,10 @@ public class NotesProvider extends ContentProvider { @Override public Uri insert(Uri uri, ContentValues values) { + //获取一个可写数据库 SQLiteDatabase db = mHelper.getWritableDatabase(); long dataId = 0, noteId = 0, insertedId = 0; - switch (mMatcher.match(uri)) { + switch (mMatcher.match(uri)) {//匹配URI case URI_NOTE: insertedId = noteId = db.insert(TABLE.NOTE, null, values); break; @@ -182,7 +183,8 @@ public class NotesProvider extends ContentProvider { } @Override - public int delete(Uri uri, String selection, String[] selectionArgs) { + public int delete(Uri uri, String selection, String[] selectionArgs) {//删除一个URI + //uri代表要操作的数据，Android上的每一种可用资源图片，音频，视频片段 int count = 0; String id = null; SQLiteDatabase db = mHelper.getWritableDatabase(); @@ -227,7 +229,7 @@ public class NotesProvider extends ContentProvider { return count; } - @Override + @Override//更新uri public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { int count = 0; String id = null; @@ -267,11 +269,12 @@ public class NotesProvider extends ContentProvider { return count; } - private String parseSelection(String selection) { + private String parseSelection(String selection) {//规范化字符串 return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); } private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { + //增加一个noteVersion StringBuilder sql = new StringBuilder(120); sql.append("UPDATE "); sql.append(TABLE.NOTE); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java index 6706cf6..54b6d18 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java @@ -21,9 +21,9 @@ import android.content.ContentUris; import android.content.ContentValues; import android.content.Context; import android.content.OperationApplicationException; -import android.net.Uri; +import android.net.Uri;//等待操作的数据 import android.os.RemoteException; -import android.util.Log; +import android.util.Log;//日志报告 import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.CallNote; @@ -49,16 +49,16 @@ public class Note { values.put(NoteColumns.MODIFIED_DATE, createdTime); values.put(NoteColumns.TYPE, Notes.TYPE_NOTE); values.put(NoteColumns.LOCAL_MODIFIED, 1); - values.put(NoteColumns.PARENT_ID, folderId); + values.put(NoteColumns.PARENT_ID, folderId);//以上为将数据写入数据库表格 Uri uri = context.getContentResolver().insert(Notes.CONTENT_NOTE_URI, values); - +//ContentResolver()主要实现外部应用对ContentResolver中的数据进行增删查改。 long noteId = 0; try { noteId = Long.valueOf(uri.getPathSegments().get(1)); } catch (NumberFormatException e) { Log.e(TAG, "Get note id error :" + e.toString()); noteId = 0; - } + }//异常处理 if (noteId == -1) { throw new IllegalStateException("Wrong note id:" + noteId); } @@ -68,35 +68,35 @@ public class Note { public Note() { mNoteDiffValues = new ContentValues(); mNoteData = new NoteData(); - } + }//初始化数据一个为便签属性，一个为存储便签内容 public void setNoteValue(String key, String value) { mNoteDiffValues.put(key, value); mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); - } + }//设置数据库的便签属性数据 public void setTextData(String key, String value) { mNoteData.setTextData(key, value); } - +//设置数据库表格的标签文本内容的数据 public void setTextDataId(long id) { mNoteData.setTextDataId(id); } - + //设置文本数据ID public long getTextDataId() { return mNoteData.mTextDataId; } - + //获取文本数据ID public void setCallDataId(long id) { mNoteData.setCallDataId(id); } - +//设置电话号码ID public void setCallData(String key, String value) { mNoteData.setCallData(key, value); } - - public boolean isLocalModified() { +//设置电话号码数据 + public boolean isLocalModified() {//判断是否本地修改 return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified(); } @@ -114,6 +114,7 @@ public class Note { * {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the * note data info */ + //数据修改的时候得更新数据为了数据安全，还是得进行通知数据修改信息 if (context.getContentResolver().update( ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null, null) == 0) { @@ -128,16 +129,16 @@ public class Note { } return true; - } + }//判断数据是否同步 - private class NoteData { - private long mTextDataId; + private class NoteData {//一个基本的便签内容数据类，主要包含文本数据和电话号码数据 + private long mTextDataId; //文本ID - private ContentValues mTextDataValues; + private ContentValues mTextDataValues; //文本数据 private long mCallDataId; - private ContentValues mCallDataValues; + private ContentValues mCallDataValues; //电话号码数据 private static final String TAG = "NoteData"; @@ -146,7 +147,7 @@ public class Note { mCallDataValues = new ContentValues(); mTextDataId = 0; mCallDataId = 0; - } + }//下面就是上述几个函数的具体实现 boolean isLocalModified() { return mTextDataValues.size() > 0 || mCallDataValues.size() > 0; @@ -184,7 +185,7 @@ public class Note { */ if (noteId <= 0) { throw new IllegalArgumentException("Wrong note id:" + noteId); - } + }//判断数据是否合法 ArrayList operationList = new ArrayList(); ContentProviderOperation.Builder builder = null; @@ -209,7 +210,7 @@ public class Note { operationList.add(builder.build()); } mTextDataValues.clear(); - } + }//把文本数据存入DataColumns if(mCallDataValues.size() > 0) { mCallDataValues.put(DataColumns.NOTE_ID, noteId); @@ -231,7 +232,7 @@ public class Note { operationList.add(builder.build()); } mCallDataValues.clear(); - } + }//把电话号码数据存入DataColumns if (operationList.size() > 0) { try { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..358c83f 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -41,7 +41,7 @@ public class WorkingNote { private String mContent; // Note mode private int mMode; - +//便签状态 private long mAlertDate; private long mModifiedDate; @@ -70,7 +70,7 @@ public class WorkingNote { DataColumns.DATA2, DataColumns.DATA3, DataColumns.DATA4, - }; + };//声明DATA_PROJECTION字符串数组 public static final String[] NOTE_PROJECTION = new String[] { NoteColumns.PARENT_ID, @@ -79,7 +79,7 @@ public class WorkingNote { NoteColumns.WIDGET_ID, NoteColumns.WIDGET_TYPE, NoteColumns.MODIFIED_DATE - }; + };//声明NOTE_PROJECTION字符串数组 private static final int DATA_ID_COLUMN = 0; @@ -112,7 +112,7 @@ public class WorkingNote { mIsDeleted = false; mMode = 0; mWidgetType = Notes.TYPE_WIDGET_INVALIDE; - } + }//WorkingNote构造函数 // Existing note construct private WorkingNote(Context context, long noteId, long folderId) { @@ -122,7 +122,7 @@ public class WorkingNote { mIsDeleted = false; mNote = new Note(); loadNote(); - } + }//WorkingNote构造函数 private void loadNote() { Cursor cursor = mContext.getContentResolver().query( @@ -146,14 +146,14 @@ public class WorkingNote { loadNoteData(); } - private void loadNoteData() { + private void loadNoteData() { //加载NoteData Cursor cursor = mContext.getContentResolver().query(Notes.CONTENT_DATA_URI, DATA_PROJECTION, DataColumns.NOTE_ID + "=?", new String[] { String.valueOf(mNoteId) }, null); if (cursor != null) { - if (cursor.moveToFirst()) { + if (cursor.moveToFirst()) { //检查第一项是否为空 do { String type = cursor.getString(DATA_MIME_TYPE_COLUMN); if (DataConstants.NOTE.equals(type)) { @@ -171,11 +171,11 @@ public class WorkingNote { } else { Log.e(TAG, "No data with id:" + mNoteId); throw new IllegalArgumentException("Unable to find note's data with id " + mNoteId); - } + }//异常处理 } public static WorkingNote createEmptyNote(Context context, long folderId, int widgetId, - int widgetType, int defaultBgColorId) { + int widgetType, int defaultBgColorId) { //创建空的Note，参数context，文件夹id，背景颜色widget WorkingNote note = new WorkingNote(context, folderId); note.setBgColorId(defaultBgColorId); note.setWidgetId(widgetId); @@ -186,9 +186,9 @@ public class WorkingNote { public static WorkingNote load(Context context, long id) { return new WorkingNote(context, id, 0); } - +//保存Note public synchronized boolean saveNote() { - if (isWorthSaving()) { + if (isWorthSaving()) { //是否值得保存 if (!existInDatabase()) { if ((mNoteId = Note.getNewNoteId(mContext, mFolderId)) == 0) { Log.e(TAG, "Create new note fail with id:" + mNoteId); @@ -214,9 +214,9 @@ public class WorkingNote { public boolean existInDatabase() { return mNoteId > 0; - } + } //是否存在 - private boolean isWorthSaving() { + private boolean isWorthSaving() { //判断是否值得保存 if (mIsDeleted || (!existInDatabase() && TextUtils.isEmpty(mContent)) || (existInDatabase() && !mNote.isLocalModified())) { return false; @@ -239,7 +239,7 @@ public class WorkingNote { } } - public void markDeleted(boolean mark) { + public void markDeleted(boolean mark) { //设置删除标记 mIsDeleted = mark; if (mWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID && mWidgetType != Notes.TYPE_WIDGET_INVALIDE && mNoteSettingStatusListener != null) { @@ -247,7 +247,7 @@ public class WorkingNote { } } - public void setBgColorId(int id) { + public void setBgColorId(int id) { //设置背景颜色 if (id != mBgColorId) { mBgColorId = id; if (mNoteSettingStatusListener != null) { @@ -257,7 +257,7 @@ public class WorkingNote { } } - public void setCheckListMode(int mode) { + public void setCheckListMode(int mode) {//检查Mode if (mMode != mode) { if (mNoteSettingStatusListener != null) { mNoteSettingStatusListener.onCheckListModeChanged(mMode, mode); @@ -267,7 +267,7 @@ public class WorkingNote { } } - public void setWidgetType(int type) { + public void setWidgetType(int type) { //设置widget，参数为type，下面一个参数为ID if (type != mWidgetType) { mWidgetType = type; mNote.setNoteValue(NoteColumns.WIDGET_TYPE, String.valueOf(mWidgetType)); @@ -281,11 +281,11 @@ public class WorkingNote { } } - public void setWorkingText(String text) { + public void setWorkingText(String text) { //设置workingText，参数为更改的text if (!TextUtils.equals(mContent, text)) { mContent = text; mNote.setTextData(DataColumns.CONTENT, mContent); - } + }//调用Note的setTextData更改Text } public void convertToCallNote(String phoneNumber, long callDate) { @@ -297,52 +297,52 @@ public class WorkingNote { public boolean hasClockAlert() { return (mAlertDate > 0 ? true : false); } - +//判断是否有时钟题型 public String getContent() { return mContent; } - +//获取content public long getAlertDate() { return mAlertDate; } - + //获取tAlertDate public long getModifiedDate() { return mModifiedDate; } - + //获取ModifiedDate public int getBgColorResId() { return NoteBgResources.getNoteBgResource(mBgColorId); } - + //获取背景颜色来源ID public int getBgColorId() { return mBgColorId; } - +//获取背景颜色ID public int getTitleBgResId() { return NoteBgResources.getNoteTitleBgResource(mBgColorId); } - +//获取标题背景颜色ID public int getCheckListMode() { return mMode; } - + //获取CheckListMode public long getNoteId() { return mNoteId; } - + //获取便签ID public long getFolderId() { return mFolderId; } - +//获取文件夹ID public int getWidgetId() { return mWidgetId; } - +//获取WidgetId public int getWidgetType() { return mWidgetType; } - - public interface NoteSettingChangedListener { +//获取WidgetType + public interface NoteSettingChangedListener { //创建NoteSettingChangedListener接口，便签更新监视 /** * Called when the background color of current note has just changed */ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java index 39f6ec4..9f761c9 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java @@ -42,6 +42,7 @@ public class BackupUtils { private static BackupUtils sInstance; public static synchronized BackupUtils getInstance(Context context) { + //synchronized关键字，表示这个方法加锁，无论那个线程到这里都得检查其他线程有没有正在使用这个线程 if (sInstance == null) { sInstance = new BackupUtils(context); } @@ -68,8 +69,8 @@ public class BackupUtils { private BackupUtils(Context context) { mTextExport = new TextExport(context); } - - private static boolean externalStorageAvailable() { +//初始化工作 + private static boolean externalStorageAvailable() { //外部存储是否可用 return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()); } @@ -128,19 +129,20 @@ public class BackupUtils { public TextExport(Context context) { TEXT_FORMAT = context.getResources().getStringArray(R.array.format_for_exported_note); mContext = context; - mFileName = ""; + mFileName = "";//为空，只是为了进行初始化可用，后序再进行重命名，下面一个也是 mFileDirectory = ""; } private String getFormat(int id) { return TEXT_FORMAT[id]; - } + } //获取文本组成部分 /** * Export the folder identified by folder id to text */ private void exportFolderToText(String folderId, PrintStream ps) { // Query notes belong to this folder + //查询属于folder下的note Cursor notesCursor = mContext.getContentResolver().query(Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, NoteColumns.PARENT_ID + "=?", new String[] { folderId @@ -149,13 +151,13 @@ public class BackupUtils { if (notesCursor != null) { if (notesCursor.moveToFirst()) { do { - // Print note's last modified date + // Print note's last modified date 打印最后更新的日志 ps.println(String.format(getFormat(FORMAT_NOTE_DATE), DateFormat.format( mContext.getString(R.string.format_datetime_mdhm), notesCursor.getLong(NOTE_COLUMN_MODIFIED_DATE)))); // Query data belong to this note String noteId = notesCursor.getString(NOTE_COLUMN_ID); - exportNoteToText(noteId, ps); + exportNoteToText(noteId, ps); //文件导出到text } while (notesCursor.moveToNext()); } notesCursor.close(); @@ -171,7 +173,7 @@ public class BackupUtils { noteId }, null); - if (dataCursor != null) { + if (dataCursor != null) {//光标扫描，区别call note 和note两种便签 if (dataCursor.moveToFirst()) { do { String mimeType = dataCursor.getString(DATA_COLUMN_MIME_TYPE); @@ -218,7 +220,7 @@ public class BackupUtils { /** * Note will be exported as text which is user readable */ - public int exportToText() { + public int exportToText() { //总函数，调用上面的两个函数 if (!externalStorageAvailable()) { Log.d(TAG, "Media was not mounted"); return STATE_SD_CARD_UNMOUONTED; @@ -257,7 +259,7 @@ public class BackupUtils { folderCursor.close(); } - // Export notes in root's folder + // Export notes in root's folder 导出便签 Cursor noteCursor = mContext.getContentResolver().query( Notes.CONTENT_NOTE_URI, NOTE_PROJECTION, @@ -297,7 +299,7 @@ public class BackupUtils { PrintStream ps = null; try { FileOutputStream fos = new FileOutputStream(file); - ps = new PrintStream(fos); + ps = new PrintStream(fos); //将PS输出流输出到选定的文件，目的就是导出到文件而不是直接输出 } catch (FileNotFoundException e) { e.printStackTrace(); return null; @@ -315,15 +317,15 @@ public class BackupUtils { private static File generateFileMountedOnSDcard(Context context, int filePathResId, int fileNameFormatResId) { StringBuilder sb = new StringBuilder(); sb.append(Environment.getExternalStorageDirectory()); - sb.append(context.getString(filePathResId)); - File filedir = new File(sb.toString()); + sb.append(context.getString(filePathResId));//文件的存储路径 + File filedir = new File(sb.toString());//filedir用来存储路径信息 sb.append(context.getString( fileNameFormatResId, DateFormat.format(context.getString(R.string.format_date_ymd), System.currentTimeMillis()))); File file = new File(sb.toString()); - try { + try { //如果这些文件不存在，则新建一个 if (!filedir.exists()) { filedir.mkdir(); } @@ -335,7 +337,7 @@ public class BackupUtils { e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); - } + }//异常处理 return null; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java index 2a14982..d3fd844 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java @@ -52,13 +52,14 @@ public class DataUtils { if(id == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Don't delete system folder root"); continue; - } + }//如果是根文件夹则不删除 ContentProviderOperation.Builder builder = ContentProviderOperation .newDelete(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id)); operationList.add(builder.build()); } try { ContentProviderResult[] results = resolver.applyBatch(Notes.AUTHORITY, operationList); + //数据库事务，由一组数据库操作序列组成作为一个整体被执行 if (results == null || results.length == 0 || results[0] == null) { Log.d(TAG, "delete notes failed, ids:" + ids.toString()); return false; @@ -78,7 +79,7 @@ public class DataUtils { values.put(NoteColumns.ORIGIN_PARENT_ID, srcFolderId); values.put(NoteColumns.LOCAL_MODIFIED, 1); resolver.update(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, id), values, null, null); - } + }//将ids里包含的数据依次家儒operationList中，等待处理 public static boolean batchMoveToFolder(ContentResolver resolver, HashSet ids, long folderId) { @@ -119,7 +120,7 @@ public class DataUtils { new String[] { "COUNT(*)" }, NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>?", new String[] { String.valueOf(Notes.TYPE_FOLDER), String.valueOf(Notes.ID_TRASH_FOLER)}, - null); + null);//查询条件，type符合且不属于垃圾文件夹 int count = 0; if(cursor != null) { @@ -142,7 +143,7 @@ public class DataUtils { NoteColumns.TYPE + "=? AND " + NoteColumns.PARENT_ID + "<>" + Notes.ID_TRASH_FOLER, new String [] {String.valueOf(type)}, null); - + //通过名字查询是否存在 boolean exist = false; if (cursor != null) { if (cursor.getCount() > 0) { @@ -250,7 +251,7 @@ public class DataUtils { + CallNote.PHONE_NUMBER + ",?)", new String [] { String.valueOf(callDate), CallNote.CONTENT_ITEM_TYPE, phoneNumber }, null); - + //通过数据库操作，查询条件是传入的参数 if (cursor != null) { if (cursor.moveToFirst()) { try { diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java index 666b729..e5473b6 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java @@ -16,7 +16,7 @@ package net.micode.notes.tool; -public class GTaskStringUtils { +public class GTaskStringUtils { //这个类就是定义一堆静态数据，为jsonObject提供key，把这些定义全部写到一个类里面 public final static String GTASK_JSON_ACTION_ID = "action_id"; diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java index 1ad3ad6..1b7d08d 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java @@ -64,7 +64,7 @@ public class ResourceParser { return BG_EDIT_TITLE_RESOURCES[id]; } } - +//直接获取背景颜色 public static int getDefaultBgId(Context context) { if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean( NotesPreferenceActivity.PREFERENCE_SET_BG_COLOR_KEY, false)) { @@ -168,6 +168,7 @@ public class ResourceParser { * The id may larger than the length of resources, in this case, * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} */ + //如果输入的id大于资源总量，则自动返回默认的设置结果 if (id >= TEXTAPPEARANCE_RESOURCES.length) { return BG_DEFAULT_FONT_SIZE; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java index ec6f819..275c0b9 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java @@ -32,7 +32,7 @@ import net.micode.notes.tool.ResourceParser; import net.micode.notes.ui.NoteEditActivity; import net.micode.notes.ui.NotesListActivity; -public abstract class NoteWidgetProvider extends AppWidgetProvider { +public abstract class NoteWidgetProvider extends AppWidgetProvider {//构造了一个类继承Android原有的AppWidgetProvider类 public static final String [] PROJECTION = new String [] { NoteColumns.ID, NoteColumns.BG_COLOR_ID, @@ -42,8 +42,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { public static final int COLUMN_ID = 0; public static final int COLUMN_BG_COLOR_ID = 1; public static final int COLUMN_SNIPPET = 2; - - private static final String TAG = "NoteWidgetProvider"; + private static final String TAG = "NoteWidgetProvider";//定义TAG为NoteWidgetProvider @Override public void onDeleted(Context context, int[] appWidgetIds) { @@ -55,7 +54,9 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { NoteColumns.WIDGET_ID + "=?", new String[] { String.valueOf(appWidgetIds[i])}); } - } + }/* 方法：重载删除的过程，在删除的同时，把当前对应的窗口给关闭， + 也即把WIDGET_ID映射为INVALID_APPWIGET_ID， + 就是把当前窗口id标记为无效窗口。然后把这个修改应用到所有关联的uri便签 */ private Cursor getNoteWidgetInfo(Context context, int widgetId) { return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, @@ -67,10 +68,10 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { update(context, appWidgetManager, appWidgetIds, false); - } + }//更新widget的信息 private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, - boolean privacyMode) { + boolean privacyMode) {//widget信息的更新方法 for (int i = 0; i < appWidgetIds.length; i++) { if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { int bgId = ResourceParser.getDefaultBgId(context); @@ -105,6 +106,7 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); /** * Generate the pending intent to start host for the widget + * 为小部件生成启动主机的挂起意图 */ PendingIntent pendingIntent = null; if (privacyMode) { @@ -124,9 +126,9 @@ public abstract class NoteWidgetProvider extends AppWidgetProvider { } } - protected abstract int getBgResourceId(int bgId); + protected abstract int getBgResourceId(int bgId);//从背景资源中获取当前应用ID - protected abstract int getLayoutId(); + protected abstract int getLayoutId();//获取部局ID - protected abstract int getWidgetType(); + protected abstract int getWidgetType();//获取挂件的类型，即2x2型或者4x4型 } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java index adcb2f7..d1586ec 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.micode.notes.widget; +package net.micode.notes.widget;//声明小米便签窗口部件包 import android.appwidget.AppWidgetManager; import android.content.Context; @@ -24,24 +24,24 @@ import net.micode.notes.data.Notes; import net.micode.notes.tool.ResourceParser; -public class NoteWidgetProvider_2x extends NoteWidgetProvider { +public class NoteWidgetProvider_2x extends NoteWidgetProvider {//定义2*2大小的widget @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + } //更新窗口 @Override protected int getLayoutId() { return R.layout.widget_2x; - } + }//获取窗口布局 @Override - protected int getBgResourceId(int bgId) { + protected int getBgResourceId(int bgId) {//获取背景颜色id return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); } @Override protected int getWidgetType() { return Notes.TYPE_WIDGET_2X; - } + } //确定窗口大小 } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java index c12a02e..1e85f60 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java +++ b/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.micode.notes.widget; +package net.micode.notes.widget;//声明小米便签窗口部件包 import android.appwidget.AppWidgetManager; import android.content.Context; @@ -28,14 +28,14 @@ public class NoteWidgetProvider_4x extends NoteWidgetProvider { @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { super.update(context, appWidgetManager, appWidgetIds); - } + }//更新窗口 protected int getLayoutId() { return R.layout.widget_4x; - } + }//获取窗口布局 @Override - protected int getBgResourceId(int bgId) { + protected int getBgResourceId(int bgId) {//获取背景颜色id return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); } @@ -43,4 +43,4 @@ public class NoteWidgetProvider_4x extends NoteWidgetProvider { protected int getWidgetType() { return Notes.TYPE_WIDGET_4X; } -} +} //确定窗口大小 diff --git a/src/Notes-master1/app/src/main/res/values/styles.xml b/src/Notes-master1/app/src/main/res/values/styles.xml index d750e65..486abc0 100644 --- a/src/Notes-master1/app/src/main/res/values/styles.xml +++ b/src/Notes-master1/app/src/main/res/values/styles.xml @@ -63,7 +63,7 @@ \ No newline at end of file