diff --git a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin index 9671810..a1c6988 100644 Binary files a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin and b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock index c9d88d7..6e017ad 100644 Binary files a/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock and b/src/Notes1/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin index a41f028..be4cb1b 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin and b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock index 508f32a..d9f35a3 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock and b/src/Notes1/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 5a0e0df..8f97481 100644 Binary files a/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/src/Notes1/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4dead0a..72819d2 100644 Binary files a/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes1/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin index c9ba6ad..02f5440 100644 Binary files a/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes1/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes1/.gradle/file-system.probe b/src/Notes1/.gradle/file-system.probe index 281cd56..30fd9fb 100644 Binary files a/src/Notes1/.gradle/file-system.probe and b/src/Notes1/.gradle/file-system.probe differ diff --git a/src/Notes1/.idea/misc.xml b/src/Notes1/.idea/misc.xml index 9a14ea9..dcdbbe6 100644 --- a/src/Notes1/.idea/misc.xml +++ b/src/Notes1/.idea/misc.xml @@ -5,6 +5,11 @@ + + + + + diff --git a/src/Notes1/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 b/src/Notes1/.idea/sonarlint/issuestore/f/0/f07866736216be0ee2aba49e392191aeae700a35 deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes1/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 b/src/Notes1/.idea/sonarlint/issuestore/f/4/f4a01d6a4fcb971362ec00a83903fd3902f52164 deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes1/.idea/sonarlint/issuestore/index.pb b/src/Notes1/.idea/sonarlint/issuestore/index.pb index b8ab56f..5bd14ce 100644 --- a/src/Notes1/.idea/sonarlint/issuestore/index.pb +++ b/src/Notes1/.idea/sonarlint/issuestore/index.pb @@ -1,13 +1,13 @@ h 8app/src/main/java/net/micode/notes/ui/NotesListItem.java,5\d\5dfe6902d8ec740690f88d644e74362c3be08fad -< - build.gradle,f\0\f07866736216be0ee2aba49e392191aeae700a35 -@ -app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 i 9app/src/main/java/net/micode/notes/ui/DateTimePicker.java,6\c\6cbf8bd9aa98eff862b1dc067330ba66ba4493aa l + + + + + \ No newline at end of file diff --git a/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk index 5d1b9a2..75d449b 100644 Binary files a/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes1/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 95cf5c5..f0d431e 100644 Binary files a/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 309cf8b..fb96d1d 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index 10dfe2c..6b30cac 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index 0e26497..8735d15 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index 60a570a..3df069e 100644 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_0/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_1/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_2/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_3/graph.bin b/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_cefb55a53e48144c3a5b5b40bae4d4d3ecb9fa8b75eadc86ac4eaafd9aa831d9_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 8c6e1fc..d6b3736 100644 Binary files a/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 40fc2d8..7cb5fda 100644 Binary files a/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 30aa85f..fb8c560 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,98 +1,98 @@ -#Mon Oct 17 08:43:15 CST 2022 -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/menu/private_folder.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_private_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/layout/password.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_password.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes1\\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\:\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +#Tue Oct 18 08:59:21 CST 2022 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/menu/private_folder.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_private_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/layout/password.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_password.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\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\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index 4cbd4e4..0000000 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,109 +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/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index 67c3c57..0000000 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Move To Private Folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index d159861..75b0208 100644 --- a/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameMove To Private FolderThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - Move To Private Folder + 短信 邮件 - 便签便签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/Notes1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index c7736a3..44a807d 100644 --- a/src/Notes1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes1/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/Notes1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index d933cc2..05a8e39 100644 --- a/src/Notes1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes1/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/Notes1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 6ef0356..0677784 100644 --- a/src/Notes1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes1/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/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d04f7ae..de1c202 100644 --- a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Mon Oct 17 16:26:55 CST 2022 -base.0=D\:\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Wed Oct 19 00:06:15 CST 2022 +base.0=D\:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index ee7745c..1a044ca 100644 Binary files a/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 508f79a..325f1f2 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index f105e8c..81162f1 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 79598f6..96e43d9 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 040fd7e..3c7ed95 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 615cdba..5dba0ba 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index d19e4f3..f18b063 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 324cf82..66f459f 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 074695c..fea76d1 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class index 0626b74..37285fa 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$4.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class index cda52dc..3b4283c 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$5.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index d494ed2..6f5fc49 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 7ea35d4..feb2dba 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 93cd34b..8651486 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 0d4836a..66932bc 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 7598ed0..07c5376 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class differ diff --git a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index efd2b98..c873a9b 100644 Binary files a/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/Notes1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 1c4a36d..16aaef0 100644 --- a/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,253 +20,253 @@ 20 android:versionName="0.1" > 21 22 D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +22-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="14" -23-->D:\Notes1\app\src\main\AndroidManifest.xml:24:15-41 +23-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="29" /> -24-->D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +24-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\Notes1\app\src\main\AndroidManifest.xml:26:5-81 -26-->D:\Notes1\app\src\main\AndroidManifest.xml:26:22-78 +26-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\Notes1\app\src\main\AndroidManifest.xml:27:5-88 -27-->D:\Notes1\app\src\main\AndroidManifest.xml:27:22-85 +27-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\Notes1\app\src\main\AndroidManifest.xml:28:5-67 -28-->D:\Notes1\app\src\main\AndroidManifest.xml:28:22-64 +28-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\Notes1\app\src\main\AndroidManifest.xml:29:5-72 -29-->D:\Notes1\app\src\main\AndroidManifest.xml:29:22-69 +29-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\Notes1\app\src\main\AndroidManifest.xml:30:5-74 -30-->D:\Notes1\app\src\main\AndroidManifest.xml:30:22-71 +30-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\Notes1\app\src\main\AndroidManifest.xml:31:5-80 -31-->D:\Notes1\app\src\main\AndroidManifest.xml:31:22-77 +31-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\Notes1\app\src\main\AndroidManifest.xml:32:5-71 -32-->D:\Notes1\app\src\main\AndroidManifest.xml:32:22-68 +32-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\Notes1\app\src\main\AndroidManifest.xml:33:5-74 -33-->D:\Notes1\app\src\main\AndroidManifest.xml:33:22-71 +33-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\Notes1\app\src\main\AndroidManifest.xml:34:5-81 -34-->D:\Notes1\app\src\main\AndroidManifest.xml:34:22-78 +34-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\Notes1\app\src\main\AndroidManifest.xml:36:5-151:19 +36-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:36:5-151:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\Notes1\app\src\main\AndroidManifest.xml:37:9-42 +38-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:37:9-42 39 android:label="@string/app_name" -39-->D:\Notes1\app\src\main\AndroidManifest.xml:38:9-41 +39-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:38:9-41 40 android:testOnly="true" > 41 D:\Notes1\app\src\main\AndroidManifest.xml:39:9-52:20 +41-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:39:9-52:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\Notes1\app\src\main\AndroidManifest.xml:40:13-49 +42-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:40:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\Notes1\app\src\main\AndroidManifest.xml:41:13-74 +43-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:41:13-74 44 android:label="@string/app_name" -44-->D:\Notes1\app\src\main\AndroidManifest.xml:42:13-45 +44-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:42:13-45 45 android:launchMode="singleTop" -45-->D:\Notes1\app\src\main\AndroidManifest.xml:43:13-43 +45-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:43:13-43 46 android:theme="@style/NoteTheme" -46-->D:\Notes1\app\src\main\AndroidManifest.xml:44:13-45 +46-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:44:13-45 47 android:windowSoftInputMode="adjustPan" > -47-->D:\Notes1\app\src\main\AndroidManifest.xml:46:13-52 +47-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:46:13-52 48 -48-->D:\Notes1\app\src\main\AndroidManifest.xml:48:13-51:29 +48-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:48:13-51:29 49 -49-->D:\Notes1\app\src\main\AndroidManifest.xml:49:17-69 -49-->D:\Notes1\app\src\main\AndroidManifest.xml:49:25-66 +49-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:49:17-69 +49-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:49:25-66 50 51 -51-->D:\Notes1\app\src\main\AndroidManifest.xml:50:17-77 -51-->D:\Notes1\app\src\main\AndroidManifest.xml:50:27-74 +51-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:50:17-77 +51-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:50:27-74 52 53 54 D:\Notes1\app\src\main\AndroidManifest.xml:54:9-83:20 +54-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:54:9-83:20 55 android:name="net.micode.notes.ui.NoteEditActivity" -55-->D:\Notes1\app\src\main\AndroidManifest.xml:55:13-48 +55-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:55:13-48 56 android:configChanges="keyboardHidden|orientation|screenSize" -56-->D:\Notes1\app\src\main\AndroidManifest.xml:56:13-74 +56-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:56:13-74 57 android:launchMode="singleTop" -57-->D:\Notes1\app\src\main\AndroidManifest.xml:57:13-43 +57-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:57:13-43 58 android:theme="@style/NoteTheme" > -58-->D:\Notes1\app\src\main\AndroidManifest.xml:58:13-45 +58-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:58:13-45 59 -59-->D:\Notes1\app\src\main\AndroidManifest.xml:60:13-66:29 -59-->D:\Notes1\app\src\main\AndroidManifest.xml:60:28-49 +59-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:60:13-66:29 +59-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:60:28-49 60 -60-->D:\Notes1\app\src\main\AndroidManifest.xml:62:17-69 -60-->D:\Notes1\app\src\main\AndroidManifest.xml:62:25-66 +60-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:62:17-69 +60-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:62:25-66 61 62 -62-->D:\Notes1\app\src\main\AndroidManifest.xml:63:17-76 -62-->D:\Notes1\app\src\main\AndroidManifest.xml:63:27-73 +62-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:17-76 +62-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:27-73 63 64 -64-->D:\Notes1\app\src\main\AndroidManifest.xml:64:17-78 -64-->D:\Notes1\app\src\main\AndroidManifest.xml:64:23-75 +64-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:17-78 +64-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:23-75 65 -65-->D:\Notes1\app\src\main\AndroidManifest.xml:64:17-78 -65-->D:\Notes1\app\src\main\AndroidManifest.xml:64:23-75 +65-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:17-78 +65-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:23-75 66 67 -67-->D:\Notes1\app\src\main\AndroidManifest.xml:68:13-73:29 +67-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:68:13-73:29 68 -68-->D:\Notes1\app\src\main\AndroidManifest.xml:69:17-79 -68-->D:\Notes1\app\src\main\AndroidManifest.xml:69:25-76 +68-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:69:17-79 +68-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:69:25-76 69 70 -70-->D:\Notes1\app\src\main\AndroidManifest.xml:63:17-76 -70-->D:\Notes1\app\src\main\AndroidManifest.xml:63:27-73 +70-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:17-76 +70-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:27-73 71 72 -72-->D:\Notes1\app\src\main\AndroidManifest.xml:64:17-78 -72-->D:\Notes1\app\src\main\AndroidManifest.xml:64:23-75 +72-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:17-78 +72-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:23-75 73 -73-->D:\Notes1\app\src\main\AndroidManifest.xml:64:17-78 -73-->D:\Notes1\app\src\main\AndroidManifest.xml:64:23-75 +73-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:17-78 +73-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:23-75 74 75 -75-->D:\Notes1\app\src\main\AndroidManifest.xml:75:13-78:29 +75-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:75:13-78:29 76 -76-->D:\Notes1\app\src\main\AndroidManifest.xml:76:17-71 -76-->D:\Notes1\app\src\main\AndroidManifest.xml:76:25-68 +76-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:76:17-71 +76-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:76:25-68 77 78 -78-->D:\Notes1\app\src\main\AndroidManifest.xml:63:17-76 -78-->D:\Notes1\app\src\main\AndroidManifest.xml:63:27-73 +78-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:17-76 +78-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:27-73 79 80 81 D:\Notes1\app\src\main\AndroidManifest.xml:80:13-82:54 +81-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:80:13-82:54 82 android:name="android.app.searchable" -82-->D:\Notes1\app\src\main\AndroidManifest.xml:81:17-54 +82-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:81:17-54 83 android:resource="@xml/searchable" /> -83-->D:\Notes1\app\src\main\AndroidManifest.xml:82:17-51 +83-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:82:17-51 84 85 86 D:\Notes1\app\src\main\AndroidManifest.xml:85:9-88:43 +86-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:85:9-88:43 87 android:name="net.micode.notes.data.NotesProvider" -87-->D:\Notes1\app\src\main\AndroidManifest.xml:86:13-63 +87-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:86:13-63 88 android:authorities="micode_notes" -88-->D:\Notes1\app\src\main\AndroidManifest.xml:87:13-47 +88-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:87:13-47 89 android:multiprocess="true" /> -89-->D:\Notes1\app\src\main\AndroidManifest.xml:88:13-40 +89-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:88:13-40 90 91 D:\Notes1\app\src\main\AndroidManifest.xml:90:9-102:20 +91-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:90:9-102:20 92 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -92-->D:\Notes1\app\src\main\AndroidManifest.xml:91:13-57 +92-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:91:13-57 93 android:label="@string/app_widget2x2" > -93-->D:\Notes1\app\src\main\AndroidManifest.xml:92:13-50 +93-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:92:13-50 94 -94-->D:\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 +94-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 95 -95-->D:\Notes1\app\src\main\AndroidManifest.xml:94:17-84 -95-->D:\Notes1\app\src\main\AndroidManifest.xml:94:25-81 +95-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:17-84 +95-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:25-81 96 -96-->D:\Notes1\app\src\main\AndroidManifest.xml:95:17-85 -96-->D:\Notes1\app\src\main\AndroidManifest.xml:95:25-82 +96-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:17-85 +96-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:25-82 97 -97-->D:\Notes1\app\src\main\AndroidManifest.xml:96:17-85 -97-->D:\Notes1\app\src\main\AndroidManifest.xml:96:25-82 +97-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:17-85 +97-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:25-82 98 99 100 D:\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 +100-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 101 android:name="android.appwidget.provider" -101-->D:\Notes1\app\src\main\AndroidManifest.xml:100:17-58 +101-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:100:17-58 102 android:resource="@xml/widget_2x_info" /> -102-->D:\Notes1\app\src\main\AndroidManifest.xml:101:17-55 +102-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:101:17-55 103 104 D:\Notes1\app\src\main\AndroidManifest.xml:103:9-116:20 +104-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:103:9-116:20 105 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -105-->D:\Notes1\app\src\main\AndroidManifest.xml:104:13-57 +105-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:104:13-57 106 android:label="@string/app_widget4x4" > -106-->D:\Notes1\app\src\main\AndroidManifest.xml:105:13-50 +106-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:105:13-50 107 -107-->D:\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 +107-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 108 -108-->D:\Notes1\app\src\main\AndroidManifest.xml:94:17-84 -108-->D:\Notes1\app\src\main\AndroidManifest.xml:94:25-81 +108-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:17-84 +108-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:25-81 109 -109-->D:\Notes1\app\src\main\AndroidManifest.xml:95:17-85 -109-->D:\Notes1\app\src\main\AndroidManifest.xml:95:25-82 +109-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:17-85 +109-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:25-82 110 -110-->D:\Notes1\app\src\main\AndroidManifest.xml:96:17-85 -110-->D:\Notes1\app\src\main\AndroidManifest.xml:96:25-82 +110-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:17-85 +110-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:25-82 111 112 113 D:\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 +113-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 114 android:name="android.appwidget.provider" -114-->D:\Notes1\app\src\main\AndroidManifest.xml:100:17-58 +114-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:100:17-58 115 android:resource="@xml/widget_4x_info" /> -115-->D:\Notes1\app\src\main\AndroidManifest.xml:101:17-55 +115-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:101:17-55 116 117 -117-->D:\Notes1\app\src\main\AndroidManifest.xml:118:9-122:20 -117-->D:\Notes1\app\src\main\AndroidManifest.xml:118:19-55 +117-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:118:9-122:20 +117-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:118:19-55 118 -118-->D:\Notes1\app\src\main\AndroidManifest.xml:119:13-121:29 +118-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:119:13-121:29 119 -119-->D:\Notes1\app\src\main\AndroidManifest.xml:120:17-79 -119-->D:\Notes1\app\src\main\AndroidManifest.xml:120:25-76 +119-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:120:17-79 +119-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:120:25-76 120 121 122 D:\Notes1\app\src\main\AndroidManifest.xml:124:9-127:20 +122-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:124:9-127:20 123 android:name="net.micode.notes.ui.AlarmReceiver" -123-->D:\Notes1\app\src\main\AndroidManifest.xml:125:13-61 +123-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:125:13-61 124 android:process=":remote" > -124-->D:\Notes1\app\src\main\AndroidManifest.xml:126:13-38 +124-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:126:13-38 125 126 127 D:\Notes1\app\src\main\AndroidManifest.xml:129:9-134:20 +127-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:129:9-134:20 128 android:name="net.micode.notes.ui.AlarmAlertActivity" -128-->D:\Notes1\app\src\main\AndroidManifest.xml:130:13-50 +128-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:130:13-50 129 android:label="@string/app_name" -129-->D:\Notes1\app\src\main\AndroidManifest.xml:131:13-45 +129-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:131:13-45 130 android:launchMode="singleInstance" -130-->D:\Notes1\app\src\main\AndroidManifest.xml:132:13-48 +130-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:132:13-48 131 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -131-->D:\Notes1\app\src\main\AndroidManifest.xml:133:13-75 +131-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:133:13-75 132 133 D:\Notes1\app\src\main\AndroidManifest.xml:136:9-141:20 +133-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:136:9-141:20 134 android:name="net.micode.notes.ui.NotesPreferenceActivity" -134-->D:\Notes1\app\src\main\AndroidManifest.xml:137:13-71 +134-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:137:13-71 135 android:label="@string/preferences_title" -135-->D:\Notes1\app\src\main\AndroidManifest.xml:138:13-54 +135-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:138:13-54 136 android:launchMode="singleTop" -136-->D:\Notes1\app\src\main\AndroidManifest.xml:139:13-43 +136-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:139:13-43 137 android:theme="@android:style/Theme.Holo.Light" > -137-->D:\Notes1\app\src\main\AndroidManifest.xml:140:13-60 +137-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:140:13-60 138 139 140 D:\Notes1\app\src\main\AndroidManifest.xml:143:9-146:19 +140-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:143:9-146:19 141 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -141-->D:\Notes1\app\src\main\AndroidManifest.xml:144:13-74 +141-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:144:13-74 142 android:exported="false" > -142-->D:\Notes1\app\src\main\AndroidManifest.xml:145:13-37 +142-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:145:13-37 143 144 145 D:\Notes1\app\src\main\AndroidManifest.xml:148:9-150:52 +145-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:148:9-150:52 146 android:name="android.app.default_searchable" -146-->D:\Notes1\app\src\main\AndroidManifest.xml:149:13-58 +146-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:149:13-58 147 android:value=".ui.NoteEditActivity" /> -147-->D:\Notes1\app\src\main\AndroidManifest.xml:150:13-49 +147-->D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:150:13-49 148 149 150 diff --git a/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index 7d81acf..93972d8 100644 Binary files a/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/src/Notes1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 6afa3e4..5688792 100644 --- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,59 +1,17 @@ { "logs": [ - { - "outputFile": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, { "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\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,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,2939,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2987,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,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", + "startOffsets": "6709,3622,3555,3481,3430,846,887,936,6251,6297,6654,6603,1225,3994,4063,3934,3868,3804,4738,4677,4613,4197,2993,1398,1452,4252,3696,6355,3370,3153,1838,2125,2376,1892,2878,2824,2772,2573,2524,2428,2477,2620,2668,2169,3310,2939,2719,3197,2081,2328,2271,2215,3097,2036,3054,1943,1985,3250,1346,1657,1755,1609,1707,1561,1515,1173,1119,5120,5060,5263,6176,5579,5509,5644,5723,5908,5834,5196,5453,5321,5387,5010,6013,6097,6564,6455,6406,6501,1288,4141,4553,4853,4794,4921,4504,4458,4409,4357,985,1052", + "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,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,52,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": "6883,3690,3616,3549,3475,881,930,979,6291,6349,6703,6648,1282,4057,4135,3988,3928,3862,4788,4732,4671,4246,3048,1446,1509,4332,3772,6400,3424,3191,1886,2163,2422,1937,2933,2872,2818,2614,2567,2471,2518,2662,2713,2209,3364,2987,2766,3244,2119,2370,2322,2265,3147,2075,3091,1979,2030,3304,1392,1701,1799,1651,1749,1603,1555,1219,1167,5190,5114,5315,6245,5638,5573,5717,5828,6007,5902,5257,5503,5381,5447,5054,6091,6170,6597,6495,6449,6558,1340,4191,4607,4915,4847,4978,4547,4498,4452,4403,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", @@ -65,11 +23,14 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { "startLines": "2", @@ -86,41 +47,14 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "126,130,134,138,141,145,149,153,157,161,165", @@ -132,11 +66,14 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -148,14 +85,31 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8204,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3461,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8612,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3523,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8204,4038,4302,4205,4135,846,890,943,7692,7742,8145,8093,1308,4762,4857,4690,4605,4521,5736,5652,5549,5035,2043,1991,3529,1515,1569,5097,2138,4386,7806,3966,3717,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3899,3461,3206,3767,2471,2769,2680,2621,3654,2420,3608,2315,2359,3831,1459,1784,1894,1736,1840,1679,1630,1252,1198,6199,6131,6443,7593,6812,6730,6887,6977,7221,7141,6284,6360,6670,6508,6589,6075,7366,7489,8051,7922,7864,7976,1393,4966,5462,5873,5803,5954,5402,5346,5283,5222,996,1107", + "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,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": "8612,4129,4380,4296,4199,884,937,990,7736,7800,8198,8139,1387,4851,4960,4756,4684,4599,5797,5730,5646,5091,2100,2037,3602,1563,1624,5197,2192,4483,7856,4032,3761,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3960,3523,3263,3825,2513,2819,2763,2674,3711,2465,3648,2353,2414,3893,1509,1834,1942,1778,1888,1730,1673,1302,1246,6278,6193,6502,7684,6881,6806,6971,7135,7360,7215,6354,6437,6724,6583,6664,6125,7483,7587,8087,7970,7916,8045,1453,5029,5543,5948,5867,6043,5456,5396,5340,5277,1101,1192" }, "to": { "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", @@ -165,57 +119,9 @@ "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,66,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,4291,4353,4416,4463,4518,4606,4664,4726,4776,4821,4864,4924,4991,5046,5101,5154,5201,5254,5310,5358,5413,5466,5550,5617,5681,5777,5851,5932,6021,6184,6328,6407,6482,6564,6623,6703,6783,6838,6960,7063,7104,7157,7214,7288,7353,7421,7507,7587,7656,7750,7809,7864,7926,7986,8096,8186" } - } - ] - }, - { - "outputFile": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -230,79 +136,48 @@ "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", + "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "12", + "startLines": "2", "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,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:\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { - "startLines": "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" + "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" } } ] diff --git a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index efc25c1..e0f6dc8 100644 --- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,13 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\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,61,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,2939,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,2987,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "123,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,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", + "startOffsets": "6709,3622,3555,3481,3430,846,887,936,6251,6297,6654,6603,1225,3994,4063,3934,3868,3804,4738,4677,4613,4197,2993,1398,1452,4252,3696,6355,3370,3153,1838,2125,2376,1892,2878,2824,2772,2573,2524,2428,2477,2620,2668,2169,3310,2939,2719,3197,2081,2328,2271,2215,3097,2036,3054,1943,1985,3250,1346,1657,1755,1609,1707,1561,1515,1173,1119,5120,5060,5263,6176,5579,5509,5644,5723,5908,5834,5196,5453,5321,5387,5010,6013,6097,6564,6455,6406,6501,1288,4141,4553,4853,4794,4921,4504,4458,4409,4357,985,1052", + "endLines": "125,73,72,71,70,19,20,21,114,115,122,121,26,79,80,78,77,76,92,91,90,82,62,29,30,83,74,116,69,65,39,45,50,40,60,59,58,54,53,51,52,55,56,46,68,61,57,66,44,49,48,47,64,43,63,41,42,67,28,34,36,33,35,32,31,25,24,99,98,101,113,106,105,107,108,110,109,100,104,102,103,97,111,112,120,118,117,119,27,81,89,94,93,95,88,87,86,85,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,52,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": "6883,3690,3616,3549,3475,881,930,979,6291,6349,6703,6648,1282,4057,4135,3988,3928,3862,4788,4732,4671,4246,3048,1446,1509,4332,3772,6400,3424,3191,1886,2163,2422,1937,2933,2872,2818,2614,2567,2471,2518,2662,2713,2209,3364,2987,2766,3244,2119,2370,2322,2265,3147,2075,3091,1979,2030,3304,1392,1701,1799,1651,1749,1603,1555,1219,1167,5190,5114,5315,6245,5638,5573,5717,5828,6007,5902,5257,5503,5381,5447,5054,6091,6170,6597,6495,6449,6558,1340,4191,4607,4915,4847,4978,4547,4498,4452,4403,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", @@ -22,47 +23,7 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", - "map": [ - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 6c7b904..7453a87 100644 --- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } diff --git a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 0d7d434..9f46efa 100644 --- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,41 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "126,130,134,138,141,145,149,153,157,161,165", @@ -50,11 +23,14 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -66,48 +42,7 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "129,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8204,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3461,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,66,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "8612,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,3523,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,125", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "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,4296,4358,4421,4468,4523,4611,4669,4731,4781,4826,4869,4929,4996,5051,5106,5159,5206,5259,5315,5363,5418,5471,5555,5622,5686,5782,5856,5937,6026,6189,6333,6412,6487,6569,6628,6708,6788,6843,6965,7068,7109,7162,7219,7293,7358,7426,7512,7592,7661,7755,7814,7869,7931,7991,8101", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", - "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,66,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,4291,4353,4416,4463,4518,4606,4664,4726,4776,4821,4864,4924,4991,5046,5101,5154,5201,5254,5310,5358,5413,5466,5550,5617,5681,5777,5851,5932,6021,6184,6328,6407,6482,6564,6623,6703,6783,6838,6960,7063,7104,7157,7214,7288,7353,7421,7507,7587,7656,7750,7809,7864,7926,7986,8096,8186" - } - } - ] - }, - { - "outputFile": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "783,836,890,944,730", - "endColumns": "51,52,52,51,51", - "endOffsets": "830,884,938,991,777" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", @@ -124,60 +59,39 @@ } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,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:\\Notes1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" + "startLines": "129,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8204,4038,4302,4205,4135,846,890,943,7692,7742,8145,8093,1308,4762,4857,4690,4605,4521,5736,5652,5549,5035,2043,1991,3529,1515,1569,5097,2138,4386,7806,3966,3717,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3899,3461,3206,3767,2471,2769,2680,2621,3654,2420,3608,2315,2359,3831,1459,1784,1894,1736,1840,1679,1630,1252,1198,6199,6131,6443,7593,6812,6730,6887,6977,7221,7141,6284,6360,6670,6508,6589,6075,7366,7489,8051,7922,7864,7976,1393,4966,5462,5873,5803,5954,5402,5346,5283,5222,996,1107", + "endLines": "133,73,76,75,74,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,65,29,30,86,41,77,121,72,68,42,48,53,43,63,62,61,57,56,54,55,58,59,49,71,64,60,69,47,52,51,50,67,46,66,44,45,70,28,34,36,33,35,32,31,25,24,102,101,105,117,110,109,111,112,114,113,103,104,108,106,107,100,115,116,126,124,123,125,27,84,92,97,96,98,91,90,89,88,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,66,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": "8612,4129,4380,4296,4199,884,937,990,7736,7800,8198,8139,1387,4851,4960,4756,4684,4599,5797,5730,5646,5091,2100,2037,3602,1563,1624,5197,2192,4483,7856,4032,3761,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3960,3523,3263,3825,2513,2819,2763,2674,3711,2465,3648,2353,2414,3893,1509,1834,1942,1778,1888,1730,1673,1302,1246,6278,6193,6502,7684,6881,6806,6971,7135,7360,7215,6354,6437,6724,6583,6664,6125,7483,7587,8087,7970,7916,8045,1453,5029,5543,5948,5867,6043,5456,5396,5340,5277,1101,1192" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "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,4296,4358,4421,4468,4523,4611,4669,4731,4781,4826,4869,4929,4996,5051,5106,5159,5206,5259,5315,5363,5418,5471,5555,5622,5686,5782,5856,5937,6026,6189,6333,6412,6487,6569,6628,6708,6788,6843,6965,7068,7109,7162,7219,7293,7358,7426,7512,7592,7661,7755,7814,7869,7931,7991,8101", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125", + "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,66,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,4291,4353,4416,4463,4518,4606,4664,4726,4776,4821,4864,4924,4991,5046,5101,5154,5201,5254,5310,5358,5413,5466,5550,5617,5681,5777,5851,5932,6021,6184,6328,6407,6482,6564,6623,6703,6783,6838,6960,7063,7104,7157,7214,7288,7353,7421,7507,7587,7656,7750,7809,7864,7926,7986,8096,8186" } }, { - "source": "D:\\Notes1\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\MiNote_maintain\\new_MiCode\\src\\Notes1\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" }, "to": { - "startLines": "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" + "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/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 989956e..e954b41 100644 --- a/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -3,14 +3,14 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" @@ -99,14 +99,14 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" @@ -131,10 +131,6 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, - { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" @@ -143,14 +139,14 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" @@ -167,22 +163,22 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list.xml" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" @@ -215,6 +211,10 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, + { + "merged": "net.micode.notes.app-merged_res-5:/layout_password.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/password.xml" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" @@ -279,14 +279,14 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" @@ -335,38 +335,38 @@ "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, - { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_private_folder.xml.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\private_folder.xml" - }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\menu_private_folder.xml.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\menu\\private_folder.xml" }, { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, + { + "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + }, { "merged": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", "source": "C:\\Users\\zqy04\\.gradle\\daemon\\7.3.3\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" diff --git a/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 4f65439..9c67f6b 100644 Binary files a/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/22990cde4711deabd7185c39c4ed653ff850560efbf7a0175dd63a656d936df2_1.jar b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/22990cde4711deabd7185c39c4ed653ff850560efbf7a0175dd63a656d936df2_1.jar deleted file mode 100644 index 620a532..0000000 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/22990cde4711deabd7185c39c4ed653ff850560efbf7a0175dd63a656d936df2_1.jar and /dev/null differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 563e6a2..0ba1428 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 7ac0689..cc0d7b7 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 1de4373..06d0819 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 1b20459..6a15a62 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index b509458..4fe05eb 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 6a54b40..c75b9aa 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index a2452ed..610c955 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index db8d90c..b4d664c 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex index 4b4296a..6aa4ac1 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$4.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex index 9a3939e..e962035 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$5.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 3632773..e5d6e34 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index bf64c54..5da77f3 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index c94758c..44bb82d 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index eb04096..b477445 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 723280f..893a286 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 9ff9d77..9ee45ed 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index b5f4085..7ac758e 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index a028740..e4561b7 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 631e973..7d01f27 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index 0135d31..f0819fd 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index ff24127..dc7faeb 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 7d422f5..c69da83 100644 Binary files a/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/Notes1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes1/app/build/intermediates/runtime_symbol_list/debug/R.txt index 82c4b0d..7dc1336 100644 --- a/src/Notes1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/Notes1/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -116,34 +116,35 @@ int id menu_list_mode 0x7f050026 int id menu_new_folder 0x7f050027 int id menu_new_note 0x7f050028 int id menu_private_folder 0x7f050029 -int id menu_reset_password 0x7f050045 -int id menu_search 0x7f05002a -int id menu_send_to_desktop 0x7f05002b -int id menu_setting 0x7f05002c -int id menu_share 0x7f05002d -int id menu_sync 0x7f05002e -int id minute 0x7f05002f -int id move 0x7f050030 -int id navigation_bar 0x7f050031 -int id note_bg_color_selector 0x7f050032 -int id note_edit_list 0x7f050033 -int id note_edit_view 0x7f050034 -int id note_item 0x7f050035 -int id note_title 0x7f050036 -int id notes_list 0x7f050037 -int id prefenerece_sync_status_textview 0x7f050038 -int id preference_sync_button 0x7f050039 -int id selection_menu 0x7f05003a -int id sv_note_edit 0x7f05003b -int id tv_alert_date 0x7f05003c -int id tv_folder_name 0x7f05003d -int id tv_modified_date 0x7f05003e -int id tv_name 0x7f05003f -int id tv_time 0x7f050040 -int id tv_title 0x7f050041 -int id tv_title_bar 0x7f050042 -int id widget_bg_image 0x7f050043 -int id widget_text 0x7f050044 +int id menu_read 0x7f050046 +int id menu_reset_password 0x7f05002a +int id menu_search 0x7f05002b +int id menu_send_to_desktop 0x7f05002c +int id menu_setting 0x7f05002d +int id menu_share 0x7f05002e +int id menu_sync 0x7f05002f +int id minute 0x7f050030 +int id move 0x7f050031 +int id navigation_bar 0x7f050032 +int id note_bg_color_selector 0x7f050033 +int id note_edit_list 0x7f050034 +int id note_edit_view 0x7f050035 +int id note_item 0x7f050036 +int id note_title 0x7f050037 +int id notes_list 0x7f050038 +int id prefenerece_sync_status_textview 0x7f050039 +int id preference_sync_button 0x7f05003a +int id selection_menu 0x7f05003b +int id sv_note_edit 0x7f05003c +int id tv_alert_date 0x7f05003d +int id tv_folder_name 0x7f05003e +int id tv_modified_date 0x7f05003f +int id tv_name 0x7f050040 +int id tv_time 0x7f050041 +int id tv_title 0x7f050042 +int id tv_title_bar 0x7f050043 +int id widget_bg_image 0x7f050044 +int id widget_text 0x7f050045 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -165,8 +166,8 @@ int menu note_edit 0x7f070002 int menu note_list 0x7f070003 int menu note_list_dropdown 0x7f070004 int menu note_list_options 0x7f070005 -int menu private_folder 0x7f070007 -int menu sub_folder 0x7f070006 +int menu private_folder 0x7f070006 +int menu sub_folder 0x7f070007 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 int string alert_message_delete_folder 0x7f0a0000 @@ -216,62 +217,62 @@ int string menu_font_super 0x7f0a002b int string menu_list_mode 0x7f0a002c int string menu_move 0x7f0a002d int string menu_move_parent_folder 0x7f0a002e -int string menu_move_to_PF 0x7f0a0066 -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 +int string menu_move_to_PF 0x7f0a002f +int string menu_normal_mode 0x7f0a0030 +int string menu_remove_remind 0x7f0a0031 +int string menu_search 0x7f0a0032 +int string menu_select_all 0x7f0a0033 +int string menu_select_none 0x7f0a0034 +int string menu_select_title 0x7f0a0035 +int string menu_send_to_desktop 0x7f0a0036 +int string menu_setting 0x7f0a0037 +int string menu_share 0x7f0a0038 +int string menu_sync 0x7f0a0039 +int string menu_sync_cancel 0x7f0a003a +int string menu_title_select_folder 0x7f0a003b +int string note_alert_expired 0x7f0a003c +int string note_link_email 0x7f0a003d +int string note_link_other 0x7f0a003e +int string note_link_tel 0x7f0a003f +int string note_link_web 0x7f0a0040 +int string notealert_enter 0x7f0a0041 +int string notealert_ok 0x7f0a0042 +int string notelist_menu_new 0x7f0a0043 +int string notelist_string_info 0x7f0a0044 +int string preferences_account_summary 0x7f0a0045 +int string preferences_account_title 0x7f0a0046 +int string preferences_add_account 0x7f0a0047 +int string preferences_bg_random_appear_title 0x7f0a0048 +int string preferences_button_sync_cancel 0x7f0a0049 +int string preferences_button_sync_immediately 0x7f0a004a +int string preferences_dialog_change_account_title 0x7f0a004b +int string preferences_dialog_change_account_warn_msg 0x7f0a004c +int string preferences_dialog_select_account_tips 0x7f0a004d +int string preferences_dialog_select_account_title 0x7f0a004e +int string preferences_last_sync_time 0x7f0a004f +int string preferences_last_sync_time_format 0x7f0a0050 +int string preferences_menu_cancel 0x7f0a0051 +int string preferences_menu_change_account 0x7f0a0052 +int string preferences_menu_remove_account 0x7f0a0053 +int string preferences_title 0x7f0a0054 +int string preferences_toast_cannot_change_account 0x7f0a0055 +int string preferences_toast_success_set_accout 0x7f0a0056 +int string search 0x7f0a0057 +int string search_hint 0x7f0a0058 +int string search_label 0x7f0a0059 +int string search_setting_description 0x7f0a005a +int string set_remind_time_message 0x7f0a005b +int string success_sdcard_export 0x7f0a005c +int string success_sync_account 0x7f0a005d +int string sync_progress_init_list 0x7f0a005e +int string sync_progress_login 0x7f0a005f +int string sync_progress_syncing 0x7f0a0060 +int string ticker_cancel 0x7f0a0061 +int string ticker_fail 0x7f0a0062 +int string ticker_success 0x7f0a0063 +int string ticker_syncing 0x7f0a0064 +int string widget_havenot_content 0x7f0a0065 +int string widget_under_visit_mode 0x7f0a0066 int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 diff --git a/src/Notes1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes1/app/build/intermediates/source_set_path_map/debug/file-map.txt index 71bd528..d910732 100644 --- a/src/Notes1/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes1/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\Notes1\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Notes1\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\Notes1\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\Notes1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\Notes1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\Notes1\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\Notes1\app\src\debug\res -net.micode.notes.app-main-7 D:\Notes1\app\src\main\res +net.micode.notes.app-pngs-0 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\MiNote_maintain\new_MiCode\src\Notes1\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\debug\res +net.micode.notes.app-main-7 D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\res diff --git a/src/Notes1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index b6d82d7..d45b9d1 100644 --- a/src/Notes1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/Notes1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,79 +1,79 @@ -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:menu/private_folder = 0x7f070007 -net.micode.notes:menu/note_list = 0x7f070003 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:string/sync_progress_login = 0x7f0a005e -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:string/menu_select_none = 0x7f0a0034 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0055 net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:string/ticker_fail = 0x7f0a0061 +net.micode.notes:string/ticker_fail = 0x7f0a0062 net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:drawable/list_yellow_single = 0x7f04002b net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:string/preferences_account_summary = 0x7f0a0045 +net.micode.notes:string/ticker_cancel = 0x7f0a0061 +net.micode.notes:menu/note_list = 0x7f070003 +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004d +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0050 net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/success_sdcard_export = 0x7f0a005c net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/widget_text = 0x7f050044 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:string/menu_select_all = 0x7f0a0033 +net.micode.notes:id/widget_text = 0x7f050045 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0053 +net.micode.notes:string/ticker_success = 0x7f0a0063 net.micode.notes:drawable/edit_title_white = 0x7f04000c net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:layout/settings_header = 0x7f06000c -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0056 +net.micode.notes:string/ticker_syncing = 0x7f0a0064 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004c +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004b net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:id/tv_alert_date = 0x7f05003c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:id/tv_folder_name = 0x7f05003d -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:id/tv_alert_date = 0x7f05003d +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004a +net.micode.notes:id/tv_folder_name = 0x7f05003e +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0052 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0049 +net.micode.notes:string/preferences_account_title = 0x7f0a0046 +net.micode.notes:string/notealert_enter = 0x7f0a0041 +net.micode.notes:string/preferences_title = 0x7f0a0054 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:string/note_alert_expired = 0x7f0a003c +net.micode.notes:string/notelist_menu_new = 0x7f0a0043 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:id/note_edit_list = 0x7f050033 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:string/notealert_ok = 0x7f0a0042 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0051 +net.micode.notes:string/preferences_add_account = 0x7f0a0047 +net.micode.notes:string/note_link_web = 0x7f0a0040 +net.micode.notes:string/set_remind_time_message = 0x7f0a005b +net.micode.notes:string/sync_progress_init_list = 0x7f0a005e +net.micode.notes:string/note_link_tel = 0x7f0a003f +net.micode.notes:string/menu_select_title = 0x7f0a0035 +net.micode.notes:id/menu_read = 0x7f050046 +net.micode.notes:string/sync_progress_login = 0x7f0a005f +net.micode.notes:string/note_link_email = 0x7f0a003d net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:string/menu_setting = 0x7f0a0037 net.micode.notes:layout/password = 0x7f06000b net.micode.notes:id/menu_delete_remind = 0x7f050023 -net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_list_mode = 0x7f0a002c +net.micode.notes:string/menu_sync = 0x7f0a0039 net.micode.notes:string/menu_font_super = 0x7f0a002b net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:string/menu_font_normal = 0x7f0a0028 net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:string/search_hint = 0x7f0a0058 net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:id/tv_name = 0x7f05003f +net.micode.notes:string/widget_havenot_content = 0x7f0a0065 +net.micode.notes:string/notelist_string_info = 0x7f0a0044 +net.micode.notes:id/tv_name = 0x7f050040 net.micode.notes:layout/note_item = 0x7f060007 +net.micode.notes:string/search_label = 0x7f0a0059 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:id/menu_new_note = 0x7f050028 net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/menu_create_folder = 0x7f0a0020 net.micode.notes:string/error_sdcard_export = 0x7f0a000f @@ -81,13 +81,12 @@ net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:plurals/search_results_title = 0x7f080000 net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:id/move = 0x7f050030 +net.micode.notes:id/move = 0x7f050031 net.micode.notes:id/iv_bg_red = 0x7f050013 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/widget_bg_image = 0x7f050043 -net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:id/widget_bg_image = 0x7f050044 +net.micode.notes:menu/sub_folder = 0x7f070007 net.micode.notes:drawable/list_blue_down = 0x7f040017 net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c @@ -96,79 +95,77 @@ net.micode.notes:string/menu_font_size = 0x7f0a0029 net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:layout/widget_4x = 0x7f06000e -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 +net.micode.notes:string/menu_sync_cancel = 0x7f0a003a +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0036 net.micode.notes:string/error_sync_internal = 0x7f0a0012 net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:id/menu_share = 0x7f05002d +net.micode.notes:layout/note_list = 0x7f060008 +net.micode.notes:string/menu_share = 0x7f0a0038 +net.micode.notes:id/menu_share = 0x7f05002e net.micode.notes:string/app_widget4x4 = 0x7f0a0006 net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:id/menu_setting = 0x7f05002c +net.micode.notes:id/menu_setting = 0x7f05002d net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:layout/note_edit_list_item = 0x7f060006 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:layout/account_dialog_title = 0x7f060000 +net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d +net.micode.notes:layout/account_dialog_title = 0x7f060000 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004e net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title_bar = 0x7f050042 -net.micode.notes:id/menu_reset_password = 0x7f050045 +net.micode.notes:id/tv_title_bar = 0x7f050043 +net.micode.notes:id/menu_reset_password = 0x7f05002a net.micode.notes:menu/note_list_dropdown = 0x7f070004 net.micode.notes:id/iv_bg_blue_select = 0x7f050010 net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:id/sv_note_edit = 0x7f05003b -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038 +net.micode.notes:id/sv_note_edit = 0x7f05003c +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050039 net.micode.notes:id/iv_large_select = 0x7f050019 -net.micode.notes:id/note_edit_view = 0x7f050034 +net.micode.notes:id/note_edit_view = 0x7f050035 net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 net.micode.notes:string/format_date_ymd = 0x7f0a0018 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:id/ll_font_super = 0x7f050020 -net.micode.notes:id/note_bg_color_selector = 0x7f050032 +net.micode.notes:id/note_bg_color_selector = 0x7f050033 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:id/navigation_bar = 0x7f050031 +net.micode.notes:id/navigation_bar = 0x7f050032 net.micode.notes:id/ll_font_normal = 0x7f05001e -net.micode.notes:id/minute = 0x7f05002f -net.micode.notes:id/menu_sync = 0x7f05002e +net.micode.notes:id/minute = 0x7f050030 +net.micode.notes:id/menu_sync = 0x7f05002f net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:id/menu_search = 0x7f05002a +net.micode.notes:id/menu_search = 0x7f05002b net.micode.notes:id/menu_private_folder = 0x7f050029 -net.micode.notes:id/menu_new_note = 0x7f050028 net.micode.notes:id/menu_new_folder = 0x7f050027 -net.micode.notes:string/menu_move_to_PF = 0x7f0a0066 net.micode.notes:layout/note_list_footer = 0x7f06000a +net.micode.notes:string/menu_move_to_PF = 0x7f0a002f net.micode.notes:id/menu_alert = 0x7f050021 -net.micode.notes:id/tv_time = 0x7f050040 +net.micode.notes:id/tv_time = 0x7f050041 net.micode.notes:id/iv_bg_green = 0x7f050011 net.micode.notes:id/et_foler_name = 0x7f05000b net.micode.notes:id/ll_font_small = 0x7f05001f net.micode.notes:id/iv_super_select = 0x7f05001c net.micode.notes:drawable/widget_2x_white = 0x7f04003b net.micode.notes:id/iv_medium_select = 0x7f05001a -net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/menu_search = 0x7f0a0032 net.micode.notes:string/alert_title_delete = 0x7f0a0003 net.micode.notes:id/iv_bg_white = 0x7f050015 -net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:string/success_sync_account = 0x7f0a005d net.micode.notes:drawable/font_normal = 0x7f040011 net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:string/sync_progress_syncing = 0x7f0a0060 +net.micode.notes:id/iv_bg_red_select = 0x7f050014 net.micode.notes:id/et_edit_text = 0x7f05000a net.micode.notes:id/iv_bg_yellow = 0x7f050017 -net.micode.notes:id/iv_bg_red_select = 0x7f050014 -net.micode.notes:id/notes_list = 0x7f050037 +net.micode.notes:id/notes_list = 0x7f050038 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:drawable/list_blue_up = 0x7f04001a net.micode.notes:id/date = 0x7f050007 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/search = 0x7f0a0056 +net.micode.notes:string/search = 0x7f0a0057 net.micode.notes:id/font_size_selector = 0x7f05000c net.micode.notes:string/menu_move = 0x7f0a002d net.micode.notes:id/action_select_all = 0x7f050002 @@ -181,17 +178,17 @@ net.micode.notes:id/ll_font_large = 0x7f05001d net.micode.notes:drawable/list_red_single = 0x7f040023 net.micode.notes:drawable/widget_4x_red = 0x7f04003f net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_link_other = 0x7f0a003e net.micode.notes:string/folder_exist = 0x7f0a0017 net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_alert = 0x7f040036 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e +net.micode.notes:string/preferences_last_sync_time = 0x7f0a004f net.micode.notes:drawable/dropdown_icon = 0x7f040005 net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:id/menu_send_to_desktop = 0x7f05002b +net.micode.notes:id/menu_send_to_desktop = 0x7f05002c net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note = 0x7f04002f @@ -199,6 +196,11 @@ net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:drawable/list_yellow_up = 0x7f04002c net.micode.notes:drawable/widget_2x_red = 0x7f04003a +net.micode.notes:id/note_edit_list = 0x7f050034 +net.micode.notes:drawable/list_yellow_down = 0x7f040029 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:drawable/selected = 0x7f040035 +net.micode.notes:drawable/list_white_middle = 0x7f040026 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d net.micode.notes:layout/note_edit = 0x7f060005 net.micode.notes:id/hour = 0x7f05000d @@ -218,18 +220,18 @@ net.micode.notes:drawable/list_green_middle = 0x7f04001e net.micode.notes:drawable/list_footer_bg = 0x7f04001c net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_remove_remind = 0x7f0a0031 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/preference_sync_button = 0x7f050039 +net.micode.notes:id/preference_sync_button = 0x7f05003a net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 net.micode.notes:id/account_dialog_title = 0x7f050001 net.micode.notes:layout/widget_2x = 0x7f06000d -net.micode.notes:id/note_item = 0x7f050035 +net.micode.notes:id/note_item = 0x7f050036 net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0048 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a +net.micode.notes:string/menu_title_select_folder = 0x7f0a003b net.micode.notes:string/menu_folder_delete = 0x7f0a0025 net.micode.notes:drawable/clock = 0x7f040003 net.micode.notes:id/menu_delete = 0x7f050022 @@ -237,7 +239,7 @@ net.micode.notes:drawable/icon_app = 0x7f040015 net.micode.notes:drawable/edit_yellow = 0x7f04000f net.micode.notes:drawable/list_blue_single = 0x7f040019 net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f +net.micode.notes:string/menu_normal_mode = 0x7f0a0030 net.micode.notes:drawable/edit_title_blue = 0x7f040009 net.micode.notes:string/menu_delete = 0x7f0a0021 net.micode.notes:drawable/list_background = 0x7f040016 @@ -245,31 +247,30 @@ net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:id/delete = 0x7f050008 net.micode.notes:drawable/search_result = 0x7f040034 net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:id/tv_modified_date = 0x7f05003e +net.micode.notes:id/tv_modified_date = 0x7f05003f net.micode.notes:string/menu_font_small = 0x7f0a002a net.micode.notes:drawable/font_large = 0x7f040010 net.micode.notes:id/iv_alert_icon = 0x7f05000e net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:drawable/edit_title_red = 0x7f04000b +net.micode.notes:menu/private_folder = 0x7f070006 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/search_setting_description = 0x7f0a0059 +net.micode.notes:string/search_setting_description = 0x7f0a005a net.micode.notes:id/menu_list_mode = 0x7f050026 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:id/iv_small_select = 0x7f05001b -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0066 net.micode.notes:color/user_query_highlight = 0x7f020002 net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_green = 0x7f040007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:id/tv_title = 0x7f050041 +net.micode.notes:id/tv_title = 0x7f050042 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:drawable/edit_title_green = 0x7f04000a @@ -279,11 +280,11 @@ net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:id/selection_menu = 0x7f05003a +net.micode.notes:id/selection_menu = 0x7f05003b net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:drawable/call_record = 0x7f040002 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:id/note_title = 0x7f050036 +net.micode.notes:id/note_title = 0x7f050037 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 net.micode.notes:array/format_for_exported_note = 0x7f010000 diff --git a/src/Notes1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes1/app/build/outputs/logs/manifest-merger-debug-report.txt index a9f3af9..6b5da17 100644 --- a/src/Notes1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes1/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,239 +1,239 @@ -- Merging decision tree log --- manifest -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:1-152:12 package - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:24:5-44 - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml - INJECTED from D:\Notes1\app\src\main\AndroidManifest.xml + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml + INJECTED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:26:5-81 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:26:22-78 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:27:5-88 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:27:22-85 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:28:5-67 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:28:22-64 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:29:5-72 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:29:22-69 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:30:5-74 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:30:22-71 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:31:5-80 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:31:22-77 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:32:5-71 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:32:22-68 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:33:5-74 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:33:22-71 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:34:5-81 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:34:22-78 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:36:5-151:19 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:36:5-151:19 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:38:9-41 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:38:9-41 android:icon - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:37:9-42 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:37:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:39:9-52:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:39:9-52:20 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:42:13-45 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:42:13-45 android:launchMode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:43:13-43 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:43:13-43 android:windowSoftInputMode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:46:13-52 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:46:13-52 android:configChanges - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:41:13-74 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:41:13-74 android:theme - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:44:13-45 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:44:13-45 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:40:13-49 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:40:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:48:13-51:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:48:13-51:29 action#android.intent.action.MAIN -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:49:17-69 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:49:17-69 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:49:25-66 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:49:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:50:17-77 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:50:17-77 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:50:27-74 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:50:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:54:9-83:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:54:9-83:20 android:launchMode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:57:13-43 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:57:13-43 android:configChanges - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:56:13-74 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:56:13-74 android:theme - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:58:13-45 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:58:13-45 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:55:13-48 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\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:\Notes1\app\src\main\AndroidManifest.xml:60:13-66:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:60:13-66:29 android:scheme - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:60:28-49 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:60:28-49 tools:ignore - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:61:17-47 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:61:17-47 action#android.intent.action.VIEW -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:62:17-69 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:62:17-69 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:62:25-66 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:62:25-66 category#android.intent.category.DEFAULT -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:63:17-76 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:17-76 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:63:27-73 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:63:27-73 data -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:64:17-78 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64:17-78 android:mimeType - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:64:23-75 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:64: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:\Notes1\app\src\main\AndroidManifest.xml:68:13-73:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:68:13-73:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:69:17-79 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:69:17-79 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:69:25-76 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:69:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:75:13-78:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:75:13-78:29 action#android.intent.action.SEARCH -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:76:17-71 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:76:17-71 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:76:25-68 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:76:25-68 meta-data#android.app.searchable -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:80:13-82:54 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:80:13-82:54 android:resource - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:82:17-51 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:82:17-51 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:81:17-54 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:81:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:85:9-88:43 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:85:9-88:43 android:authorities - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:87:13-47 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:87:13-47 android:multiprocess - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:88:13-40 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:88:13-40 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:86:13-63 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:86:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:90:9-102:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:90:9-102:20 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:92:13-50 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:92:13-50 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:91:13-57 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:91: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:\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:93:13-97:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:94:17-84 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:17-84 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:94:25-81 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:94:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:95:17-85 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:17-85 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:95:25-82 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:95:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:96:17-85 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:17-85 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:96:25-82 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:96:25-82 meta-data#android.appwidget.provider -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:99:13-101:58 android:resource - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:101:17-55 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:101:17-55 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:100:17-58 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:100:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:103:9-116:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:103:9-116:20 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:105:13-50 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:105:13-50 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:104:13-57 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:104:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:118:9-122:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:118:9-122:20 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:118:19-55 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:118:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:119:13-121:29 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:119:13-121:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:120:17-79 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:120:17-79 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:120:25-76 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:120:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:124:9-127:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:124:9-127:20 android:process - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:126:13-38 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:126:13-38 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:125:13-61 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:125:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:129:9-134:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:129:9-134:20 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:131:13-45 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:131:13-45 android:launchMode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:132:13-48 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:132:13-48 android:theme - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:133:13-75 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:133:13-75 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:130:13-50 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:130:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:136:9-141:20 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:136:9-141:20 android:label - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:138:13-54 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:138:13-54 android:launchMode - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:139:13-43 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:139:13-43 android:theme - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:140:13-60 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:140:13-60 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:137:13-71 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:137:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:143:9-146:19 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:143:9-146:19 android:exported - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:145:13-37 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:145:13-37 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:144:13-74 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:144:13-74 meta-data#android.app.default_searchable -ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:148:9-150:52 +ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:148:9-150:52 android:value - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:150:13-49 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:150:13-49 android:name - ADDED from D:\Notes1\app\src\main\AndroidManifest.xml:149:13-58 + ADDED from D:\MiNote_maintain\new_MiCode\src\Notes1\app\src\main\AndroidManifest.xml:149:13-58 diff --git a/src/Notes1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 9c6a1ae..66cc5c3 100644 Binary files a/src/Notes1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 8753d3d..ba6a6e3 100644 --- a/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/Notes1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -75,14 +75,17 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.HashMap; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import android.speech.tts.TextToSpeech; +import android.speech.tts.TextToSpeech.OnInitListener; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { - private class HeadViewHolder { + private static class HeadViewHolder { public TextView tvModified; public ImageView ivAlertIcon; @@ -372,7 +375,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } return true; } - + private TextToSpeech mTTS; private void initResources() { mContentResolver = this.getContentResolver(); mHeadViewPanel = findViewById(R.id.note_title); @@ -390,6 +393,20 @@ public class NoteEditActivity extends Activity implements OnClickListener, iv.setOnClickListener(this); } + mTTS = new TextToSpeech(this, new OnInitListener() { + @Override + public void onInit(int status) { + if (status == TextToSpeech.SUCCESS){ + Log.i(TAG, "onInit: 1111111111111111111111111"); + int result = mTTS.setLanguage(Locale.CHINA); + if (result != TextToSpeech.LANG_COUNTRY_AVAILABLE + && result != TextToSpeech.LANG_AVAILABLE){ + Toast.makeText(NoteEditActivity.this, "暂不支持此种语言的朗读", Toast.LENGTH_LONG); + } + } + } + }); + mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); @@ -453,6 +470,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit(); findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { + //获取正在编辑的文本 getWorkingText(); switchToListMode(mWorkingNote.getContent()); } else { @@ -574,6 +592,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, //显示软件盘 showSoftInput(); builder.setTitle("enter the password"); + final Dialog enter_password_dialog = builder.setView(view).show(); builder.setPositiveButton(android.R.string.ok, null); //设置取消按钮监听 builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @@ -582,7 +601,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } }); //显示输入框控件 - final Dialog enter_password_dialog = builder.setView(view).show(); final Button positive = (Button)enter_password_dialog.findViewById(android.R.id.button1); positive.setOnClickListener(new OnClickListener() { public void onClick(View v) { @@ -592,8 +610,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, String saved_password=load("data.txt"); Log.i(TAG,saved_password); if(entered_password.equals(saved_password)){ - //noteMoveToPF(); - //Log.i(TAG, "22222"); Toast.makeText(NoteEditActivity.this, "Note has moved to Private Folder", Toast.LENGTH_LONG).show(); noteMoveToPF(); }else{ @@ -605,6 +621,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, }); } + public void readText(){ + mTTS.speak(mNoteEditor.getText().toString(), TextToSpeech.QUEUE_FLUSH, null); + } + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -649,6 +669,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, break; case R.id.menu_private_folder: moveToPrivateFolder(); + break; + case R.id.menu_read: + readText(); + break; default: break; } @@ -812,6 +836,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); + Log.i(TAG, "getHighlightQueryResult: 111111111111111111111111111"); if (!TextUtils.isEmpty(userQuery)) { mPattern = Pattern.compile(userQuery); Matcher m = mPattern.matcher(fullText); @@ -874,6 +899,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (newMode == TextNote.MODE_CHECK_LIST) { switchToListMode(mNoteEditor.getText().toString()); } else { + //如果为空，从列表模式转换为便签模式时，不显示正方块 if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); @@ -883,7 +909,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setVisibility(View.VISIBLE); } } - +//获取当前编辑的文本 private boolean getWorkingText() { boolean hasChecked = false; if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { @@ -893,13 +919,16 @@ public class NoteEditActivity extends Activity implements OnClickListener, NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); if (!TextUtils.isEmpty(edit.getText())) { if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { + //添加对勾标志 sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); hasChecked = true; } else { + //添加未完成标志（一个小正方形） sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); } } } + //设置显示的文本 mWorkingNote.setWorkingText(sb.toString()); } else { mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); diff --git a/src/Notes1/app/src/main/res/menu/note_edit.xml b/src/Notes1/app/src/main/res/menu/note_edit.xml index f7eee6a..2725a9b 100644 --- a/src/Notes1/app/src/main/res/menu/note_edit.xml +++ b/src/Notes1/app/src/main/res/menu/note_edit.xml @@ -53,4 +53,8 @@ + + \ No newline at end of file