diff --git a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock index a2088b3..3ea0351 100644 Binary files a/src/Notes-master3/.gradle/7.5/checksums/checksums.lock and b/src/Notes-master3/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin index d2a5fc2..8fd4140 100644 Binary files a/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin and b/src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin index 5981128..1cad8d7 100644 Binary files a/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin and b/src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin index 3e83634..2f2aff3 100644 Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock index 9ec8cdf..c32faf3 100644 Binary files a/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin index 48c84e3..d7690cd 100644 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock index eb9e278..e05740e 100644 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin index c22e7b2..ff65e24 100644 Binary files a/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 59f8ed2..9de4047 100644 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin index ebf4786..71baa32 100644 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin and b/src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index 5e41a53..bf3f2b3 100644 Binary files a/src/Notes-master3/.gradle/file-system.probe and b/src/Notes-master3/.gradle/file-system.probe differ diff --git a/src/Notes-master3/.idea/deploymentTargetDropDown.xml b/src/Notes-master3/.idea/deploymentTargetDropDown.xml index c30a864..ac7aa55 100644 --- a/src/Notes-master3/.idea/deploymentTargetDropDown.xml +++ b/src/Notes-master3/.idea/deploymentTargetDropDown.xml @@ -7,11 +7,11 @@ - + - + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk index d3c4d6e..ab52cd4 100644 Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin b/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_4b4558f43241ccb8af94b1f23cbc636b6da3b385148c82ef990567e9cb24f399_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index c6d3b40..56b20fc 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 391f5c6..3007280 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Fri Mar 31 15:36:28 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=C\:\\Users\\13293\\Desktop\\Notes-master3\\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\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=C\:\\Users\\13293\\Desktop\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Fri Mar 31 16:55:30 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\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=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index e5a2a0e..fbd232d 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -1,5 +1,5 @@ - + -%s --%s --%s @@ -7,11 +7,11 @@ Messaging Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel + #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel %1$s result for \"%2$s\" %1$s results for \"%2$s\" - + 短信 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 + 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 %1$s 条符合“%2$s”的搜索结果 - + 短信 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 + 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index 8a43b72..36b31d1 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index b4b4fd6..13c8488 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 5341556..6e03a2d 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 5c65a42..25511cd 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Mar 28 18:51:42 CST 2023 -base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Fri Mar 31 17:04:20 CST 2023 +base.0=E\:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 582922f..ebe91fc 100644 Binary files a/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index a9c0ce7..3ff6fc1 100644 --- a/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,266 +20,266 @@ 20 android:versionName="0.1" > 21 22 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +22-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 23 android:minSdkVersion="14" -23-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 +23-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="33" /> -24-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +24-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 25 26 -26-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 -26-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +26-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 27 -27-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 -27-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +27-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 28 -28-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 -28-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +28-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 29 -29-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 -29-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +29-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 30 -30-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 -30-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +30-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 31 -31-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 -31-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +31-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 32 -32-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 -32-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +32-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 33 -33-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 -33-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +33-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 34 -34-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 -34-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +34-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 35 36 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +36-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 +38-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 39 android:label="@string/app_name" -39-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 +39-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 40 android:testOnly="true" > 41 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +41-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 +42-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 +43-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 44 android:exported="true" -44-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 +44-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 45 android:launchMode="singleTop" -45-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 +45-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 46 android:theme="@style/NoteTheme" -46-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 +46-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 +47-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 +48-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 49 -49-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +49-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 50 -50-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 -50-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +50-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 51 52 -52-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 -52-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +52-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 53 54 55 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +55-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 +56-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 +57-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 58 android:exported="true" -58-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 +58-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 59 android:launchMode="singleTop" -59-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 +59-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 60 android:theme="@style/NoteTheme" > -60-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 +60-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 61 -61-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 -61-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +61-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 62 -62-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 -62-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +62-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 63 64 -64-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -64-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +64-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 65 66 -66-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -66-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +66-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 67 -67-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -67-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +67-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 68 69 -69-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +69-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 70 -70-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 -70-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +70-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 71 72 -72-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -72-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +72-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 73 74 -74-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -74-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +74-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 75 -75-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 -75-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +75-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 76 77 -77-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +77-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 78 -78-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 -78-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +78-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 79 80 -80-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 -80-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +80-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 81 82 83 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +83-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 84 android:name="android.app.searchable" -84-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 +84-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 85 android:resource="@xml/searchable" /> -85-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 +85-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 86 87 88 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +88-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 89 android:name="net.micode.notes.data.NotesProvider" -89-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 +89-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 90 android:authorities="micode_notes" -90-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 +90-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 91 android:exported="false" -91-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 +91-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 92 android:multiprocess="true" /> -92-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 +92-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 93 94 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +94-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 95 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -95-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 +95-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 96 android:exported="true" -96-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 +96-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 97 android:label="@string/app_widget2x2" > -97-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 +97-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 98 -98-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +98-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 99 -99-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -99-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +99-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 100 -100-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -100-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +100-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 101 -101-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -101-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +101-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 102 103 104 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +104-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 105 android:name="android.appwidget.provider" -105-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +105-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 106 android:resource="@xml/widget_2x_info" /> -106-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +106-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 107 108 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +108-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 109 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -109-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 +109-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 110 android:exported="true" -110-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 +110-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 111 android:label="@string/app_widget4x4" > -111-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 +111-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 112 -112-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +112-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 113 -113-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 -113-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +113-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 114 -114-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 -114-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +114-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 115 -115-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 -115-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +115-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 116 117 118 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +118-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 119 android:name="android.appwidget.provider" -119-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 +119-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 120 android:resource="@xml/widget_4x_info" /> -120-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 +120-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 121 122 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +122-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 123 android:name="net.micode.notes.ui.AlarmInitReceiver" -123-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 +123-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 124 android:exported="true" > -124-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 +124-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 125 -125-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +125-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 126 -126-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 -126-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +126-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 127 128 129 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +129-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 130 android:name="net.micode.notes.ui.AlarmReceiver" -130-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 +130-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 131 android:process=":remote" > -131-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 +131-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 132 133 134 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +134-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 135 android:name="net.micode.notes.ui.AlarmAlertActivity" -135-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 +135-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 136 android:label="@string/app_name" -136-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 +136-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 137 android:launchMode="singleInstance" -137-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 +137-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 138 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -138-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 +138-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 139 140 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +140-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 141 android:name="net.micode.notes.ui.NotesPreferenceActivity" -141-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 +141-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 142 android:label="@string/preferences_title" -142-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 +142-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 143 android:launchMode="singleTop" -143-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 +143-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 144 android:theme="@android:style/Theme.Holo.Light" > -144-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 +144-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 145 146 147 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +147-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 148 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -148-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 +148-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 149 android:exported="false" > -149-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 +149-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 150 151 152 C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +152-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 153 android:name="android.app.default_searchable" -153-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 +153-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 154 android:value=".ui.NoteEditActivity" /> -154-->C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 +154-->E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 155 156 157 diff --git a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 17cb018..e25eb7b 100644 Binary files a/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/Notes-master3/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index b217750..1a6bc35 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -47,30 +47,13 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -81,33 +64,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,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,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,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,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -119,14 +83,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -136,6 +100,42 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } } ] }, @@ -143,14 +143,14 @@ "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -162,14 +162,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index b2739fa..a34e1f9 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 9cd6958..0f8ace8 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index d2ca56e..ff3cdd6 100644 --- a/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,30 +4,13 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endColumns": "56", - "endOffsets": "764" + "endOffsets": "782" }, "to": { "startLines": "12", @@ -38,33 +21,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,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,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,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,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\arrays.xml", "from": { "startLines": "19,26", "startColumns": "4,4", - "startOffsets": "739,1047", + "startOffsets": "758,1073", "endLines": "24,29", "endColumns": "19,19", - "endOffsets": "1041,1162" + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -76,14 +40,14 @@ } }, { - "source": "C:\\Users\\13293\\Desktop\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\styles.xml", "from": { "startLines": "50,55,64,60,22,26,30,35,40,18,45", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", "endLines": "53,58,67,62,25,29,33,38,43,21,48", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -93,6 +57,42 @@ "endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\strings.xml", + "from": { + "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8136,3970,4234,4137,4067,846,890,943,7624,7674,8077,8025,1308,4694,4789,4622,4537,4453,5668,5584,5481,4967,2043,1991,3461,1515,1569,5029,2138,4318,7738,3898,3649,2198,2519,2825,2257,3389,3327,3269,3043,2990,2885,2939,3094,3145,2567,3831,3206,3699,2471,2769,2680,2621,3586,2420,3540,2315,2359,3763,1459,1784,1894,1736,1840,1679,1630,1252,1198,6131,6063,6375,7525,6744,6662,6819,6909,7153,7073,6216,6292,6602,6440,6521,6007,7298,7421,7983,7854,7796,7908,1393,4898,5394,5805,5735,5886,5334,5278,5215,5154,996,1107", + "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" + }, + "to": { + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", + "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + } + }, + { + "source": "E:\\study\\rjgc\\work\\gitProject\\src\\Notes-master3\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "19,20,21,22,18", + "startColumns": "4,4,4,4,4", + "startOffsets": "783,836,890,944,730", + "endColumns": "51,52,52,51,51", + "endOffsets": "830,884,938,991,777" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } } ] } diff --git a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 5253e98..80170f5 100644 Binary files a/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt index ce07c7e..6ae019e 100644 --- a/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 C:\Users\13293\Desktop\Notes-master3\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 C:\Users\13293\Desktop\Notes-master3\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 C:\Users\13293\Desktop\Notes-master3\app\src\debug\res -net.micode.notes.app-main-7 C:\Users\13293\Desktop\Notes-master3\app\src\main\res +net.micode.notes.app-pngs-0 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 E:\study\rjgc\work\gitProject\src\Notes-master3\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\debug\res +net.micode.notes.app-main-7 E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\res diff --git a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk index 3e66e29..5d50799 100644 Binary files a/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt index 5adc901..8a80d46 100644 --- a/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,255 +1,255 @@ -- Merging decision tree log --- manifest -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:1-159:12 package - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml android:versionName - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml xmlns:tools - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:19:5-51 xmlns:android - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml uses-sdk -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 -INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 +INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 android:targetSdkVersion - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:5-25:42 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml tools:ignore - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:25:9-39 android:minSdkVersion - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml - INJECTED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml + INJECTED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:5-81 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:27:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:5-88 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:28:22-85 uses-permission#android.permission.INTERNET -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:5-67 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:29:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:5-72 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:30:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:5-74 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:31:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:5-80 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:32:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:5-71 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:33:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:5-74 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:34:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:5-81 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:35:22-78 application -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:37:5-158:19 android:label - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:39:9-41 android:icon - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:38:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:40:9-53:20 android:launchMode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:44:13-43 android:windowSoftInputMode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:47:13-52 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:43:13-36 android:uiOptions - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:46:13-57 android:configChanges - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:45:13-45 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:41:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:49:13-52:29 action#android.intent.action.MAIN -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:17-69 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:50:25-66 category#android.intent.category.LAUNCHER -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:17-77 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:51:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:55:9-85:20 android:launchMode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:58:13-43 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:60:13-36 android:configChanges - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:57:13-74 android:theme - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:59:13-45 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:56:13-48 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:56: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\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:13-68:29 android:scheme - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:62:28-49 tools:ignore - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:63:17-47 action#android.intent.action.VIEW -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:17-69 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:64:25-66 category#android.intent.category.DEFAULT -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:17-76 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:65:27-73 data -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66:17-78 android:mimeType - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:66:23-75 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:66: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\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:70:13-75:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:17-79 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:71:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:77:13-80:29 action#android.intent.action.SEARCH -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:17-71 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:78:25-68 meta-data#android.app.searchable -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:82:13-84:54 android:resource - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:84:17-51 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:83:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:87:9-91:40 android:authorities - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:89:13-47 android:multiprocess - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:90:13-40 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:91:13-37 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:88:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:93:9-106:20 android:label - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:95:13-50 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:96:13-36 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:94:13-57 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:94: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\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:97:13-101:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:17-84 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:98:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:17-85 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:99:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:17-85 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:100:25-82 meta-data#android.appwidget.provider -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:103:13-105:58 android:resource - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:105:17-55 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:104:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:107:9-121:20 android:label - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:109:13-50 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:110:13-36 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:108:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:9-128:20 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:124:13-36 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:123:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:125:13-127:29 action#android.intent.action.BOOT_COMPLETED -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:17-79 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:126:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:130:9-133:20 android:process - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:132:13-38 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:131:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:135:9-141:20 android:label - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:137:13-45 android:launchMode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:138:13-48 tools:ignore - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:140:13-42 android:theme - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:139:13-75 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:136:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:143:9-148:20 android:label - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:145:13-54 android:launchMode - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:146:13-43 android:theme - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:147:13-60 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:144:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:150:9-153:19 android:exported - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:152:13-37 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:151:13-74 meta-data#android.app.default_searchable -ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 +ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:155:9-157:52 android:value - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:157:13-49 android:name - ADDED from C:\Users\13293\Desktop\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 + ADDED from E:\study\rjgc\work\gitProject\src\Notes-master3\app\src\main\AndroidManifest.xml:156:13-58 diff --git a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index a125374..de3f596 100644 Binary files a/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/Notes-master3/local.properties b/src/Notes-master3/local.properties index 7fbf616..1976308 100644 --- a/src/Notes-master3/local.properties +++ b/src/Notes-master3/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Mar 31 15:23:17 CST 2023 -sdk.dir=C\:\\Users\\13293\\AppData\\Local\\Android\\Sdk +#Fri Mar 31 16:42:01 CST 2023 +sdk.dir=E\:\\study\\rjgc\\work