diff --git a/.gradle/7.5/executionHistory/executionHistory.bin b/.gradle/7.5/executionHistory/executionHistory.bin index 65ee6ab..8beafae 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.bin and b/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.5/executionHistory/executionHistory.lock b/.gradle/7.5/executionHistory/executionHistory.lock index 33f006c..2a30bac 100644 Binary files a/.gradle/7.5/executionHistory/executionHistory.lock and b/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.5/fileHashes/fileHashes.bin b/.gradle/7.5/fileHashes/fileHashes.bin index 55f5e24..a734527 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.bin and b/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.5/fileHashes/fileHashes.lock b/.gradle/7.5/fileHashes/fileHashes.lock index 18c8a17..3406c3f 100644 Binary files a/.gradle/7.5/fileHashes/fileHashes.lock and b/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.5/fileHashes/resourceHashesCache.bin b/.gradle/7.5/fileHashes/resourceHashesCache.bin index e1fe08d..8a629e8 100644 Binary files a/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4ff6750..37ef7b5 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 0137015..6bbc209 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 9fdd11e..bf7ef31 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index cf655b3..4151132 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -13,9 +13,11 @@ d 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f b 2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 -i -9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 g 7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +i +9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 k ;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb index 6a0c695..e228a5b 100644 --- a/.idea/sonarlint/securityhotspotstore/index.pb +++ b/.idea/sonarlint/securityhotspotstore/index.pb @@ -9,13 +9,15 @@ m =app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java,f\9\f9f49497f95afd327db7a7a512612aa1089003d4 f 6app/src/main/java/net/micode/notes/tool/DataUtils.java,3\2\32360bf24febc78f20db52498c7576b3d8650d56 -k -;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c d 4app/src/main/java/net/micode/notes/data/Contact.java,9\a\9a3a19793537958b8b1b03a81985999e22705a2f -i -9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 b 2app/src/main/java/net/micode/notes/data/Notes.java,a\7\a7641cfac724321d508c2a284223a711011a93f5 g -7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 \ No newline at end of file +7app/src/main/java/net/micode/notes/ui/NoteEditText.java,5\0\503adcf2a0be1ecdb94a15efba4433b6589877b9 +@ +app/build.gradle,f\4\f4a01d6a4fcb971362ec00a83903fd3902f52164 +k +;app/src/main/java/net/micode/notes/ui/NoteEditActivity.java,5\7\577f30d26378ec8a2bd2e4a43f3c79b3f04c402c +i +9app/src/main/java/net/micode/notes/model/WorkingNote.java,8\7\876016634c6642b35109680ccac740dc8271b236 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index fa49c0c..9187d07 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdk 16 + compileSdk 21 buildToolsVersion "33.0.2" defaultConfig { diff --git a/app/build/intermediates/apk/debug/app-debug.apk b/app/build/intermediates/apk/debug/app-debug.apk index 699938f..f7b6e66 100644 Binary files a/app/build/intermediates/apk/debug/app-debug.apk and b/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index 5523061..508abff 100644 Binary files a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_0/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_1/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_2/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_3/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_4/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_5/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_6/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_6/graph.bin and /dev/null differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_7/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_290003a5d0cde1a8991a028b0943b385c4efb0ea0f78be3eb2af2b638c04db23_bucket_7/graph.bin and /dev/null differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index b030a2b..8b42c58 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index 45ff039..59fa4ff 100644 Binary files a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 4daa872..873d836 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,102 +1,97 @@ -#Fri Apr 14 21:15:52 HKT 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/menu/long_click_menu.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_long_click_menu.xml.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/color/font_color_red.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_red.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_color_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_color_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/color/font_color_default.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_default.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/color/font_color_green.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_green.xml.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/color/font_color_bright_blue.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_font_color_bright_blue.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +#Thu Apr 27 19:48:33 HKT 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_color_green.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_color_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\Work-java\\MINOTES\\minotes\\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\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat diff --git a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index f6f7885..ebdc9da 100644 --- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14sp#00FF00#FF0000#0000FF#FFFF00#000000#00FFFFNotesNotes 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 folderChange Selected Text ColorSD 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 + #335b5b5b33sp26sp20sp17sp14sp#00FF00#FF0000#0000FF#FFFF00#000000#00FFFFNotesNotes 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 folderChange Selected Text ColorInsert ImageSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel改变文本颜色 %1$s result for \"%2$s\" %1$s results for \"%2$s\" - 改变文本颜色 + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹更改选中文本颜色SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图/MIUI/notes/notes_%s.txt(%d)新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹更改选中文本颜色插入图片SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$syyyy-MM-dd hh:mm:ss添加账号更换账号删除账号取消立即同步取消同步当前帐号 %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 文件夾/MIUI/notes/notes_%s.txt(%d)新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？更改选中文本颜色插入图像SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$syyyy-MM-dd hh:mm:ss添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消改变文本颜色 %1$s 條符合”%2$s“的搜尋結果 - 改变文本颜色 \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 99bf2dd..c9f5d16 100644 --- a/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 2c3f705..4f557c8 100644 --- a/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index e3158c7..08d6782 100644 --- a/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 0905d9b..9e2119c 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Fri Apr 14 21:15:53 HKT 2023 -base.0=C\:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Apr 27 20:45:53 HKT 2023 +base.0=D\:\\Work-java\\MINOTES\\minotes\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 8381c2b..603c336 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 307c1de..5ffa71d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index 4b86a4c..b0b793e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index 0beb47d..3091c3e 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class index 2de8897..4d3861f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/FontColorParser$TextAppearanceResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index d49ecab..8f484dd 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index 701d705..cd461f8 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 20d4ffc..3d51519 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index c7212bf..bc44cf0 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index b14b4fe..259aa97 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 3b1558c..e1d83ca 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 2e89742..c569e6a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 7011069..be18b58 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index c550fa1..d1b13cf 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index ce2b24e..f8d11c2 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 14e3317..527392c 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index e7b63bd..d1cd65d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index e54b30b..7801541 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 7b46e80..bffc0d9 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 13655ed..4636402 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 9fbb5c2..619e22f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index 627dab8..953b301 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index a973102..23a80dd 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index fc94e03..90e91b7 100644 --- a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="14" /> -24-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81 -26-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88 -27-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67 -28-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72 -29-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74 -30-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80 -31-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71 -32-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74 -33-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81 -34-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78 35 36 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69 -50-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77 -52-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69 -61-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -63-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -65-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -66-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79 -69-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -71-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -73-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 -74-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71 -77-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 -79-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40 91 92 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84 -96-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85 -97-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 -98-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 104 105 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84 -109-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85 -110-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 -111-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79 -120-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75 133 134 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/app/build/intermediates/merged_res/debug/color_font_color_bright_blue.xml.flat b/app/build/intermediates/merged_res/debug/color_font_color_bright_blue.xml.flat deleted file mode 100644 index 9eeac0a..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_font_color_bright_blue.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/color_font_color_default.xml.flat b/app/build/intermediates/merged_res/debug/color_font_color_default.xml.flat deleted file mode 100644 index 16aad21..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_font_color_default.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/color_font_color_green.xml.flat b/app/build/intermediates/merged_res/debug/color_font_color_green.xml.flat deleted file mode 100644 index 3f55f8d..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_font_color_green.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/color_font_color_red.xml.flat b/app/build/intermediates/merged_res/debug/color_font_color_red.xml.flat deleted file mode 100644 index 5581f1d..0000000 Binary files a/app/build/intermediates/merged_res/debug/color_font_color_red.xml.flat and /dev/null differ diff --git a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index b25b7cc..f22ae63 100644 Binary files a/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat index e751586..50229ff 100644 Binary files a/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and b/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat index 204f178..9e45558 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat index 0a951b5..cda43a8 100644 Binary files a/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and b/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat differ diff --git a/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/app/build/intermediates/merged_res/debug/values_values.arsc.flat index 18097a0..3640e7f 100644 Binary files a/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index dff5ace..2430049 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,153 +1,44 @@ { "logs": [ { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\FontColor.xml", - "from": { - "startLines": "4,7,6,2,3,5", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "137,262,219,57,98,177", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "171,303,256,92,131,213" - }, - "to": { - "startLines": "12,13,14,15,16,17", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "420,459,505,547,587,625", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "454,500,542,582,620,661" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "19,20,21,22,23", - "startColumns": "4,4,4,4,4", - "startOffsets": "723,775,828,881,933", - "endColumns": "51,52,52,51,51", - "endOffsets": "770,823,876,928,980" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "129,72,75,74,73,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,64,29,30,86,41,76,121,71,67,77,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,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": "8086,3898,4159,4063,3994,827,870,922,7584,7633,8028,7977,1282,4691,4785,4620,4536,4453,5652,5569,5467,4961,2004,1953,3397,1486,1539,5022,2097,4242,7696,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6108,6041,6349,7487,6713,6632,6787,6876,7118,7039,6192,6267,6573,6413,6493,5986,7262,7384,7936,7809,7752,7862,1366,4893,5381,5787,5718,5867,5322,5267,5205,5145,974,1084", - "endLines": "133,72,75,74,73,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,64,29,30,86,41,76,121,71,67,77,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,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,77,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": "8490,3989,4237,4154,4058,865,917,969,7628,7691,8081,8023,1361,4780,4888,4686,4615,4531,5713,5647,5564,5017,2061,1999,3470,1534,1594,5122,2151,4339,7746,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6187,6103,6408,7578,6782,6708,6871,7034,7257,7113,6262,6344,6627,6488,6568,6036,7379,7482,7972,7857,7804,7931,1426,4956,5462,5862,5782,5956,5376,5317,5262,5200,1079,1169" - }, - "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", - "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": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1999,2050,2134,2228,2336,2407,2491,2574,2640,2723,2825,2886,2948,2999,3077,3130,3190,3295,3354,3456,3511,3582,3631,3709,3767,3814,3873,3930,4001,4062,4119,4169,4221,4274,4324,4374,4434,4487,4553,4615,4678,4725,4780,4868,4926,4988,5038,5083,5126,5186,5253,5308,5363,5416,5463,5516,5572,5620,5675,5728,5812,5879,5943,6039,6113,6194,6283,6446,6590,6669,6744,6826,6885,6965,7045,7100,7222,7325,7366,7419,7476,7550,7615,7683,7769,7849,7918,8012,8071,8126,8188,8248,8358", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", - "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,77,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1994,2045,2129,2223,2331,2402,2486,2569,2635,2718,2820,2881,2943,2994,3072,3125,3185,3290,3349,3451,3506,3577,3626,3704,3762,3809,3868,3925,3996,4057,4114,4164,4216,4269,4319,4369,4429,4482,4548,4610,4673,4720,4775,4863,4921,4983,5033,5078,5121,5181,5248,5303,5358,5411,5458,5511,5567,5615,5670,5723,5807,5874,5938,6034,6108,6189,6278,6441,6585,6664,6739,6821,6880,6960,7040,7095,7217,7320,7361,7414,7471,7545,7610,7678,7764,7844,7913,8007,8066,8121,8183,8243,8353,8443" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", - "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" - }, - "to": { - "startLines": "132,136,140,144,147,151,155,159,163,167,171,175,178,181,184", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8448,8652,8863,9073,9233,9416,9601,9786,9989,10195,10378,10579,10696,10806,10912", - "endLines": "135,139,143,146,150,154,158,162,166,170,174,177,180,183,186", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8647,8858,9068,9228,9411,9596,9781,9984,10190,10373,10574,10691,10801,10907,11009" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "endLines": "21", + "endColumns": "19", + "endOffsets": "817" }, "to": { - "startLines": "18", + "startLines": "2", "startColumns": "4", - "startOffsets": "666", - "endColumns": "56", - "endOffsets": "718" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6639,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,108", - "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", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1726,1779,1841,1926,2007,2057,2116,2159,2219,2272,2315,2366,2416,2476,2529,2580,2626,2674,2722,2768,2815,2865,2910,2969,3021,3073,3116,3163,3219,3274,3329,3373,3415,3456,3506,3565,3616,3665,3714,3761,3808,3855,3900,3951,4004,4079,4138,4195,4269,4333,4402,4480,4590,4694,4767,4833,4888,4953,5018,5067,5150,5228,5266,5311,5359,5421,5478,5533,5592,5659,5717,5779,5827,5872,5920,5971,6037", - "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,107,108", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,59,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1721,1774,1836,1921,2002,2052,2111,2154,2214,2267,2310,2361,2411,2471,2524,2575,2621,2669,2717,2763,2810,2860,2905,2964,3016,3068,3111,3158,3214,3269,3324,3368,3410,3451,3501,3560,3611,3660,3709,3756,3803,3850,3895,3946,3999,4074,4133,4190,4264,4328,4397,4475,4585,4689,4762,4828,4883,4948,5013,5062,5145,5223,5261,5306,5354,5416,5473,5528,5587,5654,5712,5774,5822,5867,5915,5966,6032,6098" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,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,124,122,121,123,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,4,4", + "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029", + "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,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,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "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,108,109,110,111,112,113", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340", + "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,107,108,109,110,111,112,113", + "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401" } } ] @@ -156,11 +47,13 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\FontColor.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1" + "startLines": "4,7,6,2,3,5", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "133,255,213,55,95,172", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "167,296,250,90,128,208" }, "to": { "startLines": "12,13,14,15,16,17", @@ -171,61 +64,69 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084", + "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169" }, "to": { - "startLines": "19,20,21,22,23", - "startColumns": "4,4,4,4,4", - "startOffsets": "723,775,828,881,933", - "endColumns": "51,52,52,51,51", - "endOffsets": "770,823,876,928,980" + "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", + "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8138,-1,-1,-1,-1,-1,-1,-1,-1,-1,8086,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8542,-1,-1,-1,-1,-1,-1,-1,-1,-1,8133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", + "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" }, "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4486,4539,4605,4667,4730,4777,4832,4920,4978,5040,5090,5135,5178,5238,5305,5360,5415,5468,5515,5568,5624,5672,5727,5780,5864,5931,5995,6091,6165,6246,6335,6498,6642,6721,6796,6878,6937,7017,7097,7152,7274,7377,7418,7471,7528,7602,7667,7735,7821,7901,7970,8064,8123,8178,8240,8300,8410", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4481,4534,4600,4662,4725,4772,4827,4915,4973,5035,5085,5130,5173,5233,5300,5355,5410,5463,5510,5563,5619,5667,5722,5775,5859,5926,5990,6086,6160,6241,6330,6493,6637,6716,6791,6873,6932,7012,7092,7147,7269,7372,7413,7466,7523,7597,7662,7730,7816,7896,7965,8059,8118,8173,8235,8295,8405,8495" + "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021", + "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "-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", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "764,816,869,922,712", + "endColumns": "51,52,52,51,51", + "endOffsets": "811,864,917,969,759" }, "to": { - "startLines": "133,137,141,145,148,152,156,160,164,168,172,176,179,182,185", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8500,8704,8915,9125,9285,9468,9653,9838,10041,10247,10430,10631,10748,10858,10964", - "endLines": "136,140,144,147,151,155,159,163,167,171,175,178,181,184,187", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8699,8910,9120,9280,9463,9648,9833,10036,10242,10425,10626,10743,10853,10959,11061" + "startLines": "19,20,21,22,23", + "startColumns": "4,4,4,4,4", + "startOffsets": "723,775,828,881,933", + "endColumns": "51,52,52,51,51", + "endOffsets": "770,823,876,928,980" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "739,1047", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1041,1162" }, "to": { "startLines": "2,8", @@ -237,61 +138,20 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { "startLines": "18", "startColumns": "4", - "startOffsets": "666", + "startOffsets": "712", "endColumns": "56", - "endOffsets": "718" - } - } - ] - }, - { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "122,71,70,69,68,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,60,29,30,82,72,115,67,63,74,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,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,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": "6592,3495,3429,3356,3306,827,867,915,6143,6188,6538,6488,1199,3921,3989,3862,3797,3734,4652,4592,4529,4121,2877,1369,1422,4175,3568,6245,3247,3034,3674,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,5027,4968,5168,6069,5479,5410,5543,5621,5804,5731,5102,5355,5225,5290,4919,5908,5991,6450,6343,6295,6388,1261,4066,4470,4765,4707,4832,4422,4377,4329,4278,963,1029", - "endLines": "124,71,70,69,68,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,60,29,30,82,72,115,67,63,74,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,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,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,59,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": "6764,3563,3490,3424,3351,862,910,958,6183,6240,6587,6533,1256,3984,4061,3916,3857,3792,4702,4647,4587,4170,2932,1417,1479,4255,3644,6290,3301,3072,3729,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5097,5022,5220,6138,5538,5474,5616,5726,5903,5799,5163,5405,5285,5350,4963,5986,6064,6483,6383,6338,6445,1313,4116,4524,4827,4760,4889,4465,4417,4372,4324,1024,1090" + "endOffsets": "764" }, "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", - "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": "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,2167,2220,2263,2314,2364,2424,2477,2528,2574,2622,2670,2716,2763,2813,2858,2917,2969,3021,3064,3111,3167,3222,3277,3321,3363,3404,3454,3513,3564,3613,3662,3709,3756,3803,3848,3899,3952,4027,4086,4143,4217,4281,4350,4428,4538,4642,4715,4781,4836,4901,4966,5015,5098,5176,5214,5259,5307,5369,5426,5481,5540,5607,5665,5727,5775,5820,5868,5919,5985", - "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,107", - "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,59,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,2162,2215,2258,2309,2359,2419,2472,2523,2569,2617,2665,2711,2758,2808,2853,2912,2964,3016,3059,3106,3162,3217,3272,3316,3358,3399,3449,3508,3559,3608,3657,3704,3751,3798,3843,3894,3947,4022,4081,4138,4212,4276,4345,4423,4533,4637,4710,4776,4831,4896,4961,5010,5093,5171,5209,5254,5302,5364,5421,5476,5535,5602,5660,5722,5770,5815,5863,5914,5980,6046" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startOffsets": "666", + "endColumns": "56", + "endOffsets": "718" } } ] @@ -300,46 +160,7 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6583,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6630,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,108", - "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", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1726,1779,1841,1925,2005,2055,2114,2157,2217,2270,2313,2364,2414,2474,2527,2578,2624,2672,2720,2766,2813,2863,2908,2967,3019,3071,3114,3161,3217,3272,3327,3371,3413,3454,3504,3563,3614,3663,3712,3759,3806,3853,3898,3949,4002,4077,4136,4193,4267,4331,4400,4478,4588,4692,4765,4831,4886,4951,5016,5065,5148,5226,5264,5309,5357,5419,5476,5531,5590,5657,5715,5777,5825,5870,5918,5969,6035", - "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,107,108", - "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,59,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1721,1774,1836,1920,2000,2050,2109,2152,2212,2265,2308,2359,2409,2469,2522,2573,2619,2667,2715,2761,2808,2858,2903,2962,3014,3066,3109,3156,3212,3267,3322,3366,3408,3449,3499,3558,3609,3658,3707,3754,3801,3848,3893,3944,3997,4072,4131,4188,4262,4326,4395,4473,4583,4687,4760,4826,4881,4946,5011,5060,5143,5221,5259,5304,5352,5414,5471,5526,5585,5652,5710,5772,5820,5865,5913,5964,6030,6096" - } - } - ] - }, - { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -358,22 +179,22 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "123,72,71,70,69,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,61,29,30,81,37,115,68,64,73,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,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,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,4", - "startOffsets": "6583,3591,3525,3452,3402,843,883,931,6133,6178,6529,6479,1215,3911,3979,3852,3786,3723,4641,4581,4518,4111,2973,1385,1438,4165,1784,6235,3343,3130,3663,1894,2175,2421,1947,2913,2860,2809,2614,2566,2472,2520,2660,2707,2218,3284,2757,3173,2132,2374,2318,2263,3075,2088,3033,1997,2038,3225,1334,1639,1735,1592,1688,1545,1500,1164,1111,5016,4957,5157,6058,5468,5399,5532,5610,5793,5720,5091,5344,5214,5279,4908,5897,5980,6441,6334,6286,6379,1277,4056,4459,4754,4696,4821,4411,4366,4318,4267,979,1045", - "endLines": "125,72,71,70,69,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,61,29,30,81,37,115,68,64,73,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,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,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,59,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": "6755,3658,3586,3520,3447,878,926,974,6173,6230,6578,6524,1272,3974,4051,3906,3847,3781,4691,4636,4576,4160,3028,1433,1495,4244,1859,6280,3397,3168,3718,1942,2213,2467,1992,2968,2908,2855,2655,2609,2515,2561,2702,2752,2258,3338,2804,3220,2170,2416,2369,2313,3125,2127,3070,2033,2083,3279,1380,1683,1779,1634,1730,1587,1540,1210,1159,5086,5011,5209,6127,5527,5463,5605,5715,5892,5788,5152,5394,5274,5339,4952,5975,6053,6474,6374,6329,6436,1329,4106,4513,4816,4749,4878,4454,4406,4361,4313,1040,1106" + "startLines": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,4,4,4", + "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045", + "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106" }, "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", - "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": "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,2165,2218,2261,2312,2362,2422,2475,2526,2572,2620,2668,2714,2761,2811,2856,2915,2967,3019,3062,3109,3165,3220,3275,3319,3361,3402,3452,3511,3562,3611,3660,3707,3754,3801,3846,3897,3950,4025,4084,4141,4215,4279,4348,4426,4536,4640,4713,4779,4834,4899,4964,5013,5096,5174,5212,5257,5305,5367,5424,5479,5538,5605,5663,5725,5773,5818,5866,5917,5983", - "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,107", - "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,59,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,2160,2213,2256,2307,2357,2417,2470,2521,2567,2615,2663,2709,2756,2806,2851,2910,2962,3014,3057,3104,3160,3215,3270,3314,3356,3397,3447,3506,3557,3606,3655,3702,3749,3796,3841,3892,3945,4020,4079,4136,4210,4274,4343,4421,4531,4635,4708,4774,4829,4894,4959,5008,5091,5169,5207,5252,5300,5362,5419,5474,5533,5600,5658,5720,5768,5813,5861,5912,5978,6044" + "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,108,109,110,111,112,113", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338", + "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,107,108,109,110,111,112,113", + "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 2b5adb7..5494f20 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -1,29 +1,10 @@ { "logs": [ { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rCN\\values-zh-rCN.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "122,71,70,69,68,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,60,29,30,82,72,115,67,63,74,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,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,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": "6592,3495,3429,3356,3306,827,867,915,6143,6188,6538,6488,1199,3921,3989,3862,3797,3734,4652,4592,4529,4121,2877,1369,1422,4175,3568,6245,3247,3034,3674,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,5027,4968,5168,6069,5479,5410,5543,5621,5804,5731,5102,5355,5225,5290,4919,5908,5991,6450,6343,6295,6388,1261,4066,4470,4765,4707,4832,4422,4377,4329,4278,963,1029", - "endLines": "124,71,70,69,68,19,20,21,113,114,121,120,26,78,79,77,76,75,91,90,89,81,60,29,30,82,72,115,67,63,74,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,98,97,100,112,105,104,106,107,109,108,99,103,101,102,96,110,111,119,117,116,118,27,80,88,93,92,94,87,86,85,84,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,59,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": "6764,3563,3490,3424,3351,862,910,958,6183,6240,6587,6533,1256,3984,4061,3916,3857,3792,4702,4647,4587,4170,2932,1417,1479,4255,3644,6290,3301,3072,3729,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5097,5022,5220,6138,5538,5474,5616,5726,5903,5799,5163,5405,5285,5350,4963,5986,6064,6483,6383,6338,6445,1313,4116,4524,4827,4760,4889,4465,4417,4372,4324,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107", - "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": "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,2167,2220,2263,2314,2364,2424,2477,2528,2574,2622,2670,2716,2763,2813,2858,2917,2969,3021,3064,3111,3167,3222,3277,3321,3363,3404,3454,3513,3564,3613,3662,3709,3756,3803,3848,3899,3952,4027,4086,4143,4217,4281,4350,4428,4538,4642,4715,4781,4836,4901,4966,5015,5098,5176,5214,5259,5307,5369,5426,5481,5540,5607,5665,5727,5775,5820,5868,5919,5985", - "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,107", - "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,59,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,2162,2215,2258,2309,2359,2419,2472,2523,2569,2617,2665,2711,2758,2808,2853,2912,2964,3016,3059,3106,3162,3217,3272,3316,3358,3399,3449,3508,3559,3608,3657,3704,3751,3798,3843,3894,3947,4022,4081,4138,4212,4276,4345,4423,4533,4637,4710,4776,4831,4896,4961,5010,5093,5171,5209,5254,5302,5364,5421,5476,5535,5602,5660,5722,5770,5815,5863,5914,5980,6046" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,44 +21,24 @@ "endColumns": "19", "endOffsets": "210" } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,122,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6592,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6639,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "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,108", - "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", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1726,1779,1841,1926,2007,2057,2116,2159,2219,2272,2315,2366,2416,2476,2529,2580,2626,2674,2722,2768,2815,2865,2910,2969,3021,3073,3116,3163,3219,3274,3329,3373,3415,3456,3506,3565,3616,3665,3714,3761,3808,3855,3900,3951,4004,4079,4138,4195,4269,4333,4402,4480,4590,4694,4767,4833,4888,4953,5018,5067,5150,5228,5266,5311,5359,5421,5478,5533,5592,5659,5717,5779,5827,5872,5920,5971,6037", - "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,107,108", - "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,59,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1721,1774,1836,1921,2002,2052,2111,2154,2214,2267,2310,2361,2411,2471,2524,2575,2621,2669,2717,2763,2810,2860,2905,2964,3016,3068,3111,3158,3214,3269,3324,3368,3410,3451,3501,3560,3611,3660,3709,3756,3803,3850,3895,3946,3999,4074,4133,4190,4264,4328,4397,4475,4585,4689,4762,4828,4883,4948,5013,5062,5145,5223,5261,5306,5354,5416,5473,5528,5587,5654,5712,5774,5822,5867,5915,5966,6032,6098" - } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" + "startLines": "128,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,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,124,122,121,123,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,4,4", + "startOffsets": "6947,3667,3601,3528,3478,827,867,915,6446,6491,6895,6841,6791,1199,4142,4210,4083,4018,3955,4873,4813,4750,4342,1849,1798,3049,1369,1422,4396,1911,3740,6548,3419,3206,3846,1970,2251,2497,2023,2989,2936,2885,2690,2642,2548,2596,2736,3906,2783,2294,3360,2833,3249,2208,2450,2394,2339,3151,2164,3109,2073,2114,3301,1318,1623,1719,1576,1672,1529,1484,1148,1095,5248,5189,5471,6372,5782,5713,5846,5924,6107,6034,5323,5389,5658,5528,5593,5140,6211,6294,6753,6646,6598,6691,1261,4287,4691,4986,4928,5053,4643,4598,4550,4499,963,1029", + "endLines": "130,74,73,72,71,19,20,21,118,119,127,126,125,26,82,83,81,80,79,95,94,93,85,39,38,63,29,30,86,40,75,120,70,66,77,41,47,52,42,62,61,60,56,55,53,54,57,78,58,48,69,59,67,46,51,50,49,65,45,64,43,44,68,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,124,122,121,123,27,84,92,97,96,98,91,90,89,88,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7119,3735,3662,3596,3523,862,910,958,6486,6543,6942,6890,6836,1256,4205,4282,4137,4078,4013,4923,4868,4808,4391,1906,1844,3104,1417,1479,4476,1965,3816,6593,3473,3244,3901,2018,2289,2543,2068,3044,2984,2931,2731,2685,2591,2637,2778,3950,2828,2334,3414,2880,3296,2246,2492,2445,2389,3201,2203,3146,2109,2159,3355,1364,1667,1763,1618,1714,1571,1524,1194,1143,5318,5243,5523,6441,5841,5777,5919,6029,6206,6102,5384,5466,5708,5588,5653,5184,6289,6367,6786,6686,6641,6748,1313,4337,4745,5048,4981,5110,4686,4638,4593,4545,1024,1090" }, "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "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,108,109,110,111,112,113", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,936,990,1040,1102,1170,1247,1306,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2039,2098,2179,2229,2288,2331,2391,2444,2487,2538,2588,2648,2701,2752,2798,2846,2894,2940,2987,3036,3086,3131,3190,3242,3294,3337,3384,3440,3495,3550,3594,3636,3677,3727,3786,3837,3886,3935,3982,4029,4076,4121,4172,4225,4300,4359,4416,4490,4554,4623,4701,4811,4915,4988,5054,5136,5191,5256,5321,5370,5453,5531,5569,5614,5662,5724,5781,5836,5895,5962,6020,6082,6130,6175,6223,6274,6340", + "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,107,108,109,110,111,112,113", + "endColumns": "14,72,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,64,62,54,59,62,53,61,50,59,52,61,84,58,80,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,931,985,1035,1097,1165,1242,1301,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2034,2093,2174,2224,2283,2326,2386,2439,2482,2533,2583,2643,2696,2747,2793,2841,2889,2935,2982,3031,3081,3126,3185,3237,3289,3332,3379,3435,3490,3545,3589,3631,3672,3722,3781,3832,3881,3930,3977,4024,4071,4116,4167,4220,4295,4354,4411,4485,4549,4618,4696,4806,4910,4983,5049,5131,5186,5251,5316,5365,5448,5526,5564,5609,5657,5719,5776,5831,5890,5957,6015,6077,6125,6170,6218,6269,6335,6401" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index b36a23e..7584261 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -1,10 +1,10 @@ { "logs": [ { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values-zh-rTW\\values-zh-rTW.xml", + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,61 +23,22 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "123,72,71,70,69,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,61,29,30,81,37,115,68,64,73,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,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,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,4", - "startOffsets": "6583,3591,3525,3452,3402,843,883,931,6133,6178,6529,6479,1215,3911,3979,3852,3786,3723,4641,4581,4518,4111,2973,1385,1438,4165,1784,6235,3343,3130,3663,1894,2175,2421,1947,2913,2860,2809,2614,2566,2472,2520,2660,2707,2218,3284,2757,3173,2132,2374,2318,2263,3075,2088,3033,1997,2038,3225,1334,1639,1735,1592,1688,1545,1500,1164,1111,5016,4957,5157,6058,5468,5399,5532,5610,5793,5720,5091,5344,5214,5279,4908,5897,5980,6441,6334,6286,6379,1277,4056,4459,4754,4696,4821,4411,4366,4318,4267,979,1045", - "endLines": "125,72,71,70,69,19,20,21,113,114,122,121,26,77,78,76,75,74,90,89,88,80,61,29,30,81,37,115,68,64,73,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,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,120,118,117,119,27,79,87,92,91,93,86,85,84,83,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,59,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": "6755,3658,3586,3520,3447,878,926,974,6173,6230,6578,6524,1272,3974,4051,3906,3847,3781,4691,4636,4576,4160,3028,1433,1495,4244,1859,6280,3397,3168,3718,1942,2213,2467,1992,2968,2908,2855,2655,2609,2515,2561,2702,2752,2258,3338,2804,3220,2170,2416,2369,2313,3125,2127,3070,2033,2083,3279,1380,1683,1779,1634,1730,1587,1540,1210,1159,5086,5011,5209,6127,5527,5463,5605,5715,5892,5788,5152,5394,5274,5339,4952,5975,6053,6474,6374,6329,6436,1329,4106,4513,4816,4749,4878,4454,4406,4361,4313,1040,1106" - }, - "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", - "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": "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,2165,2218,2261,2312,2362,2422,2475,2526,2572,2620,2668,2714,2761,2811,2856,2915,2967,3019,3062,3109,3165,3220,3275,3319,3361,3402,3452,3511,3562,3611,3660,3707,3754,3801,3846,3897,3950,4025,4084,4141,4215,4279,4348,4426,4536,4640,4713,4779,4834,4899,4964,5013,5096,5174,5212,5257,5305,5367,5424,5479,5538,5605,5663,5725,5773,5818,5866,5917,5983", - "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,107", - "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,59,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,2160,2213,2256,2307,2357,2417,2470,2521,2567,2615,2663,2709,2756,2806,2851,2910,2962,3014,3057,3104,3160,3215,3270,3314,3356,3397,3447,3506,3557,3606,3655,3702,3749,3796,3841,3892,3945,4020,4079,4136,4210,4274,4343,4421,4531,4635,4708,4774,4829,4894,4959,5008,5091,5169,5207,5252,5300,5362,5419,5474,5533,5600,5658,5720,5768,5813,5861,5912,5978,6044" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,123,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6583,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,6630,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "129,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,4,4,4", + "startOffsets": "6938,3763,3697,3624,3574,843,883,931,6436,6481,6886,6832,6782,1215,4132,4200,4073,4007,3944,4862,4802,4739,4332,1945,1894,3145,1385,1438,4386,2007,1784,6538,3515,3302,3835,2066,2347,2593,2119,3085,3032,2981,2786,2738,2644,2692,2832,3895,2879,2390,3456,2929,3345,2304,2546,2490,2435,3247,2260,3205,2169,2210,3397,1334,1639,1735,1592,1688,1545,1500,1164,1111,5237,5178,5460,6361,5771,5702,5835,5913,6096,6023,5312,5378,5647,5517,5582,5129,6200,6283,6744,6637,6589,6682,1277,4277,4680,4975,4917,5042,4632,4587,4539,4488,979,1045", + "endLines": "131,75,74,73,72,19,20,21,118,119,128,127,126,26,81,82,80,79,78,94,93,92,84,40,39,64,29,30,85,41,37,120,71,67,76,42,48,53,43,63,62,61,57,56,54,55,58,77,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,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "7110,3830,3758,3692,3619,878,926,974,6476,6533,6933,6881,6827,1272,4195,4272,4127,4068,4002,4912,4857,4797,4381,2002,1940,3200,1433,1495,4465,2061,1859,6583,3569,3340,3890,2114,2385,2639,2164,3140,3080,3027,2827,2781,2687,2733,2874,3939,2924,2430,3510,2976,3392,2342,2588,2541,2485,3297,2299,3242,2205,2255,3451,1380,1683,1779,1634,1730,1587,1540,1210,1159,5307,5232,5512,6430,5830,5766,5908,6018,6195,6091,5373,5455,5697,5577,5642,5173,6278,6356,6777,6677,6632,6739,1329,4327,4734,5037,4970,5099,4675,4627,4582,4534,1040,1106" }, "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,108", - "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", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1726,1779,1841,1925,2005,2055,2114,2157,2217,2270,2313,2364,2414,2474,2527,2578,2624,2672,2720,2766,2813,2863,2908,2967,3019,3071,3114,3161,3217,3272,3327,3371,3413,3454,3504,3563,3614,3663,3712,3759,3806,3853,3898,3949,4002,4077,4136,4193,4267,4331,4400,4478,4588,4692,4765,4831,4886,4951,5016,5065,5148,5226,5264,5309,5357,5419,5476,5531,5590,5657,5715,5777,5825,5870,5918,5969,6035", - "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,107,108", - "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,59,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1721,1774,1836,1920,2000,2050,2109,2152,2212,2265,2308,2359,2409,2469,2522,2573,2619,2667,2715,2761,2808,2858,2903,2962,3014,3066,3109,3156,3212,3267,3322,3366,3408,3449,3499,3558,3609,3658,3707,3754,3801,3848,3893,3944,3997,4072,4131,4188,4262,4326,4395,4473,4583,4687,4760,4826,4881,4946,5011,5060,5143,5221,5259,5304,5352,5414,5471,5526,5585,5652,5710,5772,5820,5865,5913,5964,6030,6096" + "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,108,109,110,111,112,113", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,935,989,1039,1101,1169,1246,1305,1371,1434,1489,1549,1612,1666,1728,1779,1839,1892,1954,2038,2097,2177,2227,2286,2329,2389,2442,2485,2536,2586,2646,2699,2750,2796,2844,2892,2938,2985,3034,3084,3129,3188,3240,3292,3335,3382,3438,3493,3548,3592,3634,3675,3725,3784,3835,3884,3933,3980,4027,4074,4119,4170,4223,4298,4357,4414,4488,4552,4621,4699,4809,4913,4986,5052,5134,5189,5254,5319,5368,5451,5529,5567,5612,5660,5722,5779,5834,5893,5960,6018,6080,6128,6173,6221,6272,6338", + "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,107,108,109,110,111,112,113", + "endColumns": "14,71,65,72,49,39,47,47,44,56,51,53,49,61,67,76,58,65,62,54,59,62,53,61,50,59,52,61,83,58,79,49,58,42,59,52,42,50,49,59,52,50,45,47,47,45,46,48,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,81,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,930,984,1034,1096,1164,1241,1300,1366,1429,1484,1544,1607,1661,1723,1774,1834,1887,1949,2033,2092,2172,2222,2281,2324,2384,2437,2480,2531,2581,2641,2694,2745,2791,2839,2887,2933,2980,3029,3079,3124,3183,3235,3287,3330,3377,3433,3488,3543,3587,3629,3670,3720,3779,3830,3879,3928,3975,4022,4069,4114,4165,4218,4293,4352,4409,4483,4547,4616,4694,4804,4908,4981,5047,5129,5184,5249,5314,5363,5446,5524,5562,5607,5655,5717,5774,5829,5888,5955,6013,6075,6123,6168,6216,6267,6333,6399" } } ] diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index db90949..90bd93e 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,11 +4,13 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\FontColor.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\FontColor.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1" + "startLines": "4,7,6,2,3,5", + "startColumns": "4,4,4,4,4,4", + "startOffsets": "133,255,213,55,95,172", + "endColumns": "38,45,41,39,37,40", + "endOffsets": "167,296,250,90,128,208" }, "to": { "startLines": "12,13,14,15,16,17", @@ -19,110 +21,45 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\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": "19,20,21,22,23", - "startColumns": "4,4,4,4,4", - "startOffsets": "723,775,828,881,933", - "endColumns": "51,52,52,51,51", - "endOffsets": "770,823,876,928,980" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\strings.xml", "from": { - "startLines": "130,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8138,-1,-1,-1,-1,-1,-1,-1,-1,-1,8086,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "134,-1,-1,-1,-1,-1,-1,-1,-1,-1,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,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "8542,-1,-1,-1,-1,-1,-1,-1,-1,-1,8133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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": "131,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8195,3898,4159,4063,3994,827,870,922,7641,7690,8143,8085,8034,1282,4748,4842,4677,4593,4510,5709,5626,5524,5018,2004,1953,3397,1486,1539,5079,2097,4242,7753,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,4422,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6165,6098,6406,7544,6770,6689,6844,6933,7175,7096,6249,6324,6630,6470,6550,6043,7319,7441,7993,7866,7809,7919,1366,4950,5438,5844,5775,5924,5379,5324,5262,5202,974,1084", + "endLines": "135,72,75,74,73,19,20,21,120,121,130,129,128,26,83,84,82,81,80,96,95,94,86,39,38,64,29,30,87,41,76,122,71,67,77,42,48,53,43,63,62,61,57,56,54,55,58,78,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,103,102,106,118,111,110,112,113,115,114,104,105,109,107,108,101,116,117,127,125,124,126,27,85,93,98,97,99,92,91,90,89,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "8599,3989,4237,4154,4058,865,917,969,7685,7748,8190,8138,8080,1361,4837,4945,4743,4672,4588,5770,5704,5621,5074,2061,1999,3470,1534,1594,5179,2151,4339,7803,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,4474,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6244,6160,6465,7635,6839,6765,6928,7091,7314,7170,6319,6401,6684,6545,6625,6093,7436,7539,8029,7914,7861,7988,1426,5013,5519,5919,5839,6013,5433,5374,5319,5257,1079,1169" }, "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4486,4539,4605,4667,4730,4777,4832,4920,4978,5040,5090,5135,5178,5238,5305,5360,5415,5468,5515,5568,5624,5672,5727,5780,5864,5931,5995,6091,6165,6246,6335,6498,6642,6721,6796,6878,6937,7017,7097,7152,7274,7377,7418,7471,7528,7602,7667,7735,7821,7901,7970,8064,8123,8178,8240,8300,8410", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132", - "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4481,4534,4600,4662,4725,4772,4827,4915,4973,5035,5085,5130,5173,5233,5300,5355,5410,5463,5510,5563,5619,5667,5722,5775,5859,5926,5990,6086,6160,6241,6330,6493,6637,6716,6791,6873,6932,7012,7092,7147,7269,7372,7413,7466,7523,7597,7662,7730,7816,7896,7965,8059,8118,8173,8235,8295,8405,8495" + "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1993,2051,2102,2186,2280,2388,2459,2543,2626,2692,2775,2877,2938,3000,3051,3129,3182,3242,3347,3406,3508,3563,3634,3683,3761,3819,3866,3925,3982,4053,4114,4171,4221,4273,4326,4376,4426,4483,4543,4596,4662,4724,4787,4834,4889,4977,5035,5097,5147,5192,5235,5295,5362,5417,5472,5525,5572,5625,5681,5729,5784,5837,5921,5988,6052,6148,6222,6303,6392,6555,6699,6778,6853,6935,6994,7074,7154,7209,7331,7434,7475,7528,7585,7659,7724,7792,7878,7958,8027,8121,8180,8235,8297,8357,8467", + "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133", + "endColumns": "14,95,82,95,68,42,51,51,48,62,51,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,77,57,46,58,56,70,60,56,49,51,52,49,49,56,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1988,2046,2097,2181,2275,2383,2454,2538,2621,2687,2770,2872,2933,2995,3046,3124,3177,3237,3342,3401,3503,3558,3629,3678,3756,3814,3861,3920,3977,4048,4109,4166,4216,4268,4321,4371,4421,4478,4538,4591,4657,4719,4782,4829,4884,4972,5030,5092,5142,5187,5230,5290,5357,5412,5467,5520,5567,5620,5676,5724,5779,5832,5916,5983,6047,6143,6217,6298,6387,6550,6694,6773,6848,6930,6989,7069,7149,7204,7326,7429,7470,7523,7580,7654,7719,7787,7873,7953,8022,8116,8175,8230,8292,8352,8462,8552" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-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", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "133,137,141,145,148,152,156,160,164,168,172,176,179,182,185", + "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8500,8704,8915,9125,9285,9468,9653,9838,10041,10247,10430,10631,10748,10858,10964", - "endLines": "136,140,144,147,151,155,159,163,167,171,175,178,181,184,187", + "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", + "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8699,8910,9120,9280,9463,9648,9833,10036,10242,10425,10626,10743,10853,10959,11061" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "666", - "endColumns": "56", - "endOffsets": "718" - } - } - ] - }, - { - "outputFile": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\FontColor.xml", - "from": { - "startLines": "4,7,6,2,3,5", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "137,262,219,57,98,177", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "171,303,256,92,131,213" + "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" }, "to": { - "startLines": "12,13,14,15,16,17", - "startColumns": "4,4,4,4,4,4", - "startOffsets": "420,459,505,547,587,625", - "endColumns": "38,45,41,39,37,40", - "endOffsets": "454,500,542,582,620,661" + "startLines": "134,138,142,146,149,153,157,161,165,169,173,177,180,183,186", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8557,8761,8972,9182,9342,9525,9710,9895,10098,10304,10487,10688,10805,10915,11021", + "endLines": "137,141,145,148,152,156,160,164,168,172,176,179,182,185,188", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "8756,8967,9177,9337,9520,9705,9890,10093,10299,10482,10683,10800,10910,11016,11118" } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -139,45 +76,7 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "129,72,75,74,73,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,64,29,30,86,41,76,121,71,67,77,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,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": "8086,3898,4159,4063,3994,827,870,922,7584,7633,8028,7977,1282,4691,4785,4620,4536,4453,5652,5569,5467,4961,2004,1953,3397,1486,1539,5022,2097,4242,7696,3827,3582,4344,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6108,6041,6349,7487,6713,6632,6787,6876,7118,7039,6192,6267,6573,6413,6493,5986,7262,7384,7936,7809,7752,7862,1366,4893,5381,5787,5718,5867,5322,5267,5205,5145,974,1084", - "endLines": "133,72,75,74,73,19,20,21,119,120,128,127,26,82,83,81,80,79,95,94,93,85,39,38,64,29,30,86,41,76,121,71,67,77,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,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,77,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": "8490,3989,4237,4154,4058,865,917,969,7628,7691,8081,8023,1361,4780,4888,4686,4615,4531,5713,5647,5564,5017,2061,1999,3470,1534,1594,5122,2151,4339,7746,3893,3626,4417,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6187,6103,6408,7578,6782,6708,6871,7034,7257,7113,6262,6344,6627,6488,6568,6036,7379,7482,7972,7857,7804,7931,1426,4956,5462,5862,5782,5956,5376,5317,5262,5200,1079,1169" - }, - "to": { - "startLines": "24,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", - "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": "985,1338,1434,1517,1613,1682,1725,1777,1829,1878,1941,1999,2050,2134,2228,2336,2407,2491,2574,2640,2723,2825,2886,2948,2999,3077,3130,3190,3295,3354,3456,3511,3582,3631,3709,3767,3814,3873,3930,4001,4062,4119,4169,4221,4274,4324,4374,4434,4487,4553,4615,4678,4725,4780,4868,4926,4988,5038,5083,5126,5186,5253,5308,5363,5416,5463,5516,5572,5620,5675,5728,5812,5879,5943,6039,6113,6194,6283,6446,6590,6669,6744,6826,6885,6965,7045,7100,7222,7325,7366,7419,7476,7550,7615,7683,7769,7849,7918,8012,8071,8126,8188,8248,8358", - "endLines": "28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", - "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,77,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": "1333,1429,1512,1608,1677,1720,1772,1824,1873,1936,1994,2045,2129,2223,2331,2402,2486,2569,2635,2718,2820,2881,2943,2994,3072,3125,3185,3290,3349,3451,3506,3577,3626,3704,3762,3809,3868,3925,3996,4057,4114,4164,4216,4269,4319,4369,4429,4482,4548,4610,4673,4720,4775,4863,4921,4983,5033,5078,5121,5181,5248,5303,5358,5411,5458,5511,5567,5615,5670,5723,5807,5874,5938,6034,6108,6189,6278,6441,6585,6664,6739,6821,6880,6960,7040,7095,7217,7320,7361,7414,7471,7545,7610,7678,7764,7844,7913,8007,8066,8121,8183,8243,8353,8443" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "64,69,78,74,36,40,44,49,54,32,59,28,25,19,22", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2499,2704,3077,2916,1332,1515,1700,1886,2090,1149,2297,1031,921,713,819", - "endLines": "67,72,81,76,39,43,47,52,57,35,62,30,27,21,24", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2698,2910,3283,3071,1510,1695,1880,2084,2291,1327,2493,1143,1026,814,916" - }, - "to": { - "startLines": "132,136,140,144,147,151,155,159,163,167,171,175,178,181,184", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8448,8652,8863,9073,9233,9416,9601,9786,9989,10195,10378,10579,10696,10806,10912", - "endLines": "135,139,143,146,150,154,158,162,166,170,174,177,180,183,186", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8647,8858,9068,9228,9411,9596,9781,9984,10190,10373,10574,10691,10801,10907,11009" - } - }, - { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", @@ -196,7 +95,7 @@ } }, { - "source": "C:\\Users\\82590\\AndroidStudioProjects\\Notes-master2\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\Work-java\\MINOTES\\minotes\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 177ca71..450a98d 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,410 +1,386 @@ [ { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_font_color_bright_blue.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\font_color_bright_blue.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_color_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_color_green.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" + "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw/introduction" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", + "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/preferences.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_font_color_green.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\font_color_green.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" - }, - { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.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\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" }, { - "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": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_long_click_menu.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\long_click_menu.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_item.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" + "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_font_color_default.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\font_color_default.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" + "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", + "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_font_color_red.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\font_color_red.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" + "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", + "source": "net.micode.notes.app-main-7:/xml/searchable.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_color_green.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_color_green.png" + "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" + "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", + "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" }, { - "merged": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", - "source": "C:\\Users\\82590\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" + "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", + "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" } ] \ No newline at end of file diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index b9f269d..7135a18 100644 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/28fd60c4e4f5863b3f070a25c0186a68984cfdc7082bc8a23f4fdb19e4d7d7a9_5.jar b/app/build/intermediates/project_dex_archive/debug/out/28fd60c4e4f5863b3f070a25c0186a68984cfdc7082bc8a23f4fdb19e4d7d7a9_5.jar deleted file mode 100644 index f38d999..0000000 Binary files a/app/build/intermediates/project_dex_archive/debug/out/28fd60c4e4f5863b3f070a25c0186a68984cfdc7082bc8a23f4fdb19e4d7d7a9_5.jar and /dev/null differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index 9699d5d..dd43cb4 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index bd423a1..171c306 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 6e4a882..31a0c14 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex index 5db151b..63ffdc9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/FontColorParser$TextAppearanceResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 095d37c..0bfd54b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index 091978e..bcdbefa 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index b6f3e08..c183d73 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index c077869..c213131 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index d48fadd..24727dc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 881486c..c6aa311 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index abdc75a..5d30cee 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 1d1ec6b..3c00a32 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index ce6cd93..1af261e 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index 58e7aea..34018b6 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index c2c00db..9016fe9 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 8faff5f..46a48ad 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index 3395a06..55d55a1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index b777627..a90f86d 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index e44cf5c..32d3200 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index baf99d9..a3cdcd0 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index e0245f1..4f69626 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 28bb247..332ebea 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/app/build/intermediates/runtime_symbol_list/debug/R.txt b/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00c5676..4f814fb 100644 --- a/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -1,23 +1,19 @@ int array format_for_exported_note 0x7f010000 int array menu_share_ways 0x7f010001 -int color Blue 0x7f020003 -int color Bright_Blue 0x7f020004 -int color Default 0x7f020005 -int color Green 0x7f020006 -int color Red 0x7f020007 -int color Yellow 0x7f020008 -int color font_color_bright_blue 0x7f020009 -int color font_color_default 0x7f02000a -int color font_color_green 0x7f02000b -int color font_color_red 0x7f02000c -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 -int dimen text_font_size_large 0x7f030001 -int dimen text_font_size_medium 0x7f030002 -int dimen text_font_size_normal 0x7f030003 -int dimen text_font_size_small 0x7f030004 -int dimen text_font_size_super 0x7f030005 +int color Blue 0x7f020000 +int color Bright_Blue 0x7f020001 +int color Default 0x7f020002 +int color Green 0x7f020003 +int color Red 0x7f020004 +int color Yellow 0x7f020005 +int color primary_text_dark 0x7f020006 +int color secondary_text_dark 0x7f020007 +int color user_query_highlight 0x7f020008 +int dimen text_font_size_large 0x7f030000 +int dimen text_font_size_medium 0x7f030001 +int dimen text_font_size_normal 0x7f030002 +int dimen text_font_size_small 0x7f030003 +int dimen text_font_size_super 0x7f030004 int drawable bg_btn_set_color 0x7f040000 int drawable bg_color_btn_mask 0x7f040001 int drawable call_record 0x7f040002 @@ -96,9 +92,9 @@ int id date 0x7f050007 int id delete 0x7f050008 int id et_edit_text 0x7f050009 int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000c -int id hour 0x7f05000d -int id iv_Bright_blue_select 0x7f05004e +int id font_size_selector 0x7f05000b +int id hour 0x7f05000c +int id iv_Bright_blue_select 0x7f05000d int id iv_alert_icon 0x7f05000e int id iv_bg_blue 0x7f05000f int id iv_bg_blue_select 0x7f050010 @@ -110,58 +106,59 @@ int id iv_bg_white 0x7f050015 int id iv_bg_white_select 0x7f050016 int id iv_bg_yellow 0x7f050017 int id iv_bg_yellow_select 0x7f050018 -int id iv_default_select 0x7f050048 -int id iv_green_select 0x7f05004b -int id iv_large_select 0x7f050019 -int id iv_medium_select 0x7f05001a -int id iv_red_select 0x7f05004f -int id iv_small_select 0x7f05001b -int id iv_super_select 0x7f05001c -int id ll_font_Bright_blue 0x7f050050 -int id ll_font_color_selector 0x7f050049 -int id ll_font_default 0x7f05004a -int id ll_font_green 0x7f05004c -int id ll_font_large 0x7f05001e -int id ll_font_normal 0x7f05001f -int id ll_font_red 0x7f050051 -int id ll_font_small 0x7f050020 -int id ll_font_super 0x7f050021 -int id menu_alert 0x7f050022 -int id menu_change_font_color 0x7f050047 -int id menu_delete 0x7f050023 -int id menu_delete_remind 0x7f050024 -int id menu_export_text 0x7f050025 -int id menu_font_size 0x7f050027 -int id menu_list_mode 0x7f050028 -int id menu_new_folder 0x7f050029 -int id menu_new_note 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 id iv_default_select 0x7f050019 +int id iv_green_select 0x7f05001a +int id iv_large_select 0x7f05001b +int id iv_medium_select 0x7f05001c +int id iv_red_select 0x7f05001d +int id iv_small_select 0x7f05001e +int id iv_super_select 0x7f05001f +int id ll_font_Bright_blue 0x7f050020 +int id ll_font_color_selector 0x7f050021 +int id ll_font_default 0x7f050022 +int id ll_font_green 0x7f050023 +int id ll_font_large 0x7f050024 +int id ll_font_normal 0x7f050025 +int id ll_font_red 0x7f050026 +int id ll_font_small 0x7f050027 +int id ll_font_super 0x7f050028 +int id menu_alert 0x7f050029 +int id menu_change_font_color 0x7f05002a +int id menu_delete 0x7f05002b +int id menu_delete_remind 0x7f05002c +int id menu_export_text 0x7f05002d +int id menu_font_size 0x7f05002e +int id menu_insert_img 0x7f05002f +int id menu_list_mode 0x7f050030 +int id menu_new_folder 0x7f050031 +int id menu_new_note 0x7f050032 +int id menu_search 0x7f050033 +int id menu_send_to_desktop 0x7f050034 +int id menu_setting 0x7f050035 +int id menu_share 0x7f050036 +int id menu_sync 0x7f050037 +int id minute 0x7f050038 +int id move 0x7f050039 +int id navigation_bar 0x7f05003a +int id note_bg_color_selector 0x7f05003b +int id note_edit_list 0x7f05003c +int id note_edit_view 0x7f05003d +int id note_item 0x7f05003e +int id note_title 0x7f05003f +int id notes_list 0x7f050040 +int id prefenerece_sync_status_textview 0x7f050041 +int id preference_sync_button 0x7f050042 +int id selection_menu 0x7f050043 +int id sv_note_edit 0x7f050044 +int id tv_alert_date 0x7f050045 +int id tv_folder_name 0x7f050046 +int id tv_modified_date 0x7f050047 +int id tv_name 0x7f050048 +int id tv_time 0x7f050049 +int id tv_title 0x7f05004a +int id tv_title_bar 0x7f05004b +int id widget_bg_image 0x7f05004c +int id widget_text 0x7f05004d int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -194,22 +191,22 @@ int string app_widget2x2 0x7f0a0005 int string app_widget4x4 0x7f0a0006 int string button_delete 0x7f0a0007 int string call_record_folder_name 0x7f0a0008 -int string change_txt_color 0x7f0a006a -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 +int string change_txt_color 0x7f0a0009 +int string datetime_dialog_cancel 0x7f0a000a +int string datetime_dialog_ok 0x7f0a000b +int string delete_remind_time_message 0x7f0a000c +int string error_note_empty_for_clock 0x7f0a000d +int string error_note_empty_for_send_to_desktop 0x7f0a000e +int string error_note_not_exist 0x7f0a000f +int string error_sdcard_export 0x7f0a0010 +int string error_sdcard_unmounted 0x7f0a0011 +int string error_sync_cancelled 0x7f0a0012 +int string error_sync_internal 0x7f0a0013 +int string error_sync_network 0x7f0a0014 +int string failed_sdcard_export 0x7f0a0015 +int string file_name_txt_format 0x7f0a0016 +int string file_path 0x7f0a0017 +int string folder_exist 0x7f0a0018 int string format_date_ymd 0x7f0a0019 int string format_datetime_mdhm 0x7f0a001a int string format_exported_file_location 0x7f0a001b @@ -218,19 +215,20 @@ int string format_move_notes_to_folder 0x7f0a001d int string hint_foler_name 0x7f0a001e int string info_note_enter_desktop 0x7f0a001f int string menu_alert 0x7f0a0020 -int string menu_change_font_color 0x7f0a0069 -int string menu_create_folder 0x7f0a0021 -int string menu_delete 0x7f0a0022 -int string menu_deselect_all 0x7f0a0023 -int string menu_export_text 0x7f0a0024 -int string menu_folder_change_name 0x7f0a0025 -int string menu_folder_delete 0x7f0a0026 -int string menu_folder_view 0x7f0a0027 -int string menu_font_large 0x7f0a002a -int string menu_font_normal 0x7f0a002b -int string menu_font_size 0x7f0a002c -int string menu_font_small 0x7f0a002d -int string menu_font_super 0x7f0a002e +int string menu_change_font_color 0x7f0a0021 +int string menu_create_folder 0x7f0a0022 +int string menu_delete 0x7f0a0023 +int string menu_deselect_all 0x7f0a0024 +int string menu_export_text 0x7f0a0025 +int string menu_folder_change_name 0x7f0a0026 +int string menu_folder_delete 0x7f0a0027 +int string menu_folder_view 0x7f0a0028 +int string menu_font_large 0x7f0a0029 +int string menu_font_normal 0x7f0a002a +int string menu_font_size 0x7f0a002b +int string menu_font_small 0x7f0a002c +int string menu_font_super 0x7f0a002d +int string menu_insert_img 0x7f0a002e int string menu_list_mode 0x7f0a002f int string menu_move 0x7f0a0030 int string menu_move_parent_folder 0x7f0a0031 @@ -293,17 +291,17 @@ int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0005 -int style TextAppearanceMedium 0x7f0b0006 -int style TextAppearanceNormal 0x7f0b0007 -int style TextAppearancePrimaryItem 0x7f0b0008 -int style TextAppearanceSecondaryItem 0x7f0b0009 -int style TextAppearanceSuper 0x7f0b000a -int style TextAppearanceUnderMenuIcon 0x7f0b000b -int style TextColorBrightBlue 0x7f0b000c -int style TextColorDefault 0x7f0b000d -int style TextColorGreen 0x7f0b000e -int style TextColorRed 0x7f0b000f +int style TextAppearanceLarge 0x7f0b0004 +int style TextAppearanceMedium 0x7f0b0005 +int style TextAppearanceNormal 0x7f0b0006 +int style TextAppearancePrimaryItem 0x7f0b0007 +int style TextAppearanceSecondaryItem 0x7f0b0008 +int style TextAppearanceSuper 0x7f0b0009 +int style TextAppearanceUnderMenuIcon 0x7f0b000a +int style TextColorBrightBlue 0x7f0b000b +int style TextColorDefault 0x7f0b000c +int style TextColorGreen 0x7f0b000d +int style TextColorRed 0x7f0b000e int xml preferences 0x7f0c0000 int xml searchable 0x7f0c0001 int xml widget_2x_info 0x7f0c0002 diff --git a/app/build/intermediates/source_set_path_map/debug/file-map.txt b/app/build/intermediates/source_set_path_map/debug/file-map.txt index 309c383..c73f3d0 100644 --- a/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\debug\res -net.micode.notes.app-main-7 C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\res +net.micode.notes.app-pngs-0 D:\Work-java\MINOTES\minotes\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\Work-java\MINOTES\minotes\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\Work-java\MINOTES\minotes\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\Work-java\MINOTES\minotes\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\Work-java\MINOTES\minotes\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\Work-java\MINOTES\minotes\app\src\debug\res +net.micode.notes.app-main-7 D:\Work-java\MINOTES\minotes\app\src\main\res diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 9a9d6b4..0085047 100644 --- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,270 +1,247 @@ -net.micode.notes:string/search_label = 0x7f0a005b -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:style/TextColorGreen = 0x7f0b000e -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0005 -net.micode.notes:menu/long_click_menu = 0x7f070007 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:style/TextColorGreen = 0x7f0b000d +net.micode.notes:style/TextColorDefault = 0x7f0b000c +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/preferences_title = 0x7f0a0056 -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0007 -net.micode.notes:id/ll_font_red = 0x7f050051 -net.micode.notes:string/preferences_account_summary = 0x7f0a0047 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055 -net.micode.notes:string/menu_move = 0x7f0a0030 -net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:string/widget_havenot_content = 0x7f0a0067 +net.micode.notes:string/ticker_syncing = 0x7f0a0066 net.micode.notes:string/ticker_success = 0x7f0a0065 -net.micode.notes:style/TextColorDefault = 0x7f0b000d -net.micode.notes:color/font_color_red = 0x7f02000c +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0063 net.micode.notes:string/sync_progress_syncing = 0x7f0a0062 -net.micode.notes:color/font_color_default = 0x7f02000a -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0025 -net.micode.notes:color/Default = 0x7f020005 -net.micode.notes:string/note_link_other = 0x7f0a0040 -net.micode.notes:string/note_alert_expired = 0x7f0a003e -net.micode.notes:string/menu_export_text = 0x7f0a0024 -net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/sync_progress_init_list = 0x7f0a0060 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053 -net.micode.notes:string/menu_sync = 0x7f0a003b +net.micode.notes:string/search_label = 0x7f0a005b +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058 net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0057 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:string/note_link_tel = 0x7f0a0041 -net.micode.notes:id/widget_text = 0x7f050045 -net.micode.notes:color/font_color_green = 0x7f02000b -net.micode.notes:string/ticker_syncing = 0x7f0a0066 -net.micode.notes:id/selection_menu = 0x7f05003b -net.micode.notes:id/menu_search = 0x7f05002b -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:string/format_folder_files_count = 0x7f0a001c -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050 -net.micode.notes:id/iv_default_select = 0x7f050048 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0056 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0055 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/menu_normal_mode = 0x7f0a0032 -net.micode.notes:drawable/title_alert = 0x7f040037 -net.micode.notes:id/note_title = 0x7f050037 -net.micode.notes:string/menu_search = 0x7f0a0034 -net.micode.notes:style/TextColorBrightBlue = 0x7f0b000c -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:style/TextAppearanceGreen = 0x7f0b0004 -net.micode.notes:string/menu_sync_cancel = 0x7f0a003c -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b -net.micode.notes:id/menu_change_font_color = 0x7f050047 -net.micode.notes:id/notes_list = 0x7f050038 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0053 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0050 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004c -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:string/widget_havenot_content = 0x7f0a0067 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0009 -net.micode.notes:string/notelist_menu_new = 0x7f0a0045 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001d -net.micode.notes:drawable/widget_2x_red = 0x7f04003b -net.micode.notes:string/menu_remove_remind = 0x7f0a0033 -net.micode.notes:id/iv_green_select = 0x7f05004b -net.micode.notes:id/sv_note_edit = 0x7f05003c -net.micode.notes:drawable/new_note = 0x7f040030 -net.micode.notes:string/notealert_enter = 0x7f0a0043 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040021 -net.micode.notes:string/notelist_string_info = 0x7f0a0046 +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004b +net.micode.notes:string/preferences_account_summary = 0x7f0a0047 net.micode.notes:string/success_sdcard_export = 0x7f0a005e -net.micode.notes:string/menu_move_parent_folder = 0x7f0a0031 -net.micode.notes:string/menu_share = 0x7f0a003a -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0063 -net.micode.notes:color/Blue = 0x7f020003 -net.micode.notes:id/ll_font_default = 0x7f05004a +net.micode.notes:string/notelist_string_info = 0x7f0a0046 +net.micode.notes:string/notelist_menu_new = 0x7f0a0045 net.micode.notes:string/notealert_ok = 0x7f0a0044 +net.micode.notes:string/notealert_enter = 0x7f0a0043 +net.micode.notes:string/note_link_web = 0x7f0a0042 +net.micode.notes:string/note_link_tel = 0x7f0a0041 +net.micode.notes:string/note_link_other = 0x7f0a0040 net.micode.notes:string/note_link_email = 0x7f0a003f -net.micode.notes:id/ll_font_Red = 0x7f050052 +net.micode.notes:string/note_alert_expired = 0x7f0a003e +net.micode.notes:string/menu_sync_cancel = 0x7f0a003c +net.micode.notes:string/menu_sync = 0x7f0a003b +net.micode.notes:string/menu_share = 0x7f0a003a +net.micode.notes:string/menu_select_title = 0x7f0a0037 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0036 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003d +net.micode.notes:string/menu_select_all = 0x7f0a0035 +net.micode.notes:string/menu_search = 0x7f0a0034 +net.micode.notes:string/menu_remove_remind = 0x7f0a0033 +net.micode.notes:string/menu_normal_mode = 0x7f0a0032 +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0031 +net.micode.notes:string/menu_move = 0x7f0a0030 net.micode.notes:string/menu_list_mode = 0x7f0a002f -net.micode.notes:id/iv_bg_blue_select = 0x7f050010 -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/menu_font_super = 0x7f0a002e -net.micode.notes:string/menu_font_small = 0x7f0a002d -net.micode.notes:id/tv_title_bar = 0x7f050043 -net.micode.notes:string/menu_font_green = 0x7f0a0029 -net.micode.notes:string/menu_deselect_all = 0x7f0a0023 -net.micode.notes:id/menu_share = 0x7f05002e +net.micode.notes:string/menu_insert_img = 0x7f0a002e +net.micode.notes:string/menu_font_super = 0x7f0a002d +net.micode.notes:string/menu_font_small = 0x7f0a002c +net.micode.notes:string/menu_export_text = 0x7f0a0025 +net.micode.notes:string/menu_deselect_all = 0x7f0a0024 +net.micode.notes:string/menu_create_folder = 0x7f0a0022 net.micode.notes:string/info_note_enter_desktop = 0x7f0a001f -net.micode.notes:string/menu_create_folder = 0x7f0a0021 -net.micode.notes:string/note_link_web = 0x7f0a0042 -net.micode.notes:color/Green = 0x7f020006 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a001a +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001d +net.micode.notes:string/format_folder_files_count = 0x7f0a001c net.micode.notes:string/format_date_ymd = 0x7f0a0019 -net.micode.notes:string/menu_select_all = 0x7f0a0035 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003d -net.micode.notes:string/font_color = 0x7f0a0018 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 net.micode.notes:string/hint_foler_name = 0x7f0a001e -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0008 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0058 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068 -net.micode.notes:id/menu_send_to_desktop = 0x7f05002c -net.micode.notes:string/menu_select_none = 0x7f0a0036 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0006 +net.micode.notes:string/folder_exist = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0017 +net.micode.notes:string/ticker_fail = 0x7f0a0064 +net.micode.notes:string/file_name_txt_format = 0x7f0a0016 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0015 net.micode.notes:string/set_remind_time_message = 0x7f0a005d -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:id/iv_font_green_select = 0x7f050046 -net.micode.notes:drawable/font_color_green = 0x7f040010 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:id/iv_red_select = 0x7f05004f +net.micode.notes:string/error_sync_network = 0x7f0a0014 +net.micode.notes:string/error_note_not_exist = 0x7f0a000f +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000e +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000d +net.micode.notes:style/TextColorBrightBlue = 0x7f0b000b +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000b +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000a +net.micode.notes:string/menu_folder_view = 0x7f0a0028 +net.micode.notes:id/menu_delete = 0x7f05002b +net.micode.notes:string/change_txt_color = 0x7f0a0009 +net.micode.notes:drawable/list_green_up = 0x7f040021 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note_normal = 0x7f040031 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_select_title = 0x7f0a0037 -net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/menu_font_normal = 0x7f0a002a net.micode.notes:string/format_exported_file_location = 0x7f0a001b -net.micode.notes:string/menu_font_normal = 0x7f0a002b -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:raw/introduction = 0x7f090000 +net.micode.notes:string/delete_remind_time_message = 0x7f0a000c +net.micode.notes:dimen/text_font_size_super = 0x7f030004 net.micode.notes:drawable/selected = 0x7f040036 -net.micode.notes:dimen/text_font_size_super = 0x7f030005 -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:id/iv_bg_blue = 0x7f05000f -net.micode.notes:drawable/new_note_pressed = 0x7f040032 -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 -net.micode.notes:id/move = 0x7f050031 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b000a -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:color/secondary_text_dark = 0x7f020001 +net.micode.notes:plurals/search_results_title = 0x7f080000 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040028 net.micode.notes:layout/note_item = 0x7f060007 net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050004 +net.micode.notes:id/ll_font_Bright_blue = 0x7f050020 net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:id/ll_font_Bright_blue = 0x7f050050 +net.micode.notes:id/widget_text = 0x7f05004d +net.micode.notes:id/tv_title_bar = 0x7f05004b net.micode.notes:drawable/widget_2x_blue = 0x7f040039 -net.micode.notes:id/tv_time = 0x7f050041 -net.micode.notes:color/Red = 0x7f020007 -net.micode.notes:id/tv_name = 0x7f050040 -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f05003a -net.micode.notes:id/note_edit_view = 0x7f050035 +net.micode.notes:id/tv_time = 0x7f050049 +net.micode.notes:color/Red = 0x7f020004 +net.micode.notes:id/tv_name = 0x7f050048 +net.micode.notes:id/selection_menu = 0x7f050043 +net.micode.notes:string/error_sdcard_export = 0x7f0a0010 +net.micode.notes:id/preference_sync_button = 0x7f050042 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:drawable/title_alert = 0x7f040037 +net.micode.notes:id/note_title = 0x7f05003f net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0052 -net.micode.notes:id/navigation_bar = 0x7f050032 +net.micode.notes:id/note_edit_view = 0x7f05003d +net.micode.notes:id/navigation_bar = 0x7f05003a net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f050030 net.micode.notes:drawable/font_normal = 0x7f040012 +net.micode.notes:id/minute = 0x7f050038 net.micode.notes:drawable/font_super = 0x7f040015 -net.micode.notes:id/menu_sync = 0x7f05002f -net.micode.notes:id/menu_setting = 0x7f05002d +net.micode.notes:id/menu_sync = 0x7f050037 +net.micode.notes:id/menu_share = 0x7f050036 +net.micode.notes:id/menu_setting = 0x7f050035 +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0068 +net.micode.notes:id/menu_send_to_desktop = 0x7f050034 +net.micode.notes:id/menu_search = 0x7f050033 net.micode.notes:drawable/list_green_down = 0x7f04001e -net.micode.notes:id/menu_new_note = 0x7f05002a -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050029 -net.micode.notes:id/menu_list_mode = 0x7f050028 -net.micode.notes:id/iv_medium_select = 0x7f05001a -net.micode.notes:id/menu_export_text = 0x7f050025 -net.micode.notes:string/change_txt_color = 0x7f0a006a -net.micode.notes:string/menu_folder_view = 0x7f0a0027 -net.micode.notes:id/menu_delete = 0x7f050023 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:string/ticker_fail = 0x7f0a0064 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050039 +net.micode.notes:id/menu_new_note = 0x7f050032 +net.micode.notes:id/menu_new_folder = 0x7f050031 +net.micode.notes:id/menu_list_mode = 0x7f050030 +net.micode.notes:id/iv_medium_select = 0x7f05001c +net.micode.notes:id/menu_export_text = 0x7f05002d net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/menu_alert = 0x7f050022 -net.micode.notes:id/ll_font_color_selector = 0x7f050049 -net.micode.notes:string/menu_change_font_color = 0x7f0a0069 -net.micode.notes:string/menu_font_size = 0x7f0a002c +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050041 +net.micode.notes:string/menu_font_size = 0x7f0a002b +net.micode.notes:string/menu_change_font_color = 0x7f0a0021 net.micode.notes:string/menu_alert = 0x7f0a0020 net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:id/ll_font_color_selector = 0x7f050021 +net.micode.notes:id/menu_alert = 0x7f050029 net.micode.notes:string/success_sync_account = 0x7f0a005f -net.micode.notes:id/ll_font_super = 0x7f050021 -net.micode.notes:id/ll_font_small = 0x7f050020 -net.micode.notes:id/ll_font_normal = 0x7f05001f +net.micode.notes:id/ll_font_super = 0x7f050028 +net.micode.notes:id/ll_font_small = 0x7f050027 net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:id/ll_font_large = 0x7f05001e -net.micode.notes:id/note_bg_color_selector = 0x7f050033 -net.micode.notes:id/iv_super_select = 0x7f05001c +net.micode.notes:id/ll_font_normal = 0x7f050025 +net.micode.notes:id/ll_font_large = 0x7f050024 +net.micode.notes:id/note_bg_color_selector = 0x7f05003b net.micode.notes:drawable/search_result = 0x7f040035 +net.micode.notes:id/iv_super_select = 0x7f05001f +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:id/notes_list = 0x7f050040 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0011 +net.micode.notes:drawable/font_color_green = 0x7f040010 +net.micode.notes:id/iv_red_select = 0x7f05001d +net.micode.notes:drawable/new_note = 0x7f040030 +net.micode.notes:id/sv_note_edit = 0x7f050044 +net.micode.notes:id/iv_green_select = 0x7f05001a +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:color/secondary_text_dark = 0x7f020007 +net.micode.notes:id/move = 0x7f050039 +net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 +net.micode.notes:menu/call_note_edit = 0x7f070000 +net.micode.notes:drawable/new_note_pressed = 0x7f040032 +net.micode.notes:id/iv_bg_blue = 0x7f05000f +net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:id/iv_default_select = 0x7f050019 net.micode.notes:id/iv_bg_yellow = 0x7f050017 -net.micode.notes:drawable/widget_2x_green = 0x7f04003a -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 +net.micode.notes:string/error_sync_cancelled = 0x7f0a0012 net.micode.notes:id/iv_bg_white_select = 0x7f050016 -net.micode.notes:id/iv_large_select = 0x7f050019 -net.micode.notes:string/menu_font_large = 0x7f0a002a +net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:string/menu_font_large = 0x7f0a0029 net.micode.notes:drawable/widget_4x_blue = 0x7f04003e +net.micode.notes:id/iv_large_select = 0x7f05001b +net.micode.notes:id/widget_bg_image = 0x7f05004c net.micode.notes:id/iv_bg_green_select = 0x7f050012 -net.micode.notes:id/widget_bg_image = 0x7f050044 -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d -net.micode.notes:drawable/menu_move = 0x7f04002f -net.micode.notes:drawable/widget_4x_white = 0x7f040041 +net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:id/iv_bg_green = 0x7f050011 net.micode.notes:id/et_edit_text = 0x7f050009 +net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/search = 0x7f0a0059 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 +net.micode.notes:id/iv_bg_blue_select = 0x7f050010 +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004d +net.micode.notes:drawable/menu_move = 0x7f04002f +net.micode.notes:drawable/widget_4x_white = 0x7f040041 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:id/iv_bg_green = 0x7f050011 net.micode.notes:drawable/widget_4x_green = 0x7f04003f -net.micode.notes:id/hour = 0x7f05000d -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033 net.micode.notes:style/NoteTheme = 0x7f0b0003 +net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040033 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003d -net.micode.notes:dimen/text_font_size_large = 0x7f030001 -net.micode.notes:id/tv_alert_date = 0x7f05003d -net.micode.notes:id/iv_bg_red = 0x7f050013 -net.micode.notes:drawable/notification = 0x7f040034 -net.micode.notes:color/Bright_Blue = 0x7f020004 -net.micode.notes:id/font_color_selector = 0x7f05000b -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000b +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f050045 +net.micode.notes:drawable/widget_2x_red = 0x7f04003b +net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:drawable/widget_2x_green = 0x7f04003a net.micode.notes:drawable/title_bar_bg = 0x7f040038 -net.micode.notes:drawable/menu_delete = 0x7f04002e -net.micode.notes:string/error_sync_internal = 0x7f0a0012 +net.micode.notes:id/iv_bg_red = 0x7f050013 +net.micode.notes:drawable/notification = 0x7f040034 net.micode.notes:drawable/list_green_single = 0x7f040020 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003f +net.micode.notes:id/tv_modified_date = 0x7f050047 net.micode.notes:drawable/list_blue_middle = 0x7f040019 -net.micode.notes:id/iv_small_select = 0x7f05001b +net.micode.notes:id/iv_small_select = 0x7f05001e net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004e -net.micode.notes:dimen/text_font_color_green = 0x7f030000 -net.micode.notes:id/ll_font_green = 0x7f05004c net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:string/menu_folder_delete = 0x7f0a0026 +net.micode.notes:string/menu_folder_delete = 0x7f0a0027 +net.micode.notes:id/ll_font_green = 0x7f050023 net.micode.notes:drawable/dropdown_icon = 0x7f040005 net.micode.notes:id/date = 0x7f050007 -net.micode.notes:color/Yellow = 0x7f020008 +net.micode.notes:color/Bright_Blue = 0x7f020001 +net.micode.notes:color/Yellow = 0x7f020005 net.micode.notes:drawable/list_yellow_single = 0x7f04002c net.micode.notes:drawable/list_red_up = 0x7f040025 net.micode.notes:drawable/widget_4x_yellow = 0x7f040042 net.micode.notes:drawable/list_yellow_middle = 0x7f04002b -net.micode.notes:id/tv_folder_name = 0x7f05003e +net.micode.notes:id/tv_folder_name = 0x7f050046 net.micode.notes:drawable/list_yellow_down = 0x7f04002a net.micode.notes:drawable/clock = 0x7f040003 net.micode.notes:drawable/list_white_up = 0x7f040029 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:id/iv_alert_icon = 0x7f05000e net.micode.notes:layout/dialog_edit_text = 0x7f060003 net.micode.notes:string/preferences_account_title = 0x7f0a0048 net.micode.notes:drawable/edit_white = 0x7f04000e net.micode.notes:drawable/list_white_middle = 0x7f040027 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:id/iv_Bright_blue_select = 0x7f05004e +net.micode.notes:id/menu_change_font_color = 0x7f05002a +net.micode.notes:color/user_query_highlight = 0x7f020008 +net.micode.notes:id/iv_Bright_blue_select = 0x7f05000d net.micode.notes:drawable/list_white_down = 0x7f040026 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:drawable/widget_4x_red = 0x7f040040 -net.micode.notes:id/menu_delete_remind = 0x7f050024 -net.micode.notes:drawable/list_red_down = 0x7f040022 -net.micode.notes:drawable/list_red_middle = 0x7f040023 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:dimen/text_font_size_normal = 0x7f030003 -net.micode.notes:id/menu_font_color = 0x7f050026 +net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040018 +net.micode.notes:drawable/list_red_middle = 0x7f040023 +net.micode.notes:drawable/list_red_down = 0x7f040022 net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:drawable/list_green_middle = 0x7f04001f net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038 net.micode.notes:drawable/list_red_single = 0x7f040024 net.micode.notes:string/preferences_add_account = 0x7f0a0049 @@ -279,44 +256,53 @@ net.micode.notes:drawable/font_small = 0x7f040014 net.micode.notes:string/sync_progress_login = 0x7f0a0061 net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/widget_2x_white = 0x7f04003c -net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:style/TextColorRed = 0x7f0b000f -net.micode.notes:id/tv_title = 0x7f050042 -net.micode.notes:color/primary_text_dark = 0x7f020000 +net.micode.notes:style/TextColorRed = 0x7f0b000e +net.micode.notes:id/tv_title = 0x7f05004a +net.micode.notes:color/primary_text_dark = 0x7f020006 net.micode.notes:drawable/font_size_selector_bg = 0x7f040013 net.micode.notes:drawable/list_blue_up = 0x7f04001b +net.micode.notes:drawable/widget_4x_red = 0x7f040040 net.micode.notes:string/search_setting_description = 0x7f0a005c net.micode.notes:drawable/list_blue_single = 0x7f04001a net.micode.notes:drawable/font_large = 0x7f040011 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050036 +net.micode.notes:id/note_item = 0x7f05003e +net.micode.notes:id/ll_font_default = 0x7f050022 +net.micode.notes:color/Blue = 0x7f020000 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/Change_Txt_Color = 0x7f05004d -net.micode.notes:id/note_edit_list = 0x7f050034 +net.micode.notes:id/note_edit_list = 0x7f05003c +net.micode.notes:id/iv_alert_icon = 0x7f05000e +net.micode.notes:drawable/edit_red = 0x7f040008 net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:string/menu_delete = 0x7f0a0022 +net.micode.notes:string/menu_delete = 0x7f0a0023 net.micode.notes:drawable/list_folder = 0x7f04001c net.micode.notes:drawable/call_record = 0x7f040002 +net.micode.notes:drawable/edit_title_blue = 0x7f040009 +net.micode.notes:id/iv_bg_red_select = 0x7f050014 +net.micode.notes:string/error_sync_internal = 0x7f0a0013 +net.micode.notes:drawable/menu_delete = 0x7f04002e +net.micode.notes:string/menu_folder_change_name = 0x7f0a0026 +net.micode.notes:color/Default = 0x7f020002 net.micode.notes:string/search_hint = 0x7f0a005a -net.micode.notes:id/menu_font_size = 0x7f050027 -net.micode.notes:color/font_color_bright_blue = 0x7f020009 -net.micode.notes:string/menu_font_color = 0x7f0a0028 +net.micode.notes:id/menu_font_size = 0x7f05002e net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002d -net.micode.notes:id/iv_bg_red_select = 0x7f050014 -net.micode.notes:dimen/text_font_size_small = 0x7f030004 -net.micode.notes:drawable/list_green_middle = 0x7f04001f +net.micode.notes:dimen/text_font_size_small = 0x7f030003 +net.micode.notes:dimen/text_font_size_normal = 0x7f030002 net.micode.notes:drawable/list_background = 0x7f040017 net.micode.notes:string/app_name = 0x7f0a0004 net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a0051 -net.micode.notes:id/ll_font_color_green = 0x7f05001d net.micode.notes:string/menu_setting = 0x7f0a0039 -net.micode.notes:dimen/text_font_size_medium = 0x7f030002 +net.micode.notes:dimen/text_font_size_medium = 0x7f030001 +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001a +net.micode.notes:color/Green = 0x7f020003 +net.micode.notes:drawable/list_yellow_up = 0x7f04002d +net.micode.notes:id/menu_insert_img = 0x7f05002f net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004f -net.micode.notes:id/font_size_selector = 0x7f05000c +net.micode.notes:id/font_size_selector = 0x7f05000b net.micode.notes:layout/note_edit_list_item = 0x7f060006 net.micode.notes:layout/account_dialog_title = 0x7f060000 +net.micode.notes:id/ll_font_red = 0x7f050026 net.micode.notes:array/format_for_exported_note = 0x7f010000 +net.micode.notes:id/menu_delete_remind = 0x7f05002c diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt index 7070282..2b20b1f 100644 --- a/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml android:versionName - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml xmlns:android - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml uses-sdk -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml + INJECTED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from C:\Users\82590\AndroidStudioProjects\Notes-master2\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\Work-java\MINOTES\minotes\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 05e0396..cd844ab 100644 Binary files a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/app/src/main/java/net/micode/notes/model/WorkingNote.java b/app/src/main/java/net/micode/notes/model/WorkingNote.java index 2b46d45..dc18c52 100644 --- a/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -37,7 +37,7 @@ public class WorkingNote {// 表示工作便签 // Note Id private long mNoteId; // 便签id // Note content - private String mContent; // 便签内容 + public String mContent; // 便签内容 // Note mode private int mMode; // 便签模式 diff --git a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index a5abb38..8d9940b 100644 --- a/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -22,19 +22,30 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Paint; +import android.net.Uri; +import android.nfc.Tag; +import android.os.Build; import android.os.Bundle; +import android.provider.DocumentsContract; import android.preference.PreferenceManager; +import android.provider.MediaStore; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -66,6 +77,10 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import org.w3c.dom.Document; + +import java.io.File; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -168,6 +183,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, public static final String TAG_CHECKED = String.valueOf('\u221A'); // 表示未被选中的标签符号 public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); + // 用于唤出相册操作 + public final int OPEN_GALLERY = 1; // 用于存储文本编辑列表 private LinearLayout mEditTextList; @@ -541,6 +558,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, FontColorParser.TextAppearanceResources.getTexAppearanceResource(mTxtColorId)); } mTxtColorSelector.setVisibility(View.GONE); + } else if (id == R.id.menu_insert_img) { + openGallery(); } } @@ -617,6 +636,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, public boolean onOptionsItemSelected(MenuItem item) { // 根据被点击项目的id，进行不同的处理 switch (item.getItemId()) { + case R.id.menu_insert_img: + openGallery(); + break; case R.id.menu_new_note: createNewNote(); break; @@ -1027,4 +1049,127 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + //-----------------------------------施-----工-----区---------------------------------------// + //-----------------------------------------------------------------------------------------// + //--------------------------------注-----意-----安-----全-----------------------------------// + //-----------------------------------------------------------------------------------------// + // 数据流获取 + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + try{ + cursor = context.getContentResolver().query(uri, projection, selection, + selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + // 用于开启多媒体相册 + public void openGallery() { + Intent loadImg = new Intent(Intent.ACTION_GET_CONTENT); + loadImg.addCategory(Intent.CATEGORY_OPENABLE); + loadImg.setType("image/*"); + startActivityForResult(loadImg, OPEN_GALLERY); + } + // 用于取得图片路径 + public String getPath(final Context context, final Uri uri) { + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + // 路径地址转换为图片 + private void convertToImg() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); + Editable editable = noteEditText.getText(); + String noteTxt= editable.toString(); + int length = editable.length(); + for(int i = 0;i < length;i ++) { + for(int j = i;j < length;j ++) { + String img_frag = noteTxt.substring(i, j+1); + if(img_frag.length() > 15 && img_frag.endsWith("[/local]")&& img_frag.startsWith("[local]")) { + int lim = 7; + int len = img_frag.length() - 15; + String path = img_frag.substring(lim, lim + len); + Bitmap bitmap = null; + Log.d(TAG,"img from:"+path); + try { + bitmap = BitmapFactory.decodeFile(path); + } catch (Exception err) { + err.printStackTrace(); + } if(bitmap != null) { + Log.d(TAG,"img not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG,"success!"); + Editable edit_txt = noteEditText.getEditableText(); + edit_txt.delete(i, i + len + 15); + edit_txt.insert(i, spannableString); + } + } + } + } + } + // 重写onActivityResult处理返回的数据 + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case OPEN_GALLERY: + Uri originUri = intent.getData(); + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originUri)); + } catch (FileNotFoundException err) { + Log.d(TAG,"get file_exception"); + err.printStackTrace(); + } if(bitmap != null) { + Log.d(TAG,"Bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this, originUri); + String img_frag= "[local]" + path + "[/local]"; + // 创建一个SpannableString对象，以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_frag); + spannableString.setSpan(imageSpan, 0, img_frag.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + // 将图片插入光标所在位置 + NoteEditText img = (NoteEditText) findViewById(R.id.note_edit_view); + int index = img.getSelectionStart(); + Log.d(TAG,"Index is:" + index); + Editable edit_txt = img.getEditableText(); + edit_txt.insert(index, spannableString); + mWorkingNote.mContent = img.getText().toString(); + } + } + } + // 判断所选文档是否为多媒体文件 + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } } diff --git a/app/src/main/res/menu/note_edit.xml b/app/src/main/res/menu/note_edit.xml index bea5678..a7b1c44 100644 --- a/app/src/main/res/menu/note_edit.xml +++ b/app/src/main/res/menu/note_edit.xml @@ -52,4 +52,7 @@ + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index acf799c..8a79b0f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -36,6 +36,9 @@ 浏览网页 打开地图 + /MIUI/notes/ + notes_%s.txt + (%d) 新建文件夹 导出文本 同步 @@ -73,6 +76,7 @@ 已将所选 %1$d 条便签移到 %2$s 文件夹 更改选中文本颜色 + 插入图片 SD卡被占用，不能操作 导出文本时发生错误，请检查SD卡 要查看的便签不存在 @@ -98,6 +102,7 @@ 同步账号 与google task同步便签记录 上次同步于 %1$s + yyyy-MM-dd hh:mm:ss 添加账号 更换账号 删除账号 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 7c54630..4287a46 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -37,6 +37,9 @@ 打開地圖 已將所選 %1$d 便籤移到 %2$s 文件夾 + /MIUI/notes/ + notes_%s.txt + (%d) 新建文件夾 導出文本 同步 @@ -72,6 +75,7 @@ 确认要删除該條便籤嗎? 確認刪除檔夾及所包含的便簽嗎？ 更改选中文本颜色 + 插入图像 SD卡被佔用，不能操作 導出TXT時發生錯誤，請檢查SD卡 要查看的便籤不存在 @@ -97,6 +101,7 @@ 同步賬號 与google task同步便簽記錄 上次同步于 %1$s + yyyy-MM-dd hh:mm:ss 添加賬號 更換賬號 刪除賬號 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 705682f..f8ac9bf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ Confirm to delete this note? Have moved selected %1$d notes to %2$s folder Change Selected Text Color + Insert Image SD card busy, not available now Export failed, please check SD card diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..2d8d1e4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +android.useAndroidX=true \ No newline at end of file