diff --git a/src/note_but_github/.gradle/7.5/checksums/checksums.lock b/src/note_but_github/.gradle/7.5/checksums/checksums.lock index 8ba6a81..480aae0 100644 Binary files a/src/note_but_github/.gradle/7.5/checksums/checksums.lock and b/src/note_but_github/.gradle/7.5/checksums/checksums.lock differ diff --git a/src/note_but_github/.gradle/7.5/checksums/sha1-checksums.bin b/src/note_but_github/.gradle/7.5/checksums/sha1-checksums.bin index 715bd2b..8a5b1f7 100644 Binary files a/src/note_but_github/.gradle/7.5/checksums/sha1-checksums.bin and b/src/note_but_github/.gradle/7.5/checksums/sha1-checksums.bin differ diff --git a/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.bin b/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.bin index 421b7e6..4f43430 100644 Binary files a/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.bin and b/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.bin differ diff --git a/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.lock b/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.lock index af7cd06..99ac004 100644 Binary files a/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.lock and b/src/note_but_github/.gradle/7.5/executionHistory/executionHistory.lock differ diff --git a/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.bin b/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.bin index 1bce679..47f0e86 100644 Binary files a/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.bin and b/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.bin differ diff --git a/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.lock b/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.lock index 17f74e7..7acfabc 100644 Binary files a/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.lock and b/src/note_but_github/.gradle/7.5/fileHashes/fileHashes.lock differ diff --git a/src/note_but_github/.gradle/7.5/fileHashes/resourceHashesCache.bin b/src/note_but_github/.gradle/7.5/fileHashes/resourceHashesCache.bin index 7ab7fbf..0c890d7 100644 Binary files a/src/note_but_github/.gradle/7.5/fileHashes/resourceHashesCache.bin and b/src/note_but_github/.gradle/7.5/fileHashes/resourceHashesCache.bin differ diff --git a/src/note_but_github/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/note_but_github/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 77c8f2e..f8544b9 100644 Binary files a/src/note_but_github/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/note_but_github/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/note_but_github/.gradle/buildOutputCleanup/outputFiles.bin b/src/note_but_github/.gradle/buildOutputCleanup/outputFiles.bin index 62ad3ad..fa5330a 100644 Binary files a/src/note_but_github/.gradle/buildOutputCleanup/outputFiles.bin and b/src/note_but_github/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/src/note_but_github/.gradle/file-system.probe b/src/note_but_github/.gradle/file-system.probe index b764d56..c13fe87 100644 Binary files a/src/note_but_github/.gradle/file-system.probe and b/src/note_but_github/.gradle/file-system.probe differ diff --git a/src/note_but_github/.idea/compiler.xml b/src/note_but_github/.idea/compiler.xml index b589d56..fb7f4a8 100644 --- a/src/note_but_github/.idea/compiler.xml +++ b/src/note_but_github/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/note_but_github/.idea/misc.xml b/src/note_but_github/.idea/misc.xml index d673ade..bdd9278 100644 --- a/src/note_but_github/.idea/misc.xml +++ b/src/note_but_github/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/src/note_but_github/app/build/intermediates/apk/debug/app-debug.apk b/src/note_but_github/app/build/intermediates/apk/debug/app-debug.apk index e4ff743..857cb0c 100644 Binary files a/src/note_but_github/app/build/intermediates/apk/debug/app-debug.apk and b/src/note_but_github/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/note_but_github/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/note_but_github/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index a54964f..d077654 100644 Binary files a/src/note_but_github/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/note_but_github/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_0/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_0/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_1/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_1/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_2/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_2/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_3/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_3/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_4/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_4/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_5/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_5/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_6/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_6/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_7/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_7/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_8/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_8/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_8/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_9/graph.bin b/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_9/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/note_but_github/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_f836f84d675c4cfe07b6ac6a775024a4cbd9c7021a86eb10fe91096c463a908d_bucket_9/graph.bin and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/note_but_github/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 43b20c8..ca0a3c8 100644 Binary files a/src/note_but_github/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/note_but_github/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/note_but_github/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/note_but_github/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index f8d79b4..8f1be29 100644 Binary files a/src/note_but_github/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/note_but_github/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 909a3da..389692e 100644 --- a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,96 +1,96 @@ -#Thu Mar 20 19:24:36 CST 2025 -net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-7\:/raw/introduction=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\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\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +#Sat May 17 22:43:29 CST 2025 +net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_super.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/dialog_edit_text.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat +net.micode.notes.app-main-7\:/layout/widget_4x.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/clock.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/font_normal.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/layout/note_edit.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_green.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_green.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat +net.micode.notes.app-main-7\:/xml/preferences.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_red_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat +net.micode.notes.app-main-7\:/menu/call_record_folder.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat +net.micode.notes.app-main-7\:/layout/widget_2x.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/menu_move.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat +net.micode.notes.app-main-7\:/xml/widget_4x_info.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat +net.micode.notes.app-main-7\:/drawable-hdpi/search_result.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat +net.micode.notes.app-main-7\:/menu/note_list.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat +net.micode.notes.app-main-7\:/menu/call_note_edit.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat +net.micode.notes.app-main-7\:/drawable/new_note.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/edit_red.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat +net.micode.notes.app-main-7\:/layout/note_list.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat +net.micode.notes.app-main-7\:/color/primary_text_dark.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat +net.micode.notes.app-main-7\:/layout/datetime_picker.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat +net.micode.notes.app-main-7\:/raw/introduction=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_yellow_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat +net.micode.notes.app-main-7\:/layout/note_item.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/list_background.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/xml/searchable.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat +net.micode.notes.app-main-7\:/drawable-hdpi/notification.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat diff --git a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗? - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误,请检查SD卡 - SD卡被占用,不能操作 - 同步已取消 - 同步失败,发生内部错误 - 同步失败,请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在,请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - - 正常 - 文字大小 - - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项,操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复 - 请选择google帐号,便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中,不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容,点击新建便签。 - 访客模式下,便签内容不可见 - \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎? - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤,請檢查SD卡 - SD卡被佔用,不能操作 - 同步已取消 - 同步失敗,發生內部錯誤 - 同步失敗,請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在,請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - - 正常 - 文字大小 - - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項,操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復 - 請選擇google帳號,便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中,不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容,點擊新建便簽。 - 訪客模式下,便籤內容不可見 - \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode,can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index 0d0c902..a9d6dc7 100644 --- a/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/note_but_github/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/note_but_github/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/note_but_github/app/build/intermediates/incremental/mergeDebugAssets/merger.xml index e32ba79..eb8f44c 100644 --- a/src/note_but_github/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ b/src/note_but_github/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/note_but_github/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/note_but_github/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml index 115236d..b0a96b4 100644 --- a/src/note_but_github/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ b/src/note_but_github/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/note_but_github/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/note_but_github/app/build/intermediates/incremental/mergeDebugShaders/merger.xml index 3717660..85b2603 100644 --- a/src/note_but_github/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ b/src/note_but_github/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/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index d8940ad..044cacf 100644 --- a/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Tue Mar 25 18:17:58 CST 2025 -base.0=D\:\\xueye\\xiaominote\\note_but_github\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex +#Sat May 17 22:44:02 CST 2025 +base.0=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 5f5a841..59f138e 100644 Binary files a/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class index d04f952..fa23db5 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 976265d..30e4b94 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class index 2319eaf..0da31e8 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class index d2dcfb5..b2c63d4 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class index c61d69f..be5b129 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class index 26c68fb..d004695 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class index 69ac9b5..5590b3b 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class index 3c7e5b6..b47859c 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class index 06827bd..5cc6db5 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class index e9f5b68..a44b3a2 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class index bfb671c..52e29bd 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class index ed4ac8e..a4aeb6a 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class index fc1d9a2..835abf0 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index f1053bc..29b38b8 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class index 2a3fdb3..30eb9cf 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class index b4c98c4..38dafb9 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 126d6aa..8f8ce4f 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class index 7ded6f4..4d31bb6 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 94fd184..1287cf9 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class index ff95cab..0784dad 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class index 5012ef9..4ae491d 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class index 5b0d475..b47c690 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class index 926becc..34b010e 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class index 1aacd35..bfa835a 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class index 432dd4e..25c75de 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class index 0db9dac..5c54dbf 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class index 5c26900..5b90336 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index fa0393d..72ee220 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 06036f1..d2777ec 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index 1f9f3a0..f98920d 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class index b58eac3..f0593ea 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 9ec847b..30aebb9 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class index 5053337..3b21f15 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class index f6e1ed8..5361b59 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class index fabc84f..1ea9c16 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class differ diff --git a/src/note_but_github/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/note_but_github/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt index 159a880..cda9e16 100644 --- a/src/note_but_github/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ b/src/note_but_github/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:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +22-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 23 android:minSdkVersion="14" -23-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:15-41 +23-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:15-41 24 android:targetSdkVersion="29" /> -24-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +24-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 25 26 -26-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:25:22-78 +26-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:25:5-81 +26-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:25:22-78 27 -27-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:26:22-85 +27-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:26:5-88 +27-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:26:22-85 28 -28-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:27:22-64 +28-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:27:5-67 +28-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:27:22-64 29 -29-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:28:22-69 +29-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:28:5-72 +29-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:28:22-69 30 -30-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:29:22-71 +30-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:29:5-74 +30-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:29:22-71 31 -31-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:30:22-77 +31-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:30:5-80 +31-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:30:22-77 32 -32-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:31:22-68 +32-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:31:5-71 +32-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:31:22-68 33 -33-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:32:22-71 +33-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:32:5-74 +33-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:32:22-71 34 -34-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 +34-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:5-81 +34-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:35:5-149:19 +36-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:35:5-149:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" -38-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:36:9-42 +38-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:36:9-42 39 android:label="@string/app_name" -39-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:37:9-41 +39-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:37:9-41 40 android:testOnly="true" > 41 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:38:9-51:20 +41-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:38:9-51:20 42 android:name="net.micode.notes.ui.NotesListActivity" -42-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:39:13-49 +42-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:39:13-49 43 android:configChanges="keyboardHidden|orientation|screenSize" -43-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:40:13-74 +43-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:40:13-74 44 android:label="@string/app_name" -44-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:41:13-45 +44-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:41:13-45 45 android:launchMode="singleTop" -45-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:42:13-43 +45-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:42:13-43 46 android:theme="@style/NoteTheme" -46-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:43:13-45 +46-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:43:13-45 47 android:uiOptions="splitActionBarWhenNarrow" -47-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:44:13-57 +47-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:44:13-57 48 android:windowSoftInputMode="adjustPan" > -48-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:45:13-52 +48-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:45:13-52 49 -49-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:47:13-50:29 +49-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:47:13-50:29 50 -50-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:48:17-69 -50-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:48:25-66 +50-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:48:17-69 +50-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:48:25-66 51 52 -52-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:49:17-77 -52-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:49:27-74 +52-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:49:17-77 +52-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:49:27-74 53 54 55 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:53:9-81:20 +55-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:53:9-81:20 56 android:name="net.micode.notes.ui.NoteEditActivity" -56-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:54:13-48 +56-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:54:13-48 57 android:configChanges="keyboardHidden|orientation|screenSize" -57-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:55:13-74 +57-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:55:13-74 58 android:launchMode="singleTop" -58-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:56:13-43 +58-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:56:13-43 59 android:theme="@style/NoteTheme" > -59-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:57:13-45 +59-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:57:13-45 60 -60-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:59:13-64:29 +60-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:59:13-64:29 61 -61-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:60:17-69 -61-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:60:25-66 +61-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:60:17-69 +61-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:60:25-66 62 63 -63-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 -63-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 +63-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 +63-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 64 65 -65-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 -65-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 +65-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 +65-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 66 -66-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 +66-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 +66-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 67 68 -68-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:66:13-71:29 +68-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:66:13-71:29 69 -69-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:67:17-79 -69-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:67:25-76 +69-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:67:17-79 +69-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:67:25-76 70 71 -71-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 -71-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 +71-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 +71-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 72 73 -73-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 -73-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 +73-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 +73-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 74 -74-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 +74-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 +74-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 75 76 -76-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:73:13-76:29 +76-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:73:13-76:29 77 -77-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:74:17-71 -77-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:74:25-68 +77-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:74:17-71 +77-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:74:25-68 78 79 -79-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 -79-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 +79-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 +79-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 80 81 82 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:78:13-80:54 +82-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:78:13-80:54 83 android:name="android.app.searchable" -83-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:79:17-54 +83-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:79:17-54 84 android:resource="@xml/searchable" /> -84-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:80:17-51 +84-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:80:17-51 85 86 87 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:83:9-86:43 +87-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:83:9-86:43 88 android:name="net.micode.notes.data.NotesProvider" -88-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:84:13-63 +88-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:84:13-63 89 android:authorities="micode_notes" -89-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:85:13-47 +89-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:85:13-47 90 android:multiprocess="true" /> -90-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:86:13-40 +90-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:86:13-40 91 92 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:88:9-100:20 +92-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:88:9-100:20 93 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -93-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:89:13-57 +93-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:89:13-57 94 android:label="@string/app_widget2x2" > -94-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:90:13-50 +94-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:90:13-50 95 -95-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 +95-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 96 -96-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 -96-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 +96-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 +96-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 97 -97-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 -97-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 +97-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 +97-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 98 -98-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 -98-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 +98-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 +98-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 99 100 101 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 +101-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 102 android:name="android.appwidget.provider" -102-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 +102-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 103 android:resource="@xml/widget_2x_info" /> -103-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 +103-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 104 105 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:101:9-114:20 +105-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:101:9-114:20 106 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -106-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:102:13-57 +106-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:102:13-57 107 android:label="@string/app_widget4x4" > -107-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:103:13-50 +107-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:103:13-50 108 -108-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 +108-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 109 -109-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 -109-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 +109-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 +109-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 110 -110-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 -110-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 +110-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 +110-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 111 -111-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 -111-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 +111-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 +111-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 112 113 114 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 +114-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 115 android:name="android.appwidget.provider" -115-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 +115-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 116 android:resource="@xml/widget_4x_info" /> -116-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 +116-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 117 118 -118-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:116:9-120:20 -118-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:116:19-55 +118-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:116:9-120:20 +118-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:116:19-55 119 -119-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:117:13-119:29 +119-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:117:13-119:29 120 -120-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:118:17-79 -120-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:118:25-76 +120-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:118:17-79 +120-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:118:25-76 121 122 123 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:122:9-125:20 +123-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:122:9-125:20 124 android:name="net.micode.notes.ui.AlarmReceiver" -124-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:123:13-61 +124-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:123:13-61 125 android:process=":remote" > -125-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:124:13-38 +125-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:124:13-38 126 127 128 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:127:9-132:20 +128-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:127:9-132:20 129 android:name="net.micode.notes.ui.AlarmAlertActivity" -129-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:128:13-50 +129-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:128:13-50 130 android:label="@string/app_name" -130-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:129:13-45 +130-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:129:13-45 131 android:launchMode="singleInstance" -131-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:130:13-48 +131-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:130:13-48 132 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -132-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:131:13-75 +132-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:131:13-75 133 134 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:134:9-139:20 +134-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:134:9-139:20 135 android:name="net.micode.notes.ui.NotesPreferenceActivity" -135-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:135:13-71 +135-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:135:13-71 136 android:label="@string/preferences_title" -136-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:136:13-54 +136-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:136:13-54 137 android:launchMode="singleTop" -137-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:137:13-43 +137-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:137:13-43 138 android:theme="@android:style/Theme.Holo.Light" > -138-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:138:13-60 +138-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:138:13-60 139 140 141 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:141:9-144:19 +141-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:141:9-144:19 142 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -142-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:142:13-74 +142-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:142:13-74 143 android:exported="false" > -143-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:143:13-37 +143-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:143:13-37 144 145 146 D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:146:9-148:52 +146-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:146:9-148:52 147 android:name="android.app.default_searchable" -147-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:147:13-58 +147-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:147:13-58 148 android:value=".ui.NoteEditActivity" /> -148-->D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 +148-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 149 150 151 diff --git a/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat index 951dd2f..7c34e58 100644 Binary files a/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and b/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat differ diff --git a/src/note_but_github/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/note_but_github/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat index 17cb018..e25eb7b 100644 Binary files a/src/note_but_github/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and b/src/note_but_github/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat differ diff --git a/src/note_but_github/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/note_but_github/app/build/intermediates/merged_res/debug/values_values.arsc.flat index ea0ebfc..dd7f5ee 100644 Binary files a/src/note_but_github/app/build/intermediates/merged_res/debug/values_values.arsc.flat and b/src/note_but_github/app/build/intermediates/merged_res/debug/values_values.arsc.flat differ diff --git a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json index 29b125a..db82bdb 100644 --- a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json @@ -1,17 +1,17 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rCN_values-zh-rCN.arsc.flat", + "outputFile": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rTW_values-zh-rTW.arsc.flat", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,74 +23,68 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\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", + "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": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "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,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", + "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,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" + "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" } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "outputFile": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values_values.arsc.flat", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-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" + "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:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-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" + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "50,55,64,60,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,4,4,4,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "2112,2322,2704,2539,-1,-1,-1,-1,-1,-1,-1", + "endLines": "53,58,67,62,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "12,12,12,12,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "2314,2531,2910,2696,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -102,13 +96,63 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-merged_res-5:/values_values.arsc.flat", + "map": [ + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", @@ -119,14 +163,30 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "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,2913,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "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,8744,8904,9087,9272,9457,9660,9866,10049,10250" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -136,21 +196,37 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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" + } } ] }, { - "outputFile": "net.micode.notes.app-merged_res-5:/values-zh-rTW_values-zh-rTW.arsc.flat", + "outputFile": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\values-zh-rCN_values-zh-rCN.arsc.flat", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -162,22 +238,22 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", + "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "startOffsets": "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,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", + "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" + "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", + "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" } } ] diff --git a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json index 222603c..2a1cb68 100644 --- a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rCN/values-zh-rCN.xml", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "from": { "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", + "startOffsets": "6653,3566,3499,3425,3374,846,887,936,6195,6241,6598,6547,1225,3938,4007,3878,3812,3748,4682,4621,4557,4141,2937,1398,1452,4196,3640,6299,3314,3097,1836,2123,2374,1890,2876,2822,2770,2571,2522,2426,2475,2618,2666,2167,3254,2717,3141,2079,2326,2269,2213,3041,2034,2998,1941,1983,3194,1346,1657,1755,1609,1707,1561,1515,1173,1119,5064,5004,5207,6120,5523,5453,5588,5667,5852,5778,5140,5397,5265,5331,4954,5957,6041,6508,6399,6350,6445,1288,4085,4497,4797,4738,4865,4448,4402,4353,4301,985,1052", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" + "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json index 59f3c03..33b38b7 100644 --- a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json @@ -4,14 +4,14 @@ "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values-zh-rTW/values-zh-rTW.xml", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "from": { "startLines": "18", "startColumns": "4", - "startOffsets": "712", + "startOffsets": "730", "endLines": "21", "endColumns": "19", - "endOffsets": "817" + "endOffsets": "838" }, "to": { "startLines": "2", @@ -23,14 +23,14 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "from": { "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", + "startOffsets": "6629,3647,3580,3506,3455,846,887,936,6169,6215,6574,6523,1225,3911,3980,3851,3784,3720,4654,4593,4529,4114,3018,1398,1452,4169,1805,6273,3395,3178,1917,2204,2455,1971,2957,2903,2851,2652,2603,2507,2556,2699,2747,2248,3335,2798,3222,2160,2407,2350,2294,3122,2115,3079,2022,2064,3275,1346,1657,1755,1609,1707,1561,1515,1173,1119,5036,4976,5179,6092,5495,5425,5560,5639,5824,5750,5112,5369,5237,5303,4926,5929,6013,6484,6375,6326,6421,1288,4058,4469,4769,4710,4837,4420,4374,4325,4273,985,1052", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" + "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" }, "to": { "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", diff --git a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json index bedb57f..47f4077 100644 --- a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json @@ -1,53 +1,47 @@ { "logs": [ { - "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "outputFile": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-mergeDebugResources-3:\\values\\values.xml", "map": [ { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\strings.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-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" + "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:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-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" + "startLines": "12", + "startColumns": "4", + "startOffsets": "420", + "endColumns": "56", + "endOffsets": "472" } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" + "startLines": "50,55,64,60,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,4,4,4,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "2112,2322,2704,2539,-1,-1,-1,-1,-1,-1,-1", + "endLines": "53,58,67,62,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "12,12,12,12,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "2314,2531,2910,2696,-1,-1,-1,-1,-1,-1,-1" }, "to": { "startLines": "125,129,133,137,140,144,148,152,156,160,164", @@ -59,13 +53,63 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" + }, + "to": { + "startLines": "2,8", + "startColumns": "4,4", + "startOffsets": "105,300", + "endLines": "7,11", + "endColumns": "19,19", + "endOffsets": "295,415" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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" + } + } + ] + }, + { + "outputFile": "net.micode.notes.app-mergeDebugResources-3:/values/values.xml", + "map": [ + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\dimens.xml", + "from": { + "startLines": "-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "13,14,15,16,17", + "startColumns": "4,4,4,4,4", + "startOffsets": "477,529,582,635,687", + "endColumns": "51,52,52,51,51", + "endOffsets": "524,577,630,682,734" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\colors.xml", + "from": { + "startLines": "-1", + "startColumns": "-1", + "startOffsets": "-1" }, "to": { "startLines": "12", @@ -76,14 +120,30 @@ } }, { - "source": "D:\\xueye\\xiaominote\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" + "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,2913,-1,-1,-1,-1,-1,-1,-1,-1" + }, + "to": { + "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "8124,8328,8539,8749,8909,9092,9277,9462,9665,9871,10054", + "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,8744,8904,9087,9272,9457,9660,9866,10049,10250" + } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\arrays.xml", + "from": { + "startLines": "-1,-1", + "startColumns": "-1,-1", + "startOffsets": "-1,-1" }, "to": { "startLines": "2,8", @@ -93,6 +153,22 @@ "endColumns": "19,19", "endOffsets": "295,415" } + }, + { + "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\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" + } } ] } diff --git a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index 2a106a9..e2c84a4 100644 --- a/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/src/note_but_github/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -1,382 +1,386 @@ [ { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_middle.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_options.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_options.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_dropdown_menu.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_bar_bg.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_normal.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_folder.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_white.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/folder_list_item.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_folder.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_folder.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_single.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/selected.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_icon_app.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\icon_app.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_yellow.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/notification.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_down.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_record_folder.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_record_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_pressed.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_blue.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_white.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_yellow.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_item.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_add_account_text.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\add_account_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/sub_folder.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_footer_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_footer_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_footer_bg.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_selected.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\selected.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/settings_header.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/note_edit_color_selector_panel.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_alert.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_alert.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/title_alert.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_2x.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_2x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_red.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_normal.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_normal.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/clock.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_yellow.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_edit.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw/introduction" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_red.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_large.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw-zh-rCN_introduction.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw-zh-rCN\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_middle.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_blue.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_4x_info.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_4x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_up.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_delete.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_red_up.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_blue.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_white.png" + "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", + "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_green.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_search_result.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\search_result.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-7:/drawable/new_note.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_notification.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\notification.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_2x.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_up.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_2x_info.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_yellow.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_yellow.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_record_folder.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_folder_list_item.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\folder_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_white.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_green.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/preferences.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_red_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_red_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/dialog_edit_text.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_dialog_edit_text.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\dialog_edit_text.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_white.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_datetime_picker.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\datetime_picker.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_blue.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_color_btn_mask.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_down.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_delete.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-7:/raw-zh-rCN/introduction" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_sub_folder.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\sub_folder.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_single.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_title_bar_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\title_bar_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_background.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit_list_item.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit_list_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/secondary_text_dark.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_blue.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_blue.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/widget_4x_info.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_note_list_dropdown.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\note_list_dropdown.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_up.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_middle.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_white.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_single.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_yellow.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/search_result.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_up.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_green.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_green.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_4x_green.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_blue.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/widget_4x.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_footer.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_footer.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_green.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_blue.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_blue.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_red.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_white.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_white.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-7:/xml/searchable.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_menu_move.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\menu_move.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_middle.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_primary_text_dark.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\primary_text_dark.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_delete.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_searchable.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\searchable.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_2x_red.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_2x_red.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_down.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_title_red.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_title_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_normal.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_account_dialog_title.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\account_dialog_title.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_yellow_middle.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_red.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_red.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/icon_app.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/dropdown_icon.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_background.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_background.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_btn_set_color.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_white.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_white.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/new_note_normal.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_new_note_pressed.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\new_note_pressed.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_dropdown.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_green_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_green_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit_list_item.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_list_footer.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_clock.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\clock.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/menu_move.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_dropdown_icon.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\dropdown_icon.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/bg_color_btn_mask.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_bg_btn_set_color.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\bg_btn_set_color.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_down.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_widget_4x_green.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\widget_4x_green.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/add_account_text.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_small.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_small.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_size_selector_bg.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/datetime_picker.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_middle.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_super.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_title_red.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_yellow.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_yellow.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_blue.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_widget_4x.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\widget_4x.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_list_options.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_super.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_super.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_blue_single.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_yellow_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_yellow_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/call_note_edit.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_edit_green.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\edit_green.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_single.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_preferences.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\preferences.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_yellow.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_list_dropdown_menu.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_list_dropdown_menu.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/widget_2x_red.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_size_selector_bg.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/delete.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\raw_introduction.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\raw\\introduction" }, { - "merged": "net.micode.notes.app-merged_res-5:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-7:/color/primary_text_dark.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_call_note_edit.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\call_note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/edit_green.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\xml_widget_2x_info.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\xml\\widget_2x_info.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_white_down.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_edit.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_edit.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/menu/note_edit.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_settings_header.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\settings_header.xml" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/font_small.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/account_dialog_title.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_down.9.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/call_record.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_font_large.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\font_large.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-7:/drawable-hdpi/list_green_up.9.png" + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_blue_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_blue_single.9.png" } ] \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/note_but_github/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 9a0c5df..93009bf 100644 Binary files a/src/note_but_github/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/src/note_but_github/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar deleted file mode 100644 index fa87605..0000000 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_9.jar and /dev/null differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex index 046b7e1..c3856e8 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex index 33a1e8e..7b2f04c 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex index edca6c2..e296020 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex index 43fbb95..6750092 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex index c804edb..2f8fc90 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex index 7a975d2..7c79bc6 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex index 8fa92ab..09e3eac 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex index 7484169..f9dde7b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex index aa009a0..df2e041 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex index d8d0af5..d9d7595 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex index 36627fa..e9ff7da 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex index 16a8e64..d6ef43b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex index 7193315..bb6f044 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index 86f7f9f..4499583 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex index c25f01b..d71be81 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex index 6b7472f..eb0a524 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 03b69e1..1c75231 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex index 602aad6..e4b8b14 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index c376710..562e867 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex index bd744fe..4ebe6a1 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex index f2219ba..a2bbfeb 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex index 5ab2e69..deaeed1 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex index 81a3c0e..ea5260d 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex index 1347cdb..1dc4335 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex index 5c48404..4ea6076 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex index de97635..87e3f34 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex index 0baeaaf..3b9e91e 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 0e376bc..392e292 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ea4f037..9fcd0de 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 453765c..d346b76 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex index ab39c99..264937b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index f8c2de3..f69c510 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex index aae067f..79b819a 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex index 2c28295..b27ee9b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex index 61db915..d310007 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex differ diff --git a/src/note_but_github/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/note_but_github/app/build/intermediates/runtime_symbol_list/debug/R.txt index 00d6e91..2927cf5 100644 --- a/src/note_but_github/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ b/src/note_but_github/app/build/intermediates/runtime_symbol_list/debug/R.txt @@ -77,70 +77,71 @@ int drawable widget_4x_yellow 0x7f040041 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 +int id add_img_btn 0x7f050003 +int id amPm 0x7f050004 +int id btn_new_note 0x7f050005 +int id btn_set_bg_color 0x7f050006 +int id cb_edit_item 0x7f050007 +int id date 0x7f050008 +int id delete 0x7f050009 +int id et_edit_text 0x7f05000a +int id et_foler_name 0x7f05000b +int id font_size_selector 0x7f05000c +int id hour 0x7f05000d +int id iv_alert_icon 0x7f05000e +int id iv_bg_blue 0x7f05000f +int id iv_bg_blue_select 0x7f050010 +int id iv_bg_green 0x7f050011 +int id iv_bg_green_select 0x7f050012 +int id iv_bg_red 0x7f050013 +int id iv_bg_red_select 0x7f050014 +int id iv_bg_white 0x7f050015 +int id iv_bg_white_select 0x7f050016 +int id iv_bg_yellow 0x7f050017 +int id iv_bg_yellow_select 0x7f050018 +int id iv_large_select 0x7f050019 +int id iv_medium_select 0x7f05001a +int id iv_small_select 0x7f05001b +int id iv_super_select 0x7f05001c +int id ll_font_large 0x7f05001d +int id ll_font_normal 0x7f05001e +int id ll_font_small 0x7f05001f +int id ll_font_super 0x7f050020 +int id menu_alert 0x7f050021 +int id menu_delete 0x7f050022 +int id menu_delete_remind 0x7f050023 +int id menu_export_text 0x7f050024 +int id menu_font_size 0x7f050025 +int id menu_list_mode 0x7f050026 +int id menu_new_folder 0x7f050027 +int id menu_new_note 0x7f050028 +int id menu_search 0x7f050029 +int id menu_send_to_desktop 0x7f05002a +int id menu_setting 0x7f05002b +int id menu_share 0x7f05002c +int id menu_sync 0x7f05002d +int id minute 0x7f05002e +int id move 0x7f05002f +int id navigation_bar 0x7f050030 +int id note_bg_color_selector 0x7f050031 +int id note_edit_list 0x7f050032 +int id note_edit_view 0x7f050033 +int id note_item 0x7f050034 +int id note_title 0x7f050035 +int id notes_list 0x7f050036 +int id prefenerece_sync_status_textview 0x7f050037 +int id preference_sync_button 0x7f050038 +int id selection_menu 0x7f050039 +int id sv_note_edit 0x7f05003a +int id tv_alert_date 0x7f05003b +int id tv_folder_name 0x7f05003c +int id tv_modified_date 0x7f05003d +int id tv_name 0x7f05003e +int id tv_time 0x7f05003f +int id tv_title 0x7f050040 +int id tv_title_bar 0x7f050041 +int id widget_bg_image 0x7f050042 +int id widget_text 0x7f050043 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 diff --git a/src/note_but_github/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/note_but_github/app/build/intermediates/source_set_path_map/debug/file-map.txt index 3ba8de8..0640c1f 100644 --- a/src/note_but_github/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ b/src/note_but_github/app/build/intermediates/source_set_path_map/debug/file-map.txt @@ -1,8 +1,8 @@ -net.micode.notes.app-pngs-0 D:\xueye\xiaominote\note_but_github\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\xueye\xiaominote\note_but_github\app\build\generated\res\resValues\debug -net.micode.notes.app-rs-2 D:\xueye\xiaominote\note_but_github\app\build\generated\res\rs\debug -net.micode.notes.app-mergeDebugResources-3 D:\xueye\xiaominote\note_but_github\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir -net.micode.notes.app-mergeDebugResources-4 D:\xueye\xiaominote\note_but_github\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir -net.micode.notes.app-merged_res-5 D:\xueye\xiaominote\note_but_github\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-6 D:\xueye\xiaominote\note_but_github\app\src\debug\res -net.micode.notes.app-main-7 D:\xueye\xiaominote\note_but_github\app\src\main\res +net.micode.notes.app-pngs-0 D:\xueye\softproject\gitProject\src\note_but_github\app\build\generated\res\pngs\debug +net.micode.notes.app-resValues-1 D:\xueye\softproject\gitProject\src\note_but_github\app\build\generated\res\resValues\debug +net.micode.notes.app-rs-2 D:\xueye\softproject\gitProject\src\note_but_github\app\build\generated\res\rs\debug +net.micode.notes.app-mergeDebugResources-3 D:\xueye\softproject\gitProject\src\note_but_github\app\build\intermediates\incremental\debug\mergeDebugResources\merged.dir +net.micode.notes.app-mergeDebugResources-4 D:\xueye\softproject\gitProject\src\note_but_github\app\build\intermediates\incremental\debug\mergeDebugResources\stripped.dir +net.micode.notes.app-merged_res-5 D:\xueye\softproject\gitProject\src\note_but_github\app\build\intermediates\merged_res\debug +net.micode.notes.app-debug-6 D:\xueye\softproject\gitProject\src\note_but_github\app\src\debug\res +net.micode.notes.app-main-7 D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\res diff --git a/src/note_but_github/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/note_but_github/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index 4461006..83040b8 100644 --- a/src/note_but_github/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/src/note_but_github/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -81,11 +81,11 @@ 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:id/move = 0x7f05002f +net.micode.notes:id/iv_bg_yellow_select = 0x7f050018 net.micode.notes:menu/call_note_edit = 0x7f070000 net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/iv_bg_blue = 0x7f05000e +net.micode.notes:id/iv_bg_blue = 0x7f05000f net.micode.notes:layout/settings_header = 0x7f06000b net.micode.notes:layout/note_list = 0x7f060008 net.micode.notes:drawable/list_white_single = 0x7f040027 @@ -93,129 +93,128 @@ net.micode.notes:layout/note_item = 0x7f060007 net.micode.notes:xml/widget_2x_info = 0x7f0c0002 net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:id/btn_new_note = 0x7f050004 +net.micode.notes:id/btn_new_note = 0x7f050005 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:id/widget_text = 0x7f050043 +net.micode.notes:id/tv_title_bar = 0x7f050041 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:id/tv_time = 0x7f05003f +net.micode.notes:id/tv_name = 0x7f05003e 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:id/sv_note_edit = 0x7f05003a net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050037 +net.micode.notes:id/preference_sync_button = 0x7f050038 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050035 +net.micode.notes:id/notes_list = 0x7f050036 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:id/note_title = 0x7f050035 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:id/note_edit_view = 0x7f050033 +net.micode.notes:id/navigation_bar = 0x7f050030 net.micode.notes:string/app_widget4x4 = 0x7f0a0006 net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:id/minute = 0x7f05002d +net.micode.notes:id/minute = 0x7f05002e 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:id/menu_sync = 0x7f05002d +net.micode.notes:id/menu_share = 0x7f05002c +net.micode.notes:id/menu_setting = 0x7f05002b 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:id/menu_send_to_desktop = 0x7f05002a +net.micode.notes:id/menu_search = 0x7f050029 net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:id/menu_new_note = 0x7f050027 +net.micode.notes:id/menu_new_note = 0x7f050028 net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/menu_export_text = 0x7f050023 +net.micode.notes:id/menu_new_folder = 0x7f050027 +net.micode.notes:id/menu_list_mode = 0x7f050026 +net.micode.notes:id/iv_medium_select = 0x7f05001a +net.micode.notes:id/menu_export_text = 0x7f050024 net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:id/menu_delete = 0x7f050021 +net.micode.notes:id/menu_delete = 0x7f050022 net.micode.notes:string/ticker_fail = 0x7f0a0061 net.micode.notes:string/file_name_txt_format = 0x7f0a0015 net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050037 net.micode.notes:string/menu_font_size = 0x7f0a0029 net.micode.notes:string/menu_alert = 0x7f0a001f net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:id/menu_alert = 0x7f050020 +net.micode.notes:id/menu_alert = 0x7f050021 net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e +net.micode.notes:id/ll_font_super = 0x7f050020 +net.micode.notes:id/ll_font_small = 0x7f05001f 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/ll_font_normal = 0x7f05001e +net.micode.notes:id/ll_font_large = 0x7f05001d +net.micode.notes:id/note_bg_color_selector = 0x7f050031 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:id/iv_super_select = 0x7f05001c +net.micode.notes:id/iv_bg_yellow = 0x7f050017 net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:id/tv_alert_date = 0x7f05003a +net.micode.notes:id/iv_bg_white_select = 0x7f050016 +net.micode.notes:id/iv_bg_white = 0x7f050015 +net.micode.notes:id/tv_alert_date = 0x7f05003b 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_bg_red = 0x7f050013 net.micode.notes:string/menu_font_large = 0x7f0a0027 net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/widget_bg_image = 0x7f050041 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 +net.micode.notes:id/iv_large_select = 0x7f050019 +net.micode.notes:id/widget_bg_image = 0x7f050042 +net.micode.notes:id/iv_bg_green_select = 0x7f050012 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/iv_bg_blue_select = 0x7f05000f +net.micode.notes:id/iv_bg_blue_select = 0x7f050010 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:id/font_size_selector = 0x7f05000c +net.micode.notes:id/et_edit_text = 0x7f05000a +net.micode.notes:id/et_foler_name = 0x7f05000b 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/cb_edit_item = 0x7f050007 +net.micode.notes:id/btn_set_bg_color = 0x7f050006 net.micode.notes:id/account_dialog_subtitle = 0x7f050000 net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:id/amPm = 0x7f050003 +net.micode.notes:id/iv_bg_green = 0x7f050011 +net.micode.notes:id/amPm = 0x7f050004 net.micode.notes:drawable/widget_4x_green = 0x7f04003e net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:id/hour = 0x7f05000c +net.micode.notes:id/hour = 0x7f05000d net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 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:id/delete = 0x7f050009 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 net.micode.notes:drawable/list_green_single = 0x7f04001f net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003c +net.micode.notes:id/tv_modified_date = 0x7f05003d net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:id/iv_small_select = 0x7f05001a +net.micode.notes:id/iv_small_select = 0x7f05001b net.micode.notes:menu/note_list_options = 0x7f070005 net.micode.notes:xml/searchable = 0x7f0c0001 net.micode.notes:string/menu_folder_delete = 0x7f0a0025 net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:id/date = 0x7f050007 +net.micode.notes:id/date = 0x7f050008 net.micode.notes:drawable/list_yellow_single = 0x7f04002b net.micode.notes:drawable/list_red_up = 0x7f040024 net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:id/tv_folder_name = 0x7f05003b +net.micode.notes:id/tv_folder_name = 0x7f05003c net.micode.notes:drawable/list_yellow_down = 0x7f040029 net.micode.notes:string/format_folder_files_count = 0x7f0a001b net.micode.notes:drawable/clock = 0x7f040003 net.micode.notes:drawable/list_white_up = 0x7f040028 net.micode.notes:drawable/edit_title_blue = 0x7f040009 net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:id/iv_alert_icon = 0x7f05000d +net.micode.notes:id/iv_alert_icon = 0x7f05000e net.micode.notes:layout/dialog_edit_text = 0x7f060003 net.micode.notes:string/preferences_account_title = 0x7f0a0045 net.micode.notes:drawable/edit_white = 0x7f04000e @@ -234,11 +233,10 @@ net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 net.micode.notes:drawable/list_red_single = 0x7f040023 net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:id/menu_delete_remind = 0x7f050022 +net.micode.notes:id/menu_delete_remind = 0x7f050023 net.micode.notes:drawable/list_red_down = 0x7f040021 net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:id/iv_bg_red_select = 0x7f050013 +net.micode.notes:id/iv_bg_red_select = 0x7f050014 net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 net.micode.notes:drawable/list_blue_down = 0x7f040017 @@ -250,24 +248,27 @@ net.micode.notes:array/menu_share_ways = 0x7f010001 net.micode.notes:drawable/widget_2x_white = 0x7f04003b net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f05003f +net.micode.notes:id/tv_title = 0x7f050040 net.micode.notes:color/primary_text_dark = 0x7f020000 net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 net.micode.notes:drawable/list_blue_up = 0x7f04001a net.micode.notes:string/search_setting_description = 0x7f0a0059 net.micode.notes:drawable/list_blue_single = 0x7f040019 net.micode.notes:drawable/font_large = 0x7f040010 +net.micode.notes:id/selection_menu = 0x7f050039 +net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e +net.micode.notes:id/add_img_btn = 0x7f050003 net.micode.notes:drawable/delete = 0x7f040004 net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:id/note_item = 0x7f050033 +net.micode.notes:id/note_item = 0x7f050034 net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:id/note_edit_list = 0x7f050031 +net.micode.notes:id/note_edit_list = 0x7f050032 net.micode.notes:drawable/edit_title_red = 0x7f04000b net.micode.notes:string/menu_delete = 0x7f0a0021 net.micode.notes:drawable/list_folder = 0x7f04001b net.micode.notes:drawable/call_record = 0x7f040002 net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:id/menu_font_size = 0x7f050024 +net.micode.notes:id/menu_font_size = 0x7f050025 net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 net.micode.notes:drawable/list_yellow_up = 0x7f04002c net.micode.notes:dimen/text_font_size_small = 0x7f030003 diff --git a/src/note_but_github/app/build/outputs/apk/debug/app-debug.apk b/src/note_but_github/app/build/outputs/apk/debug/app-debug.apk index 686b4de..e4d245d 100644 Binary files a/src/note_but_github/app/build/outputs/apk/debug/app-debug.apk and b/src/note_but_github/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/src/note_but_github/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/note_but_github/app/build/outputs/logs/manifest-merger-debug-report.txt index c7041c4..0495c5f 100644 --- a/src/note_but_github/app/build/outputs/logs/manifest-merger-debug-report.txt +++ b/src/note_but_github/app/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,235 +1,235 @@ -- Merging decision tree log --- manifest -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-150:12 package - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:19:5-31 + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml android:versionName - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:21:5-30 + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:18:11-69 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:11-69 android:versionCode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:20:5-28 + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml uses-sdk -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 android:targetSdkVersion - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:5-44 + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml android:minSdkVersion - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml - INJECTED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:23:15-41 + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml + INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:25:5-81 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:25:5-81 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:25:22-78 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:25:22-78 uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:26:5-88 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:26:5-88 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:26:22-85 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:26:22-85 uses-permission#android.permission.INTERNET -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:27:5-67 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:27:5-67 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:27:22-64 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:27:22-64 uses-permission#android.permission.READ_CONTACTS -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:28:5-72 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:28:5-72 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:28:22-69 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:28:22-69 uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:29:5-74 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:29:5-74 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:29:22-71 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:29:22-71 uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:30:5-80 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:30:5-80 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:30:22-77 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:30:22-77 uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:31:5-71 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:31:5-71 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:31:22-68 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:31:22-68 uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:32:5-74 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:32:5-74 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:32:22-71 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:32:22-71 uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:33:5-81 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:5-81 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:35:5-149:19 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:35:5-149:19 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:37:9-41 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:37:9-41 android:icon - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:36:9-42 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:36:9-42 activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:38:9-51:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:38:9-51:20 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:41:13-45 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:41:13-45 android:launchMode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:42:13-43 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:42:13-43 android:windowSoftInputMode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:45:13-52 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:45:13-52 android:uiOptions - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:44:13-57 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:44:13-57 android:configChanges - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:40:13-74 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:40:13-74 android:theme - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:43:13-45 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:43:13-45 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:39:13-49 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:39:13-49 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:47:13-50:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:47:13-50:29 action#android.intent.action.MAIN -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:48:17-69 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:48:17-69 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:48:25-66 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:48:25-66 category#android.intent.category.LAUNCHER -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:49:17-77 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:49:17-77 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:49:27-74 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:49:27-74 activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:53:9-81:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:53:9-81:20 android:launchMode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:56:13-43 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:56:13-43 android:configChanges - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:55:13-74 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:55:13-74 android:theme - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:57:13-45 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:57:13-45 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:54:13-48 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:54:13-48 intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:59:13-64:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:59:13-64:29 action#android.intent.action.VIEW -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:60:17-69 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:60:17-69 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:60:25-66 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:60:25-66 category#android.intent.category.DEFAULT -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:17-76 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:61:27-73 data -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:17-78 android:mimeType - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:62:23-75 intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:66:13-71:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:66:13-71:29 action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:67:17-79 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:67:17-79 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:67:25-76 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:67:25-76 intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:73:13-76:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:73:13-76:29 action#android.intent.action.SEARCH -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:74:17-71 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:74:17-71 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:74:25-68 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:74:25-68 meta-data#android.app.searchable -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:78:13-80:54 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:78:13-80:54 android:resource - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:80:17-51 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:80:17-51 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:79:17-54 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:79:17-54 provider#net.micode.notes.data.NotesProvider -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:83:9-86:43 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:83:9-86:43 android:authorities - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:85:13-47 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:85:13-47 android:multiprocess - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:86:13-40 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:86:13-40 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:84:13-63 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:84:13-63 receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:88:9-100:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:88:9-100:20 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:90:13-50 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:90:13-50 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:89:13-57 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:89:13-57 intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:91:13-95:29 action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:17-84 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:92:25-81 action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:17-85 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:93:25-82 action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:17-85 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:94:25-82 meta-data#android.appwidget.provider -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:97:13-99:58 android:resource - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:99:17-55 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:98:17-58 receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:101:9-114:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:101:9-114:20 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:103:13-50 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:103:13-50 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:102:13-57 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:102:13-57 receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:116:9-120:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:116:9-120:20 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:116:19-55 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:116:19-55 intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:117:13-119:29 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:117:13-119:29 action#android.intent.action.BOOT_COMPLETED -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:118:17-79 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:118:17-79 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:118:25-76 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:118:25-76 receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:122:9-125:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:122:9-125:20 android:process - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:124:13-38 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:124:13-38 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:123:13-61 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:123:13-61 activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:127:9-132:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:127:9-132:20 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:129:13-45 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:129:13-45 android:launchMode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:130:13-48 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:130:13-48 android:theme - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:131:13-75 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:131:13-75 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:128:13-50 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:128:13-50 activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:134:9-139:20 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:134:9-139:20 android:label - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:136:13-54 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:136:13-54 android:launchMode - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:137:13-43 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:137:13-43 android:theme - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:138:13-60 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:138:13-60 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:135:13-71 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:135:13-71 service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:141:9-144:19 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:141:9-144:19 android:exported - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:143:13-37 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:143:13-37 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:142:13-74 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:142:13-74 meta-data#android.app.default_searchable -ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:146:9-148:52 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:146:9-148:52 android:value - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 android:name - ADDED from D:\xueye\xiaominote\note_but_github\app\src\main\AndroidManifest.xml:147:13-58 + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/note_but_github/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/note_but_github/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index 472c1e2..1c351a0 100644 Binary files a/src/note_but_github/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/src/note_but_github/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/note_but_github/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/note_but_github/app/src/main/java/net/micode/notes/model/WorkingNote.java index be081e4..a1a2455 100644 --- a/src/note_but_github/app/src/main/java/net/micode/notes/model/WorkingNote.java +++ b/src/note_but_github/app/src/main/java/net/micode/notes/model/WorkingNote.java @@ -38,7 +38,7 @@ public class WorkingNote { // Note Id private long mNoteId; // Note content - private String mContent; + public String mContent; // Note mode private int mMode; diff --git a/src/note_but_github/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/note_but_github/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java index 4ae70ee..0102e82 100644 --- a/src/note_but_github/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/note_but_github/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -22,19 +22,30 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.app.SearchManager; import android.appwidget.AppWidgetManager; +import android.content.ContentResolver; import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Paint; +import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.DocumentsContract; +import android.provider.MediaStore; +import android.text.Editable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.format.DateUtils; import android.text.style.BackgroundColorSpan; +import android.text.style.ImageSpan; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -47,6 +58,7 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.EditText; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -65,6 +77,7 @@ import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; +import java.io.FileNotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -148,7 +161,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; - +/* @Override protected void onCreate(Bundle savedInstanceState) { // 调用父类的onCreate方法,这是Activity生命周期中的第一个方法,用于进行Activity的初始化操作 @@ -164,7 +177,36 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 初始化资源 initResources(); } +*/ + private final int PHOTO_REQUEST=1; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + this.setContentView(R.layout.note_edit); + if (savedInstanceState == null && !initActivityState(getIntent())) { + finish(); + return; + } + initResources(); + //根据id获取添加图片按钮 + final ImageButton add_img_btn = (ImageButton) findViewById(R.id.add_img_btn); + //为点击图片按钮设置监听器 + add_img_btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Log.d(TAG, "onClick: click add image button"); + //ACTION_GET_CONTENT: 允许用户选择特殊种类的数据,并返回(特殊种类的数据:照一张相片或录一段音) + Intent loadImage = new Intent(Intent.ACTION_GET_CONTENT); + //Category属性用于指定当前动作(Action)被执行的环境. + //CATEGORY_OPENABLE; 用来指示一个ACTION_GET_CONTENT的intent + loadImage.addCategory(Intent.CATEGORY_OPENABLE); + loadImage.setType("image/*"); + startActivityForResult(loadImage, PHOTO_REQUEST); + } + }); + } /** * Current activity may be killed when the memory is low. Once it is killed, for another time * user load this activity, we should restore the former state @@ -316,6 +358,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, * is not ready */ showAlertHeader(); + convertToImage(); } private void showAlertHeader() { @@ -335,6 +378,45 @@ public class NoteEditActivity extends Activity implements OnClickListener, }; } + private void convertToImage() { + NoteEditText noteEditText = (NoteEditText) findViewById(R.id.note_edit_view); //获取当前的edit + Editable editable = noteEditText.getText();//1.获取text + String noteText = editable.toString(); //2.将note内容转换为字符串 + int length = editable.length(); //内容的长度 + //3.截取img片段 [local]+uri+[local],提取uri + for(int i = 0; i < length; i++) { + for(int j = i; j < length; j++) { + String img_fragment = noteText.substring(i, j+1); //img_fragment:关于图片路径的片段 + if(img_fragment.length() > 15 && img_fragment.endsWith("[/local]") && img_fragment.startsWith("[local]")){ + int limit = 7; //[local]为7个字符 + //[local][/local]共15个字符,剩下的为真正的path长度 + int len = img_fragment.length()-15; + //从[local]之后的len个字符就是path + String path = img_fragment.substring(limit,limit+len);//获取到了图片路径 + Bitmap bitmap = null; + Log.d(TAG, "图片的路径是:"+path); + try { + bitmap = BitmapFactory.decodeFile(path);//将图片路径解码为图片格式 + } catch (Exception e) { + e.printStackTrace(); + } + if(bitmap!=null){ //若图片存在 + Log.d(TAG, "图片不为null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + //4.创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像 + String ss = "[local]" + path + "[/local]"; + SpannableString spannableString = new SpannableString(ss); + //5.将指定的标记对象附加到文本的开始...结束范围 + spannableString.setSpan(imageSpan, 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Log.d(TAG, "Create spannable string success!"); + Editable edit_text = noteEditText.getEditableText(); + edit_text.delete(i,i+len+15); //6.删掉图片路径的文字 + edit_text.insert(i, spannableString); //7.在路径的起始位置插入图片 + } + } + } + } + } @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -840,6 +922,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mNoteEditor.setText(getHighlightQueryResult(mWorkingNote.getContent(), mUserQuery)); mEditTextList.setVisibility(View.GONE); mNoteEditor.setVisibility(View.VISIBLE); + convertToImage(); } } @@ -931,4 +1014,146 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } + + //获取文件的real path + public String getPath(final Context context, final Uri uri) { + + final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT; + + // DocumentProvider + if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) { + // ExternalStorageProvider +// if (isExternalStorageDocument(uri)) { +// final String docId = DocumentsContract.getDocumentId(uri); +// final String[] split = docId.split(":"); +// final String type = split[0]; +// +// if ("primary".equalsIgnoreCase(type)) { +// return Environment.getExternalStorageDirectory() + "/" + split[1]; +// } +// } +// // DownloadsProvider +// else if (isDownloadsDocument(uri)) { +// final String id = DocumentsContract.getDocumentId(uri); +// final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); +// return getDataColumn(context, contentUri, null, null); +// } + // MediaProvider +// else + if (isMediaDocument(uri)) { + final String docId = DocumentsContract.getDocumentId(uri); + final String[] split = docId.split(":"); + final String type = split[0]; + + Uri contentUri = null; + if ("image".equals(type)) { + contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + final String selection = "_id=?"; + final String[] selectionArgs = new String[]{split[1]}; + + return getDataColumn(context, contentUri, selection, selectionArgs); + } + } + // Media + else if ("content".equalsIgnoreCase(uri.getScheme())) { + return getDataColumn(context, uri, null, null); + } + // File + else if ("file".equalsIgnoreCase(uri.getScheme())) { + return uri.getPath(); + } + return null; + } + + + //获取数据列_获取此 Uri 的数据列的值。这对MediaStore Uris 和其他基于文件的 ContentProvider。 + public String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) { + + Cursor cursor = null; + final String column = "_data"; + final String[] projection = {column}; + + try { + cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null); + if (cursor != null && cursor.moveToFirst()) { + final int column_index = cursor.getColumnIndexOrThrow(column); + return cursor.getString(column_index); + } + } finally { + if (cursor != null) + cursor.close(); + } + return null; + } + + + //是否为外部存储文件 +// public boolean isExternalStorageDocument(Uri uri) { +// return "com.android.externalstorage.documents".equals(uri.getAuthority()); +// } +// +// //是否为下载文件 +// public boolean isDownloadsDocument(Uri uri) { +// return "com.android.providers.downloads.documents".equals(uri.getAuthority()); +// } + + //是否为媒体文件 + public boolean isMediaDocument(Uri uri) { + return "com.android.providers.media.documents".equals(uri.getAuthority()); + } + + protected void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); + ContentResolver resolver = getContentResolver(); + switch (requestCode) { + case PHOTO_REQUEST: + Uri originalUri = intent.getData(); //1.获得图片的真实路径 + Bitmap bitmap = null; + try { + bitmap = BitmapFactory.decodeStream(resolver.openInputStream(originalUri));//2.解码图片 + } catch (FileNotFoundException e) { + Log.d(TAG, "onActivityResult: get file_exception"); + e.printStackTrace(); + } + + if (bitmap != null) { + //3.根据Bitmap对象创建ImageSpan对象 + Log.d(TAG, "onActivityResult: bitmap is not null"); + ImageSpan imageSpan = new ImageSpan(NoteEditActivity.this, bitmap); + String path = getPath(this, originalUri); + //4.使用[local][/local]将path括起来,用于之后方便识别图片路径在note中的位置 + String img_fragment = "[local]" + path + "[/local]"; + //创建一个SpannableString对象,以便插入用ImageSpan对象封装的图像 + SpannableString spannableString = new SpannableString(img_fragment); + spannableString.setSpan(imageSpan, 0, img_fragment.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + //5.将选择的图片追加到EditText中光标所在位置 + NoteEditText e = (NoteEditText) findViewById(R.id.note_edit_view); + int index = e.getSelectionStart(); //获取光标所在位置 + Log.d(TAG, "Index是: " + index); + Editable edit_text = e.getEditableText(); + edit_text.insert(index, spannableString); //将图片插入到光标所在位置 + + mWorkingNote.mContent = e.getText().toString(); + //6.把改动提交到数据库中,两个数据库表都要改的 + ContentResolver contentResolver = getContentResolver(); + ContentValues contentValues = new ContentValues(); + final long id = mWorkingNote.getNoteId(); + contentValues.put("snippet", mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/note"), contentValues, "_id=?", new String[]{"" + id}); + ContentValues contentValues1 = new ContentValues(); + contentValues1.put("content", mWorkingNote.mContent); + contentResolver.update(Uri.parse("content://micode_notes/data"), contentValues1, "mime_type=? and note_id=?", new String[]{"vnd.android.cursor.item/text_note", "" + id}); + + } else { + Toast.makeText(NoteEditActivity.this, "获取图片失败", Toast.LENGTH_SHORT).show(); + } + break; + default: + break; + } + } + // + } diff --git a/src/note_but_github/app/src/main/res/layout/note_edit.xml b/src/note_but_github/app/src/main/res/layout/note_edit.xml index 10b2aa7..8a089b9 100644 --- a/src/note_but_github/app/src/main/res/layout/note_edit.xml +++ b/src/note_but_github/app/src/main/res/layout/note_edit.xml @@ -40,6 +40,7 @@ android:layout_marginRight="8dip" android:textAppearance="@style/TextAppearanceSecondaryItem" /> + - - + + + + + - gone + visible + \ No newline at end of file