diff --git a/src/.gradle/7.5/executionHistory/executionHistory.bin b/src/.gradle/7.5/executionHistory/executionHistory.bin index f7ed532..9c10361 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.bin and b/src/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/.gradle/7.5/executionHistory/executionHistory.lock b/src/.gradle/7.5/executionHistory/executionHistory.lock index ba0cdac..f89d384 100644 Binary files a/src/.gradle/7.5/executionHistory/executionHistory.lock and b/src/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.bin b/src/.gradle/7.5/fileHashes/fileHashes.bin index e8106eb..38a8732 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.bin and b/src/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/.gradle/7.5/fileHashes/fileHashes.lock b/src/.gradle/7.5/fileHashes/fileHashes.lock index 23be5a0..8ac06c7 100644 Binary files a/src/.gradle/7.5/fileHashes/fileHashes.lock and b/src/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d435207..4af9213 100644 Binary files a/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/.gradle/buildOutputCleanup/outputFiles.bin b/src/.gradle/buildOutputCleanup/outputFiles.bin index afbb3c0..b40f74a 100644 Binary files a/src/.gradle/buildOutputCleanup/outputFiles.bin and b/src/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/.gradle/file-system.probe b/src/.gradle/file-system.probe index adfd8d3..6974ee9 100644 Binary files a/src/.gradle/file-system.probe and b/src/.gradle/file-system.probe differ diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml index 94a25f7..288b36b 100644 --- a/src/.idea/vcs.xml +++ b/src/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/src/app/build.gradle b/src/app/build.gradle index 7521525..14a19bb 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { applicationId "net.micode.notes" - targetSdkVersion 30 + targetSdkVersion 30//不支持过高的版本号，故targetSdkVersion 33 -> 30 } buildTypes { diff --git a/src/app/build/intermediates/apk/debug/app-debug.apk b/src/app/build/intermediates/apk/debug/app-debug.apk index 7711201..53fb4aa 100644 Binary files a/src/app/build/intermediates/apk/debug/app-debug.apk and b/src/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_0/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_0/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_0/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_0/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_1/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_1/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_1/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_1/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_2/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_2/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_2/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_2/graph.bin diff --git a/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_3/graph.bin b/src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_3/graph.bin similarity index 100% rename from src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_2242b74f7f99f5f1e2b07ccfdf6018a3f814ef230435f1072908d56e25e7afc1_bucket_3/graph.bin rename to src/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_33646d53717a5d11e3d8e891d529c5a0bc6aa813fc52a583f15797c1e3517cd1_bucket_3/graph.bin diff --git a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index c7a795a..9e0c0f4 100644 Binary files a/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index b50a0c5..58f829d 100644 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZeHhmgCCmkHFfBI_YlrxDFme7gA= b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZeHhmgCCmkHFfBI_YlrxDFme7gA= index 0ca6409..f0bdebe 100644 Binary files a/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZeHhmgCCmkHFfBI_YlrxDFme7gA= and b/src/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZeHhmgCCmkHFfBI_YlrxDFme7gA= differ diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index d0bfc3a..884e93f 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Thu Dec 07 15:16:12 CST 2023 -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Thu Dec 07 19:23:12 CST 2023 +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_normal.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_yellow.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/menu/sub_folder.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat +net.micode.notes.app-main-7\:/layout/account_dialog_title.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_green.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/color/secondary_text_dark.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_delete.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/dropdown_icon.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_single.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_single.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat +net.micode.notes.app-main-7\:/raw-zh-rCN/introduction=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/delete.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_down.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit_list_item.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_blue.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat +net.micode.notes.app-main-7\:/layout/add_account_text.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_white.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_middle.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_down.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_single.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_large.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_up.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_middle.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/settings_header.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_yellow.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_red.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_alert.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_down.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_options.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_yellow.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/icon_app.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_red.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/title_bar_bg.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_footer_bg.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/new_note_pressed.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_green_up.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list_dropdown_menu.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat +net.micode.notes.app-main-7\:/layout/note_list_footer.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_up.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat +net.micode.notes.app-main-7\:/menu/note_list_dropdown.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_up.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_blue.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_blue.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/bg_btn_set_color.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_white.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_up.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/xml/widget_2x_info.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_white_middle.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/layout/folder_list_item.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_folder.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_4x_blue.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_down.9.png=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/menu/note_edit.xml=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml new file mode 100644 index 0000000..d65e0cc --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,108 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗？ + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误，请检查SD卡 + SD卡被占用，不能操作 + 同步已取消 + 同步失败，发生内部错误 + 同步失败，请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在，请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + 大 + 正常 + 文字大小 + 小 + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 搜索 + 全选 + 没有选中项，操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 + 请选择google帐号，便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中，不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容，点击新建便签。 + 访客模式下，便签内容不可见 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml new file mode 100644 index 0000000..226b5bc --- /dev/null +++ b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,108 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎？ + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤，請檢查SD卡 + SD卡被佔用，不能操作 + 同步已取消 + 同步失敗，發生內部錯誤 + 同步失敗，請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在，請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + 大 + 正常 + 文字大小 + 小 + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 搜尋 + 全選 + 沒有選中項，操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 + 請選擇google帳號，便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中，不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容，點擊新建便簽。 + 訪客模式下，便籤內容不可見 + \ No newline at end of file diff --git a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 6315bd7..4fde38a 100644 --- a/src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/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/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index ace9f51..33139ac 100644 --- a/src/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/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/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index afb8763..c590a7d 100644 --- a/src/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/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/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index aae4a0e..9b265d3 100644 --- a/src/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/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/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 56043aa..7ccc05e 100644 --- a/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Dec 07 15:16:23 CST 2023 -base.0=D\:\\gwx_homework\\SE\\class_16\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Thu Dec 07 19:23:26 CST 2023 +base.0=D\:\\gwx_homework\\SE\\SE_work_station\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 7d9aa80..d065a42 100644 --- a/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt @@ -20,254 +20,254 @@ 20 android:versionName="0.1" > 21 22 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 +22-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 23 android:minSdkVersion="1" -23-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:15-41 +23-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:15-41 24 android:targetSdkVersion="30" /> -24-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 +24-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 25 26 -26-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:26:5-81 -26-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:26:22-78 +26-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:26:5-81 +26-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:26:22-78 27 -27-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:27:5-88 -27-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:27:22-85 +27-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:27:5-88 +27-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:27:22-85 28 -28-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:28:5-67 -28-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:28:22-64 +28-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:28:5-67 +28-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:28:22-64 29 -29-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:29:5-72 -29-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:29:22-69 +29-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:29:5-72 +29-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:29:22-69 30 -30-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:30:5-74 -30-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:30:22-71 +30-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:30:5-74 +30-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:30:22-71 31 -31-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:31:5-80 -31-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:31:22-77 +31-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:31:5-80 +31-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:31:22-77 32 -32-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:32:5-71 -32-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:32:22-68 +32-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:32:5-71 +32-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:32:22-68 33 -33-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:33:5-74 -33-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:33:22-71 +33-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:33:5-74 +33-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:33:22-71 34 -34-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:34:5-81 -34-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:34:22-78 +34-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:34:5-81 +34-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:34:22-78 35 36 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:36:5-151:19 +36-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:36:5-151:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:38:9-42 +38-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:38:9-42 39 android:label="@string/app_name" -39-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:39:9-41 +39-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:39:9-41 40 android:testOnly="true" > 41 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:40:9-53:20 +41-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:40:9-53:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:41:13-49 +42-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:41:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:42:13-74 +43-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:42:13-74 44 android:label="@string/app_name" -44-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:43:13-45 +44-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:43:13-45 45 android:launchMode="singleTop" -45-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:44:13-43 +45-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:44:13-43 46 android:theme="@style/NoteTheme" -46-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:45:13-45 +46-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:45:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:46:13-57 +47-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:46:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:47:13-52 +48-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:47:13-52 49 -49-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:49:13-52:29 +49-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:49:13-52:29 50 -50-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:50:17-69 -50-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:50:25-66 +50-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:50:17-69 +50-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:50:25-66 51 52 -52-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:51:17-77 -52-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:51:27-74 +52-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:51:17-77 +52-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:51:27-74 53 54 55 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:55:9-83:20 +55-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:55:9-83:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:56:13-48 +56-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:56:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:57:13-74 +57-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:57:13-74 58 android:launchMode="singleTop" -58-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:58:13-43 +58-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:58:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:59:13-45 +59-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:59:13-45 60 -60-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:61:13-66:29 +60-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:61:13-66:29 61 -61-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:62:17-69 -61-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:62:25-66 +61-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:62:17-69 +61-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:62:25-66 62 63 -63-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:17-76 -63-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:27-73 +63-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:17-76 +63-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:27-73 64 65 -65-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:17-78 -65-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:23-75 +65-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:17-78 +65-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:23-75 66 -66-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:17-78 -66-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:23-75 +66-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:17-78 +66-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:23-75 67 68 -68-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:68:13-73:29 +68-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:68:13-73:29 69 -69-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:69:17-79 -69-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:69:25-76 +69-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:69:17-79 +69-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:69:25-76 70 71 -71-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:17-76 -71-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:27-73 +71-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:17-76 +71-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:27-73 72 73 -73-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:17-78 -73-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:23-75 +73-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:17-78 +73-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:23-75 74 -74-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:17-78 -74-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:23-75 +74-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:17-78 +74-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:23-75 75 76 -76-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:75:13-78:29 +76-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:75:13-78:29 77 -77-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:76:17-71 -77-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:76:25-68 +77-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:76:17-71 +77-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:76:25-68 78 79 -79-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:17-76 -79-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:27-73 +79-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:17-76 +79-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:27-73 80 81 82 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:80:13-82:54 +82-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:80:13-82:54 83 android:name="android.app.searchable" -83-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:81:17-54 +83-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:81:17-54 84 android:resource="@xml/searchable" /> -84-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:82:17-51 +84-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:82:17-51 85 86 87 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:85:9-88:43 +87-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:85:9-88:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:86:13-63 +88-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:86:13-63 89 android:authorities="micode_notes" -89-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:87:13-47 +89-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:87:13-47 90 android:multiprocess="true" /> -90-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:88:13-40 +90-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:88:13-40 91 92 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:90:9-102:20 +92-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:90:9-102:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:91:13-57 +93-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:91:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:92:13-50 +94-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:92:13-50 95 -95-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:93:13-97:29 +95-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:93:13-97:29 96 -96-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:17-84 -96-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:25-81 +96-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:17-84 +96-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:25-81 97 -97-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:17-85 -97-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:25-82 +97-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:17-85 +97-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:25-82 98 -98-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:17-85 -98-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:25-82 +98-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:17-85 +98-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:25-82 99 100 101 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:99:13-101:58 +101-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:99:13-101:58 102 android:name="android.appwidget.provider" -102-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:100:17-58 +102-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:100:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:101:17-55 +103-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:101:17-55 104 105 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:103:9-116:20 +105-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:103:9-116:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:104:13-57 +106-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:104:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:105:13-50 +107-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:105:13-50 108 -108-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:93:13-97:29 +108-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:93:13-97:29 109 -109-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:17-84 -109-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:25-81 +109-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:17-84 +109-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:25-81 110 -110-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:17-85 -110-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:25-82 +110-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:17-85 +110-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:25-82 111 -111-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:17-85 -111-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:25-82 +111-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:17-85 +111-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:25-82 112 113 114 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:99:13-101:58 +114-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:99:13-101:58 115 android:name="android.appwidget.provider" -115-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:100:17-58 +115-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:100:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:101:17-55 +116-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:101:17-55 117 118 -118-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:118:9-122:20 -118-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:118:19-55 +118-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:118:9-122:20 +118-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:118:19-55 119 -119-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:119:13-121:29 +119-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:119:13-121:29 120 -120-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:120:17-79 -120-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:120:25-76 +120-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:120:17-79 +120-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:120:25-76 121 122 123 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:124:9-127:20 +123-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:124:9-127:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:125:13-61 +124-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:125:13-61 125 android:process=":remote" > -125-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:126:13-38 +125-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:126:13-38 126 127 128 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:129:9-134:20 +128-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:129:9-134:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:130:13-50 +129-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:130:13-50 130 android:label="@string/app_name" -130-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:131:13-45 +130-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:131:13-45 131 android:launchMode="singleInstance" -131-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:132:13-48 +131-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:132:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:133:13-75 +132-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:133:13-75 133 134 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:136:9-141:20 +134-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:136:9-141:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:137:13-71 +135-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:137:13-71 136 android:label="@string/preferences_title" -136-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:138:13-54 +136-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:138:13-54 137 android:launchMode="singleTop" -137-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:139:13-43 +137-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:139:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:140:13-60 +138-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:140:13-60 139 140 141 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:143:9-146:19 +141-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:143:9-146:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:144:13-74 +142-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:144:13-74 143 android:exported="false" > -143-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:145:13-37 +143-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:145:13-37 144 145 146 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:148:9-150:52 +146-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:148:9-150:52 147 android:name="android.app.default_searchable" -147-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:149:13-58 +147-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:149:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:150:13-49 +148-->D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:150:13-49 149 150 151 diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 5450c14..573cad9 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,48 +1,60 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" + "startLines": "2", + "startColumns": "4", + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", + "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -54,26 +66,14 @@ } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -83,100 +83,26 @@ "endColumns": "19,19", "endOffsets": "295,415" } - } - ] - }, - { - "outputFile": "C:\\Users\\DELL\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - }, - { - "outputFile": "C:\\Users\\DELL\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\colors.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "730", - "endLines": "21", - "endColumns": "19", - "endOffsets": "838" + "endColumns": "56", + "endOffsets": "782" }, "to": { - "startLines": "2", + "startLines": "12", "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "C:\\Users\\DELL\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", - "map": [ - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -193,7 +119,7 @@ } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\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", @@ -210,60 +136,48 @@ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" + "endLines": "21", + "endColumns": "19", + "endOffsets": "838" }, "to": { - "startLines": "12", + "startLines": "2", "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" + "startOffsets": "105", + "endLines": "5", + "endColumns": "19", + "endOffsets": "210" } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" } } ] diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 42c7d79..b6db08b 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,7 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -23,7 +23,7 @@ } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\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", diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index ac06554..2036eee 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,26 +4,7 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", @@ -40,6 +21,25 @@ "endColumns": "19", "endOffsets": "210" } + }, + { + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "from": { + "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", + "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" + }, + "to": { + "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", + "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + } } ] } diff --git a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index 33ef60a..335479f 100644 --- a/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -4,45 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", "map": [ { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2920,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "50,55,64,60,22,26,30,35,40,18,45", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", + "endLines": "53,58,67,62,25,29,33,38,43,21,48", + "endColumns": "12,12,12,12,12,12,12,12,12,12,12", + "endOffsets": "2314,2531,2920,2696,1098,1287,1476,1685,1897,911,2104" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -54,26 +23,14 @@ } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "-1", - "startColumns": "-1", - "startOffsets": "-1" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "-1,-1", - "startColumns": "-1,-1", - "startOffsets": "-1,-1" + "startLines": "19,26", + "startColumns": "4,4", + "startOffsets": "758,1073", + "endLines": "24,29", + "endColumns": "19,19", + "endOffsets": "1065,1191" }, "to": { "startLines": "2,8", @@ -83,14 +40,26 @@ "endColumns": "19,19", "endOffsets": "295,415" } - } - ] - }, - { - "outputFile": "C:\\Users\\DELL\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", - "map": [ + }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "18", + "startColumns": "4", + "startOffsets": "730", + "endColumns": "56", + "endOffsets": "782" + }, + "to": { + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" + } + }, + { + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\app\\src\\main\\res\\values\\dimens.xml", "from": { "startLines": "19,20,21,22,18", "startColumns": "4,4,4,4,4", @@ -107,7 +76,7 @@ } }, { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\gwx_homework\\SE\\SE_work_station\\src\\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", @@ -124,61 +93,6 @@ "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2112,2322,2704,2539,917,1104,1293,1484,1693,730,1905", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2314,2531,2910,2696,1098,1287,1476,1685,1897,911,2104" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "730", - "endColumns": "56", - "endOffsets": "782" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\gwx_homework\\SE\\class_16\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "758,1073", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1065,1191" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } } ] } diff --git a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt index 9c02e06..2b9b79e 100644 --- a/src/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\gwx_homework\SE\class_16\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\gwx_homework\SE\class_16\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\gwx_homework\SE\class_16\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\gwx_homework\SE\class_16\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\gwx_homework\SE\class_16\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\gwx_homework\SE\class_16\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\gwx_homework\SE\class_16\app\src\debug\res -net.micode.notes.app-main-7 D:\gwx_homework\SE\class_16\app\src\main\res +net.micode.notes.app-pngs-0 D:\gwx_homework\SE\SE_work_station\src\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\gwx_homework\SE\SE_work_station\src\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\gwx_homework\SE\SE_work_station\src\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\gwx_homework\SE\SE_work_station\src\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\gwx_homework\SE\SE_work_station\src\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\gwx_homework\SE\SE_work_station\src\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\gwx_homework\SE\SE_work_station\src\app\src\debug\res +net.micode.notes.app-main-7 D:\gwx_homework\SE\SE_work_station\src\app\src\main\res diff --git a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index b9e1d92..4461006 100644 --- a/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,134 +1,129 @@ -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:id/tv_title_bar = 0x7f050040 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:xml/preferences = 0x7f0c0000 +net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 +net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 +net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 +net.micode.notes:string/widget_havenot_content = 0x7f0a0064 +net.micode.notes:string/ticker_syncing = 0x7f0a0063 +net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 +net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:string/sync_progress_init_list = 0x7f0a005d net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:id/selection_menu = 0x7f050038 +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 +net.micode.notes:string/preferences_title = 0x7f0a0053 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/menu_search = 0x7f0a0031 net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 +net.micode.notes:string/preferences_account_summary = 0x7f0a0044 +net.micode.notes:string/success_sdcard_export = 0x7f0a005b +net.micode.notes:string/notelist_string_info = 0x7f0a0043 net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 net.micode.notes:string/notealert_ok = 0x7f0a0041 +net.micode.notes:string/notealert_enter = 0x7f0a0040 net.micode.notes:string/note_link_web = 0x7f0a003f +net.micode.notes:string/note_link_tel = 0x7f0a003e +net.micode.notes:string/note_link_other = 0x7f0a003d +net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/note_alert_expired = 0x7f0a003b +net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 +net.micode.notes:string/menu_sync = 0x7f0a0038 +net.micode.notes:string/menu_share = 0x7f0a0037 +net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 +net.micode.notes:string/menu_select_none = 0x7f0a0033 net.micode.notes:string/menu_title_select_folder = 0x7f0a003a net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/note_link_email = 0x7f0a003c +net.micode.notes:string/menu_search = 0x7f0a0031 +net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/menu_normal_mode = 0x7f0a002f net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:menu/note_edit = 0x7f070002 net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/menu_font_super = 0x7f0a002b +net.micode.notes:string/menu_font_small = 0x7f0a002a +net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 +net.micode.notes:string/menu_export_text = 0x7f0a0023 net.micode.notes:string/menu_deselect_all = 0x7f0a0022 net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:id/menu_share = 0x7f05002b -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/folder_exist = 0x7f0a0017 net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 +net.micode.notes:string/folder_exist = 0x7f0a0017 +net.micode.notes:string/hint_foler_name = 0x7f0a001d net.micode.notes:string/format_date_ymd = 0x7f0a0018 +net.micode.notes:string/file_path = 0x7f0a0016 net.micode.notes:string/set_remind_time_message = 0x7f0a005a net.micode.notes:string/error_sync_network = 0x7f0a0013 net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 +net.micode.notes:drawable/list_green_up = 0x7f040020 +net.micode.notes:string/call_record_folder_name = 0x7f0a0008 net.micode.notes:drawable/new_note_normal = 0x7f040030 net.micode.notes:string/button_delete = 0x7f0a0007 net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 +net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:raw/introduction = 0x7f090000 net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:dimen/text_font_size_super = 0x7f030004 net.micode.notes:drawable/selected = 0x7f040035 net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 +net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/note_edit = 0x7f070002 +net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:color/secondary_text_dark = 0x7f020001 net.micode.notes:id/move = 0x7f05002e +net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 +net.micode.notes:drawable/new_note_pressed = 0x7f040031 +net.micode.notes:id/iv_bg_blue = 0x7f05000e +net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040027 net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:id/widget_text = 0x7f050042 +net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 +net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050004 net.micode.notes:layout/note_list_footer = 0x7f06000a +net.micode.notes:id/widget_text = 0x7f050042 +net.micode.notes:id/tv_title_bar = 0x7f050040 net.micode.notes:drawable/widget_2x_blue = 0x7f040038 net.micode.notes:id/tv_time = 0x7f05003e net.micode.notes:id/tv_name = 0x7f05003d +net.micode.notes:drawable/new_note = 0x7f04002f +net.micode.notes:id/sv_note_edit = 0x7f050039 +net.micode.notes:id/selection_menu = 0x7f050038 net.micode.notes:string/error_sdcard_export = 0x7f0a000f net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:id/note_edit_view = 0x7f050032 +net.micode.notes:layout/note_edit = 0x7f060005 +net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 +net.micode.notes:drawable/title_alert = 0x7f040036 +net.micode.notes:id/note_title = 0x7f050034 net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f +net.micode.notes:id/note_edit_view = 0x7f050032 net.micode.notes:id/navigation_bar = 0x7f05002f net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:id/minute = 0x7f05002d net.micode.notes:drawable/font_normal = 0x7f040011 +net.micode.notes:id/minute = 0x7f05002d net.micode.notes:drawable/font_super = 0x7f040014 net.micode.notes:id/menu_sync = 0x7f05002c +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/menu_share = 0x7f05002b net.micode.notes:id/menu_setting = 0x7f05002a +net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 +net.micode.notes:id/menu_send_to_desktop = 0x7f050029 +net.micode.notes:id/menu_search = 0x7f050028 net.micode.notes:drawable/list_green_down = 0x7f04001d net.micode.notes:id/menu_new_note = 0x7f050027 net.micode.notes:string/error_note_not_exist = 0x7f0a000e @@ -138,14 +133,14 @@ net.micode.notes:id/iv_medium_select = 0x7f050019 net.micode.notes:id/menu_export_text = 0x7f050023 net.micode.notes:string/menu_folder_view = 0x7f0a0026 net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d net.micode.notes:string/menu_alert = 0x7f0a001f +net.micode.notes:drawable/edit_title_yellow = 0x7f04000d +net.micode.notes:id/menu_alert = 0x7f050020 net.micode.notes:string/success_sync_account = 0x7f0a005c net.micode.notes:id/ll_font_super = 0x7f05001f net.micode.notes:id/ll_font_small = 0x7f05001e @@ -153,44 +148,49 @@ net.micode.notes:menu/call_record_folder = 0x7f070001 net.micode.notes:id/ll_font_normal = 0x7f05001d net.micode.notes:id/ll_font_large = 0x7f05001c net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:id/iv_super_select = 0x7f05001b net.micode.notes:drawable/search_result = 0x7f040034 +net.micode.notes:id/iv_super_select = 0x7f05001b net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:id/tv_alert_date = 0x7f05003a net.micode.notes:dimen/text_font_size_large = 0x7f030000 net.micode.notes:drawable/notification = 0x7f040033 net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:id/iv_large_select = 0x7f050018 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_bg_green_select = 0x7f050011 +net.micode.notes:id/iv_large_select = 0x7f050018 net.micode.notes:id/widget_bg_image = 0x7f050041 +net.micode.notes:id/iv_bg_green_select = 0x7f050011 +net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a net.micode.notes:drawable/menu_move = 0x7f04002e net.micode.notes:drawable/widget_4x_white = 0x7f040040 -net.micode.notes:id/font_size_selector = 0x7f05000b +net.micode.notes:id/iv_bg_blue_select = 0x7f05000f net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/font_size_selector = 0x7f05000b net.micode.notes:id/et_edit_text = 0x7f050009 +net.micode.notes:id/et_foler_name = 0x7f05000a +net.micode.notes:drawable/edit_green = 0x7f040007 +net.micode.notes:layout/widget_4x = 0x7f06000d net.micode.notes:string/search = 0x7f0a0056 net.micode.notes:id/cb_edit_item = 0x7f050006 net.micode.notes:id/btn_set_bg_color = 0x7f050005 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/amPm = 0x7f050003 net.micode.notes:id/iv_bg_green = 0x7f050010 +net.micode.notes:id/amPm = 0x7f050003 net.micode.notes:drawable/widget_4x_green = 0x7f04003e +net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:id/hour = 0x7f05000c net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:style/NoteTheme = 0x7f0b0003 net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c +net.micode.notes:drawable/widget_2x_red = 0x7f04003a net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a net.micode.notes:id/delete = 0x7f050008 +net.micode.notes:drawable/widget_2x_green = 0x7f040039 net.micode.notes:drawable/title_bar_bg = 0x7f040037 net.micode.notes:drawable/menu_delete = 0x7f04002d net.micode.notes:string/error_sync_internal = 0x7f0a0012 diff --git a/src/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/app/build/outputs/logs/manifest-merger-debug-report.txt index 52b5ba7..8ec7b38 100644 --- a/src/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:1-152:12 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:1-152:12 package - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:20:5-31 - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:20:5-31 + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:22:5-30 - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:22:5-30 + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:21:5-28 - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:21:5-28 + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 -INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 +INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 android:targetSdkVersion - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:5-44 - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:5-44 + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:24:15-41 - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml - INJECTED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:24:15-41 + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml + INJECTED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:26:5-81 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:26:5-81 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:26:22-78 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:26:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:27:5-88 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:27:5-88 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:27:22-85 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:27:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:28:5-67 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:28:5-67 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:28:22-64 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:28:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:29:5-72 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:29:5-72 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:29:22-69 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:29:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:30:5-74 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:30:5-74 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:30:22-71 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:30:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:31:5-80 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:31:5-80 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:31:22-77 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:31:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:32:5-71 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:32:5-71 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:32:22-68 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:32:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:33:5-74 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:33:5-74 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:33:22-71 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:33:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:34:5-81 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:34:5-81 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:34:22-78 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:34:22-78 application -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:36:5-151:19 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:36:5-151:19 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:39:9-41 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:39:9-41 android:icon - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:38:9-42 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:38:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:40:9-53:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:40:9-53:20 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:43:13-45 android:launchMode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:44:13-43 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:44:13-43 android:windowSoftInputMode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:47:13-52 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:47:13-52 android:uiOptions - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:46:13-57 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:46:13-57 android:configChanges - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:42:13-74 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:42:13-74 android:theme - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:45:13-45 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:45:13-45 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:41:13-49 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:41:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:49:13-52:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:49:13-52:29 action#android.intent.action.MAIN -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:50:17-69 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:50:17-69 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:50:25-66 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:50:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:51:17-77 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:51:17-77 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:51:27-74 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:51:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:55:9-83:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:55:9-83:20 android:launchMode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:58:13-43 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:58:13-43 android:configChanges - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:57:13-74 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:57:13-74 android:theme - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:59:13-45 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:59:13-45 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:56:13-48 + ADDED from D:\gwx_homework\SE\SE_work_station\src\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 D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:61:13-66:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:61:13-66:29 action#android.intent.action.VIEW -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:62:17-69 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:62:17-69 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:62:25-66 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:62:25-66 category#android.intent.category.DEFAULT -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:17-76 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:17-76 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:63:27-73 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:63:27-73 data -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:17-78 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:17-78 android:mimeType - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:64:23-75 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:64:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:68:13-73:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:68:13-73:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:69:17-79 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:69:17-79 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:69:25-76 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:69:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:75:13-78:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:75:13-78:29 action#android.intent.action.SEARCH -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:76:17-71 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:76:17-71 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:76:25-68 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:76:25-68 meta-data#android.app.searchable -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:80:13-82:54 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:80:13-82:54 android:resource - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:82:17-51 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:82:17-51 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:81:17-54 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:81:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:85:9-88:43 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:85:9-88:43 android:authorities - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:87:13-47 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:87:13-47 android:multiprocess - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:88:13-40 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:88:13-40 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:86:13-63 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:86:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:90:9-102:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:90:9-102:20 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:92:13-50 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:92:13-50 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:91:13-57 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:91:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:93:13-97:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:93:13-97:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:17-84 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:17-84 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:94:25-81 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:94:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:17-85 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:17-85 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:95:25-82 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:95:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:17-85 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:17-85 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:96:25-82 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:96:25-82 meta-data#android.appwidget.provider -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:99:13-101:58 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:99:13-101:58 android:resource - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:101:17-55 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:101:17-55 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:100:17-58 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:100:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:103:9-116:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:103:9-116:20 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:105:13-50 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:105:13-50 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:104:13-57 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:104:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:118:9-122:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:118:9-122:20 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:118:19-55 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:118:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:119:13-121:29 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:119:13-121:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:120:17-79 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:120:17-79 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:120:25-76 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:120:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:124:9-127:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:124:9-127:20 android:process - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:126:13-38 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:126:13-38 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:125:13-61 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:125:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:129:9-134:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:129:9-134:20 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:131:13-45 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:131:13-45 android:launchMode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:132:13-48 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:132:13-48 android:theme - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:133:13-75 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:133:13-75 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:130:13-50 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:130:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:136:9-141:20 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:136:9-141:20 android:label - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:138:13-54 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:138:13-54 android:launchMode - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:139:13-43 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:139:13-43 android:theme - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:140:13-60 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:140:13-60 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:137:13-71 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:137:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:143:9-146:19 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:143:9-146:19 android:exported - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:145:13-37 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:145:13-37 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:144:13-74 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:144:13-74 meta-data#android.app.default_searchable -ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:148:9-150:52 +ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:148:9-150:52 android:value - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:150:13-49 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:150:13-49 android:name - ADDED from D:\gwx_homework\SE\class_16\app\src\main\AndroidManifest.xml:149:13-58 + ADDED from D:\gwx_homework\SE\SE_work_station\src\app\src\main\AndroidManifest.xml:149:13-58 diff --git a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 824ba02..8305c61 100644 Binary files a/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/app/src/main/res/values/styles.xml b/src/app/src/main/res/values/styles.xml index b1df8f4..0b83aa0 100644 --- a/src/app/src/main/res/values/styles.xml +++ b/src/app/src/main/res/values/styles.xml @@ -63,7 +63,9 @@ \ No newline at end of file diff --git a/src/build.gradle b/src/build.gradle index 0b117e9..1fa82b7 100644 --- a/src/build.gradle +++ b/src/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - google() + repositories {//这里是gradle脚本执行所需依赖 + google()//从Android Studio3.0后新增了google()配置，可以引用google上的开源项目 //maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() } @@ -11,7 +11,7 @@ buildscript { } allprojects { - repositories { + repositories {//这里是项目本身需要的依赖 google() //maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'} jcenter() diff --git a/src/src/net/micode/notes/ui/NoteEditActivity.java b/src/src/net/micode/notes/ui/NoteEditActivity.java index 54394f0..96a9ff8 100644 --- a/src/src/net/micode/notes/ui/NoteEditActivity.java +++ b/src/src/net/micode/notes/ui/NoteEditActivity.java @@ -74,8 +74,6 @@ import java.util.regex.Pattern; public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { - //该类主要针对标签编辑 - //继承了系统内部和监听有关的类 private class HeadViewHolder { public TextView tvModified; @@ -88,13 +86,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, private static final Map sBgSelectorBtnsMap = new HashMap(); static { - //使用Map实现数据存储 sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE); sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN); sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE); - //put函数把指定值和指定键相连 } private static final Map sBgSelectorSelectionMap = new HashMap(); @@ -127,27 +123,19 @@ public class NoteEditActivity extends Activity implements OnClickListener, private HeadViewHolder mNoteHeaderHolder; private View mHeadViewPanel; - //私有化界面操作mHeadViewPanel（对表头的操作） private View mNoteBgColorSelector; - //私有化界面操作mNoteBgColorSelector（对背景颜色的操作） private View mFontSizeSelector; - //私有化界面操作mFontSizeSelector（对标签字体的操作） private EditText mNoteEditor; private View mNoteEditorPanel; - //私有化界面操作mNoteEditorPanel（文本编辑的控制板） private WorkingNote mWorkingNote; - //初始化模板WorkingNote private SharedPreferences mSharedPrefs; - //私有化SharedPreferences的数据存储方式 - //它的本质是基于XML文件存储key-value键值对数据 private int mFontSizeId; - //用于操作字体的大小 private static final String PREFERENCE_FONT_SIZE = "pref_font_size"; @@ -157,7 +145,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, public static final String TAG_UNCHECKED = String.valueOf('\u25A1'); private LinearLayout mEditTextList; - //线性布局 private String mUserQuery; private Pattern mPattern; @@ -166,7 +153,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.note_edit); - //访问数据库 + if (savedInstanceState == null && !initActivityState(getIntent())) { finish(); return; @@ -189,7 +176,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } Log.d(TAG, "Restoring from killed activity"); - }//为防止内存不足时程序的终止，在此处保存现场 + } } private boolean initActivityState(Intent intent) { @@ -201,40 +188,34 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (TextUtils.equals(Intent.ACTION_VIEW, intent.getAction())) { long noteId = intent.getLongExtra(Intent.EXTRA_UID, 0); mUserQuery = ""; - //如果用户实例化标签时，系统并未给出标签ID + /** * Starting from the searched result */ - //根据键值查找ID if (intent.hasExtra(SearchManager.EXTRA_DATA_KEY)) { noteId = Long.parseLong(intent.getStringExtra(SearchManager.EXTRA_DATA_KEY)); mUserQuery = intent.getStringExtra(SearchManager.USER_QUERY); } - //如果ID在数据库中未找到 + if (!DataUtils.visibleInNoteDatabase(getContentResolver(), noteId, Notes.TYPE_NOTE)) { Intent jump = new Intent(this, NotesListActivity.class); - startActivity(jump);//程序将跳转到上面声明的Intent jump + startActivity(jump); showToast(R.string.error_note_not_exist); finish(); return false; - } //如果ID在数据库中找到 - else { + } else { mWorkingNote = WorkingNote.load(this, noteId); if (mWorkingNote == null) { - Log.e(TAG, "load note failed with note id" + noteId);//打印出红色的错误信息 + Log.e(TAG, "load note failed with note id" + noteId); finish(); return false; } } - //setSoftInputMode软键盘输入模式 getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { // New note - // intent.getAction() - // 大多用于broadcast时给intent设置一个action - // 用户可以通过receive intent，通过getAction得到的字符串，来决定操作 long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); @@ -243,7 +224,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, int bgResId = intent.getIntExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, ResourceParser.getDefaultBgId(this)); - // intent.getInt（Long、String）Extra是对各变量的语法分析 // Parse call-record note String phoneNumber = intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER); long callDate = intent.getLongExtra(Notes.INTENT_EXTRA_CALL_DATE, 0); @@ -260,17 +240,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, finish(); return false; } - } //将电话号码与手机的号码簿相关 - else { + } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); mWorkingNote.convertToCallNote(phoneNumber, callDate); } - } - else { + } else { mWorkingNote = WorkingNote.createEmptyNote(this, folderId, widgetId, widgetType, bgResId); - }//创建一个新的WorkingNote + } getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE @@ -291,10 +269,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private void initNoteScreen() { - //界面初始化 mNoteEditor.setTextAppearance(this, TextAppearanceResources .getTexAppearanceResource(mFontSizeId)); - //设置外观 if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { switchToListMode(mWorkingNote.getContent()); } else { @@ -318,18 +294,18 @@ public class NoteEditActivity extends Activity implements OnClickListener, */ showAlertHeader(); } - //设置闹钟的显示 + private void showAlertHeader() { if (mWorkingNote.hasClockAlert()) { long time = System.currentTimeMillis(); - if (time > mWorkingNote.getAlertDate()) { //如果系统时间大于闹钟设置时间，闹钟失效 + if (time > mWorkingNote.getAlertDate()) { mNoteHeaderHolder.tvAlertDate.setText(R.string.note_alert_expired); } else { mNoteHeaderHolder.tvAlertDate.setText(DateUtils.getRelativeTimeSpanString( mWorkingNote.getAlertDate(), time, DateUtils.MINUTE_IN_MILLIS)); } mNoteHeaderHolder.tvAlertDate.setVisibility(View.VISIBLE); - mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE);//显示闹钟开启的图标 + mNoteHeaderHolder.ivAlertIcon.setVisibility(View.VISIBLE); } else { mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); @@ -350,8 +326,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, * generate a id. If the editing note is not worth saving, there * is no id which is equivalent to create new note */ - //在创建新的标签时，先在数据库中匹配 - //如果不存在，那么在数据库中存储 if (!mWorkingNote.existInDatabase()) { saveNote(); } @@ -360,23 +334,21 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - //MotionEvent是对屏幕触控的传递机制 public boolean dispatchTouchEvent(MotionEvent ev) { if (mNoteBgColorSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mNoteBgColorSelector, ev)) { mNoteBgColorSelector.setVisibility(View.GONE); return true; - }//颜色选择器在屏幕上可见 + } if (mFontSizeSelector.getVisibility() == View.VISIBLE && !inRangeOfView(mFontSizeSelector, ev)) { mFontSizeSelector.setVisibility(View.GONE); return true; - }//字体大小选择器在屏幕上可见 + } return super.dispatchTouchEvent(ev); } - //对屏幕触控的坐标进行操作 private boolean inRangeOfView(View view, MotionEvent ev) { int []location = new int[2]; view.getLocationOnScreen(location); @@ -385,7 +357,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, if (ev.getX() < x || ev.getX() > (x + view.getWidth()) || ev.getY() < y - || ev.getY() > (y + view.getHeight())) {//如果触控的位置超出了给定的范围，返回false + || ev.getY() > (y + view.getHeight())) { return false; } return true; @@ -405,13 +377,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, for (int id : sBgSelectorBtnsMap.keySet()) { ImageView iv = (ImageView) findViewById(id); iv.setOnClickListener(this); - }//初始化标签属性内容 + } mFontSizeSelector = findViewById(R.id.font_size_selector); for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); - };//选择字体大小 + }; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); /** @@ -434,7 +406,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, clearSettingState(); } - //和桌面小工具的同步 private void updateWidget() { Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE); if (mWorkingNote.getWidgetType() == Notes.TYPE_WIDGET_2X) { @@ -510,7 +481,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - //准备选择菜单 public boolean onPrepareOptionsMenu(Menu menu) { if (isFinishing()) { return true; @@ -519,7 +489,6 @@ public class NoteEditActivity extends Activity implements OnClickListener, menu.clear(); if (mWorkingNote.getFolderId() == Notes.ID_CALL_RECORD_FOLDER) { getMenuInflater().inflate(R.menu.call_note_edit, menu); - // MenuInflater用来实例化Menu目录下的Menu布局文件 } else { getMenuInflater().inflate(R.menu.note_edit, menu); } @@ -537,67 +506,45 @@ public class NoteEditActivity extends Activity implements OnClickListener, } @Override - //动态改变菜单选项内容 public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - //根据菜单id来编辑相关项目 case R.id.menu_new_note: - //创建便签 createNewNote(); break; case R.id.menu_delete: - //删除便签 AlertDialog.Builder builder = new AlertDialog.Builder(this); - //创建关于删除操作的对话框 builder.setTitle(getString(R.string.alert_title_delete)); - // 设置标签的标题为alert_title_delete builder.setIcon(android.R.drawable.ic_dialog_alert); - //设置对话框图标 builder.setMessage(getString(R.string.alert_message_delete_note)); - //设置对话框内容 builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener()//建立按键监听器 - { + new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - // 点击所触发事件 - // 删除当前便签 deleteCurrentNote(); finish(); } }); builder.setNegativeButton(android.R.string.cancel, null); - //添加否定按钮 builder.show(); - //显示对话框 break; case R.id.menu_font_size: - //字体大小的编辑 mFontSizeSelector.setVisibility(View.VISIBLE); - // 将字体选择器置为可见 findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - // 通过id找到相应的大小 break; case R.id.menu_list_mode: - //选择列表模式 mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? TextNote.MODE_CHECK_LIST : 0); break; case R.id.menu_share: - //菜单共享 getWorkingText(); sendTo(this, mWorkingNote.getContent()); - // 用SendTo函数将运行文本发送到遍历的本文内 break; case R.id.menu_send_to_desktop: - //发送到桌面 sendToDesktop(); break; case R.id.menu_alert: - //创建提醒器 setReminder(); break; case R.id.menu_delete_remind: - //删除日期提醒 mWorkingNote.setAlertDate(0, false); break; default: @@ -606,17 +553,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } - //建立事件提醒器 private void setReminder() { DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); - // 建立修改时间日期的对话框 d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { mWorkingNote.setAlertDate(date , true); - //选择提醒的日期 } }); - //建立时间日期的监听器 d.show(); } @@ -624,112 +567,85 @@ public class NoteEditActivity extends Activity implements OnClickListener, * Share note to apps that support {@link Intent#ACTION_SEND} action * and {@text/plain} type */ - //共享便签 private void sendTo(Context context, String info) { Intent intent = new Intent(Intent.ACTION_SEND); - //建立intent链接选项 intent.putExtra(Intent.EXTRA_TEXT, info); - //将需要传递的便签信息放入text文件中 intent.setType("text/plain"); - //编辑连接器的类型 context.startActivity(intent); - //在acti中进行链接 } - //创建一个新的便签 private void createNewNote() { // Firstly, save current editing notes - //保存当前便签 saveNote(); // For safety, start a new NoteEditActivity finish(); Intent intent = new Intent(this, NoteEditActivity.class); - //设置链接器 intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - //该活动定义为创建或编辑 intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, mWorkingNote.getFolderId()); - //将运行便签的id添加到INTENT_EXTRA_FOLDER_ID标记中 startActivity(intent); - //开始activity并链接 } - //删除当前便签 private void deleteCurrentNote() { - if (mWorkingNote.existInDatabase()) //假如当前运行的便签内存有数据 - { + if (mWorkingNote.existInDatabase()) { HashSet ids = new HashSet(); long id = mWorkingNote.getNoteId(); if (id != Notes.ID_ROOT_FOLDER) { - ids.add(id);//如果不是头文件夹建立一个hash表把便签id存起来 + ids.add(id); } else { - Log.d(TAG, "Wrong note id, should not happen");//否则报错 + Log.d(TAG, "Wrong note id, should not happen"); } if (!isSyncMode()) { - //非同步模式 - //删除操作 if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { Log.e(TAG, "Delete Note error"); } } else { - //同步模式 - //移动至垃圾文件夹的操作 if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { Log.e(TAG, "Move notes to trash folder error, should not happens"); } } } mWorkingNote.markDeleted(true); - //将这些标签的删除标记置为true } - //判断是否为同步模式 - private boolean isSyncMode() {//查看NotesPreferenceActivity中同步名称是否为空 + private boolean isSyncMode() { return NotesPreferenceActivity.getSyncAccountName(this).trim().length() > 0; } - //设置提醒时间 public void onClockAlertChanged(long date, boolean set) { /** * User could set clock to an unsaved note, so before setting the * alert clock, we should save the note first */ if (!mWorkingNote.existInDatabase()) { - //首先保存已有的便签 saveNote(); } if (mWorkingNote.getNoteId() > 0) { Intent intent = new Intent(this, AlarmReceiver.class); intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId())); - //若有有运行的便签就是建立一个链接器将标签id都存在uri中 PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); - //设置提醒管理器 showAlertHeader(); if(!set) { alarmManager.cancel(pendingIntent); } else { alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); } - //如果用户设置了时间，就通过提醒管理器设置一个监听事项 } else { /** * There is the condition that user has input nothing (the note is * not worthy saving), we have no note id, remind the user that he * should input something */ - //没有运行的便签就报错 Log.e(TAG, "Clock alert setting error"); showToast(R.string.error_note_empty_for_clock); } } - //Widget发生改变的所触发的事件 public void onWidgetChanged() { updateWidget(); - }//更新Widget + } - //删除编辑文本框所触发的事件 public void onEditTextDelete(int index, String text) { int childCount = mEditTextList.getChildCount(); if (childCount == 1) { @@ -738,11 +654,10 @@ public class NoteEditActivity extends Activity implements OnClickListener, for (int i = index + 1; i < childCount; i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i - 1);//通过id把编辑框存在便签编辑框中 + .setIndex(i - 1); } mEditTextList.removeViewAt(index); - //删除特定位置的视图 NoteEditText edit = null; if(index == 0) { edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( @@ -750,14 +665,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { edit = (NoteEditText) mEditTextList.getChildAt(index - 1).findViewById( R.id.et_edit_text); - }//通过id把编辑框存在空的NoteEditText中 + } int length = edit.length(); edit.append(text); - edit.requestFocus();//请求优先级 - edit.setSelection(length);//定位到length位置处的条目 + edit.requestFocus(); + edit.setSelection(length); } - //进入编辑文本框所触发的事件 public void onEditTextEnter(int index, String text) { /** * Should not happen, check for debug @@ -768,66 +682,53 @@ public class NoteEditActivity extends Activity implements OnClickListener, View view = getListItem(text, index); mEditTextList.addView(view, index); - //建立一个新的视图并添加到编辑文本框内 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - edit.requestFocus();//请求优先操作 - edit.setSelection(0);//定位到起始位置 + edit.requestFocus(); + edit.setSelection(0); for (int i = index + 1; i < mEditTextList.getChildCount(); i++) { ((NoteEditText) mEditTextList.getChildAt(i).findViewById(R.id.et_edit_text)) - .setIndex(i);//遍历子文本框并设置对应对下标 + .setIndex(i); } } - //切换至列表模式 private void switchToListMode(String text) { mEditTextList.removeAllViews(); String[] items = text.split("\n"); int index = 0; - //清空所有视图，初始化下标 for (String item : items) { if(!TextUtils.isEmpty(item)) { mEditTextList.addView(getListItem(item, index)); index++; - //遍历所有文本单元并添加到文本框中 } } mEditTextList.addView(getListItem("", index)); mEditTextList.getChildAt(index).findViewById(R.id.et_edit_text).requestFocus(); - mNoteEditor.setVisibility(View.GONE);//便签编辑器不可见 - mEditTextList.setVisibility(View.VISIBLE);//将文本编辑框置为可见 + mNoteEditor.setVisibility(View.GONE); + mEditTextList.setVisibility(View.VISIBLE); } - //获取高亮效果的反馈情况 private Spannable getHighlightQueryResult(String fullText, String userQuery) { SpannableString spannable = new SpannableString(fullText == null ? "" : fullText); - //新建效果选项 if (!TextUtils.isEmpty(userQuery)) { mPattern = Pattern.compile(userQuery); - //将用户的询问进行解析 Matcher m = mPattern.matcher(fullText); - //建立一个状态机检查Pattern并进行匹配 int start = 0; while (m.find(start)) { spannable.setSpan( new BackgroundColorSpan(this.getResources().getColor( R.color.user_query_highlight)), m.start(), m.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - //设置背景颜色 start = m.end(); - //跟新起始位置 } } return spannable; } - //获取列表项 private View getListItem(String item, int index) { View view = LayoutInflater.from(this).inflate(R.layout.note_edit_list_item, null); - //创建一个视图 final NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); edit.setTextAppearance(this, TextAppearanceResources.getTexAppearanceResource(mFontSizeId)); - //创建一个文本编辑框并设置可见性 CheckBox cb = ((CheckBox) view.findViewById(R.id.cb_edit_item)); cb.setOnCheckedChangeListener(new OnCheckedChangeListener() { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -838,10 +739,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } }); - //建立一个打钩框并设置监听器 if (item.startsWith(TAG_CHECKED)) { - //选择勾选 cb.setChecked(true); edit.setPaintFlags(edit.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); item = item.substring(TAG_CHECKED.length(), item.length()).trim(); @@ -854,79 +753,61 @@ public class NoteEditActivity extends Activity implements OnClickListener, edit.setOnTextViewChangeListener(this); edit.setIndex(index); edit.setText(getHighlightQueryResult(item, mUserQuery)); - //运行编辑框的监听器对该行为作出反应，并设置下标及文本内容 return view; } - //便签内容发生改变所触发的事件 public void onTextChange(int index, boolean hasText) { if (index >= mEditTextList.getChildCount()) { - Log.e(TAG, "Wrong index, should not happen");//越界报错 + Log.e(TAG, "Wrong index, should not happen"); return; } if(hasText) { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); - //如果内容不为空则将其子编辑框可见性置为可见，否则不可见 } } - //检查模式和列表模式的切换 public void onCheckListModeChanged(int oldMode, int newMode) { if (newMode == TextNote.MODE_CHECK_LIST) { switchToListMode(mNoteEditor.getText().toString()); - //检查模式切换到列表模式 } else { if (!getWorkingText()) { mWorkingNote.setWorkingText(mWorkingNote.getContent().replace(TAG_UNCHECKED + " ", "")); } - //若是获取到文本就改变其检查标记 mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); - //修改文本编辑器的内容和可见性 } } - //设置勾选选项表并返回是否勾选的标记 private boolean getWorkingText() { boolean hasChecked = false; - //初始化check标记,默认为false if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) { - // 若模式为CHECK_LIST StringBuilder sb = new StringBuilder(); - //创建可变字符串 for (int i = 0; i < mEditTextList.getChildCount(); i++) { View view = mEditTextList.getChildAt(i); - //遍历所有子编辑框的视图 NoteEditText edit = (NoteEditText) view.findViewById(R.id.et_edit_text); - if (!TextUtils.isEmpty(edit.getText())) {//若文本不为空 + if (!TextUtils.isEmpty(edit.getText())) { if (((CheckBox) view.findViewById(R.id.cb_edit_item)).isChecked()) { - //该选项框已打钩 sb.append(TAG_CHECKED).append(" ").append(edit.getText()).append("\n"); - hasChecked = true;//扩展字符串为已打钩并把标记置true + hasChecked = true; } else { sb.append(TAG_UNCHECKED).append(" ").append(edit.getText()).append("\n"); - //扩展字符串添加未打钩 } } } mWorkingNote.setWorkingText(sb.toString()); - //利用编辑好的字符串设置运行便签的内容 } else { mWorkingNote.setWorkingText(mNoteEditor.getText().toString()); - // 若不是该模式直接用编辑器中的内容设置运行中标签的内容 } return hasChecked; } - //保存便签 private boolean saveNote() { getWorkingText(); boolean saved = mWorkingNote.saveNote(); - //运行 getWorkingText()之后保存 if (saved) { /** * There are two modes from List view to edit view, open one note, @@ -935,13 +816,11 @@ public class NoteEditActivity extends Activity implements OnClickListener, * new node requires to the top of the list. This code * {@link #RESULT_OK} is used to identify the create/edit state */ - //RESULT_OK是为了识别保存的情况:一是创建后保存，二是修改后保存 setResult(RESULT_OK); } return saved; } - //将便签发送至桌面 private void sendToDesktop() { /** * Before send message to home, we should make sure that current @@ -949,15 +828,13 @@ public class NoteEditActivity extends Activity implements OnClickListener, * save it */ if (!mWorkingNote.existInDatabase()) { - saveNote();//若不存在数据(新标签)就保存 + saveNote(); } if (mWorkingNote.getNoteId() > 0) { Intent sender = new Intent(); Intent shortcutIntent = new Intent(this, NoteEditActivity.class); - //建立发送到桌面的连接器 shortcutIntent.setAction(Intent.ACTION_VIEW); - //链接为一个视图 shortcutIntent.putExtra(Intent.EXTRA_UID, mWorkingNote.getNoteId()); sender.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent); sender.putExtra(Intent.EXTRA_SHORTCUT_NAME, @@ -965,12 +842,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, sender.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.drawable.icon_app)); sender.putExtra("duplicate", true); - //将便签的相关信息都添加到要发送的文件里 sender.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); - //设置sneder的行为是发送 showToast(R.string.info_note_enter_desktop); sendBroadcast(sender); - //显示到桌面 } else { /** * There is the condition that user has input nothing (the note is @@ -982,21 +856,17 @@ public class NoteEditActivity extends Activity implements OnClickListener, } } - //编辑小图标的标题 private String makeShortcutIconTitle(String content) { content = content.replace(TAG_CHECKED, ""); content = content.replace(TAG_UNCHECKED, ""); return content.length() > SHORTCUT_ICON_TITLE_MAX_LEN ? content.substring(0, SHORTCUT_ICON_TITLE_MAX_LEN) : content; - //直接设置为content中的内容并返回，有勾选和未勾选2种 } - //显示提示的视图(根据下标显示对应的提示) private void showToast(int resId) { showToast(resId, Toast.LENGTH_SHORT); } - //持续显示提示的视图(根据下标和持续的时间（duration）编辑提示视图并显示) private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); }