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 4f43430..24d0243 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 99ac004..2b22082 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 47f0e86..4ec6819 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 7acfabc..bc77908 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 0c890d7..48a7d30 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 f8544b9..b81220e 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/file-system.probe b/src/note_but_github/.gradle/file-system.probe index c13fe87..17b71e4 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/app/build/intermediates/apk/debug/app-debug.apk b/src/note_but_github/app/build/intermediates/apk/debug/app-debug.apk index 857cb0c..2882aec 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 d077654..1ec30c6 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/dex/debug/mergeDexDebug/classes.dex b/src/note_but_github/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index ca0a3c8..254420d 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 8f1be29..ed08c47 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 389692e..70a4ee8 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,167 @@ -#Sat May 17 22:43:29 CST 2025 +#Mon May 26 08:21:52 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/widget_2x_blue.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_2x_blue.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/list_blue_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_blue_single.9.png.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/font_normal.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_font_normal.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/widget_4x_red.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_4x_red.png.flat +net.micode.notes.app-main-7\:/drawable/list_background.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_background.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/list_yellow_down.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_yellow_down.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_yellow_up.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_yellow_up.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_red_up.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_red_up.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/bg_btn_set_color.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_bg_btn_set_color.png.flat +net.micode.notes.app-main-7\:/drawable/edit_title_red.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_title_red.9.png.flat +net.micode.notes.app-main-7\:/drawable/menu_move.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_menu_move.png.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/list_green_up.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_green_up.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/new_note_pressed.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note_pressed.png.flat +net.micode.notes.app-main-7\:/drawable/list_green_down.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_green_down.9.png.flat +net.micode.notes.app-main-7\:/drawable/recover.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_recover.png.flat +net.micode.notes.app-main-7\:/drawable/dropdown_icon.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_dropdown_icon.9.png.flat +net.micode.notes.app-main-7\:/drawable/font_large.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_font_large.png.flat +net.micode.notes.app-main-7\:/drawable/list_red_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_red_single.9.png.flat +net.micode.notes.app-main-7\:/drawable/deselect_all.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_deselect_all.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\:/drawable/widget_4x_green.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_4x_green.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/list_green_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_green_single.9.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\:/menu/recyclebin_options.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\menu_recyclebin_options.xml.flat +net.micode.notes.app-main-7\:/drawable/title_alert.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_title_alert.png.flat +net.micode.notes.app-main-7\:/drawable/widget_2x_red.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_2x_red.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/notification.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_notification.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/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/list_yellow_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_yellow_single.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_white_single.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_white_single.9.png.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/new_note_normal.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note_normal.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/edit_blue.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_blue.9.png.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/list_blue_down.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_blue_down.9.png.flat +net.micode.notes.app-main-7\:/drawable/widget_2x_green.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_2x_green.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/selected.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_selected.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_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/list_white_middle.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_white_middle.9.png.flat +net.micode.notes.app-main-7\:/drawable/edit_red.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_red.9.png.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/menu_delete.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_menu_delete.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/bg_color_btn_mask.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_bg_color_btn_mask.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/list_blue_up.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_blue_up.9.png.flat +net.micode.notes.app-main-7\:/drawable/edit_title_blue.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_title_blue.9.png.flat +net.micode.notes.app-main-7\:/drawable/font_size_selector_bg.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_font_size_selector_bg.9.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\:/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\:/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/title_bar_bg.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_title_bar_bg.9.png.flat +net.micode.notes.app-main-7\:/drawable/icon_app.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_icon_app.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 +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\:/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/font_super.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_font_super.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/list_blue_middle.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_blue_middle.9.png.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\:/drawable/edit_white.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_white.9.png.flat +net.micode.notes.app-main-7\:/drawable/edit_green.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_green.9.png.flat +net.micode.notes.app-main-7\:/drawable/widget_4x_yellow.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_4x_yellow.png.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/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/widget_2x_yellow.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_2x_yellow.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/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/note_edit_color_selector_panel.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_note_edit_color_selector_panel.png.flat +net.micode.notes.app-main-7\:/drawable/call_record.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_call_record.png.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/list_footer_bg.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_footer_bg.9.png.flat +net.micode.notes.app-main-7\:/layout/recycle_bin.xml=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\layout_recycle_bin.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/edit_yellow.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_yellow.9.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\:/drawable/clock.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_clock.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/search_result.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_search_result.png.flat +net.micode.notes.app-main-7\:/drawable/recycle_list.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_recycle_list.png.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\:/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/edit_title_yellow.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_title_yellow.9.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/list_white_up.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_white_up.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/widget_4x_blue.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_4x_blue.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\:/drawable/widget_2x_white.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_2x_white.png.flat +net.micode.notes.app-main-7\:/drawable/select_all.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_select_all.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\:/drawable/list_red_middle.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_red_middle.9.png.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/edit_title_green.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_title_green.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_white_down.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_white_down.9.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/widget_4x_white.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_widget_4x_white.png.flat +net.micode.notes.app-main-7\:/drawable/list_yellow_middle.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_yellow_middle.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/list_green_middle.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_green_middle.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/edit_title_white.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_edit_title_white.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_folder.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_folder.9.png.flat +net.micode.notes.app-main-7\:/drawable/list_red_down.9.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_list_red_down.9.png.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/font_small.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_font_small.png.flat +net.micode.notes.app-main-7\:/drawable/delete.png=D\:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\build\\intermediates\\merged_res\\debug\\drawable_delete.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/merger.xml b/src/note_but_github/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index a9d6dc7..87dd124 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 @@ -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 + #335b5b5b33sp26sp20sp17sp14spTrash CanNotesNotes 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\" - 短信 邮件 @@ -53,4 +53,4 @@ 郵件 便簽便簽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/packageDebug/tmp/debug/dex-renamer-state.txt b/src/note_but_github/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 044cacf..24d9871 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 @@ -#Sat May 17 22:44:02 CST 2025 +#Mon May 26 08:22:08 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 59f138e..b05dc62 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/NotesProvider.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class index 30e4b94..1f78d33 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/remote/GTaskASyncTask.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class index 763c6c3..7730b56 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class index f105e8c..5d7829c 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.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 52e29bd..e62d53b 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 a4aeb6a..e3f60f6 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/ResourceParser$NoteBgResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class index 29b38b8..16ca0ef 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 30eb9cf..0dc0cc2 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$WidgetBgResources.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class index 8f8ce4f..14b7078 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/ui/AlarmAlertActivity.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class index 1287cf9..a76d68c 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 0784dad..df75a15 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/DateTimePickerDialog.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class index 81d6513..38a0205 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class index 86cabc1..5fb5347 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.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 4ae491d..db1f4ee 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/FoldersListAdapter.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class index 354ae8e..e92b56c 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.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 5c54dbf..109154c 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.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class index 72ee220..1d3f36b 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$1.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index e56515b..e91dff0 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index 4c8e4ce..0c250ec 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index ecd8c01..c22457d 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 677c614..6d13f3a 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index 23339c8..83c7a02 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 76b61b2..73f6545 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 3bf9de1..616449d 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index e86c11d..a3e98d9 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index e0d186b..d0463b5 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index b1e1063..a3994a8 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index b979434..6cd9194 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index e8eaf4b..4af37e9 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index b243892..2cce5c1 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.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 d2777ec..25bfef7 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$NewNoteOnTouchListener.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 08ab9fa..52efe7b 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index ee5b653..eef60cb 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.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 f98920d..8027e8f 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/NotesListItem.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class index 30aebb9..3dbbad1 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$1.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class index 7598ed0..c611ac8 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.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 3b21f15..efd2b98 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 5361b59..3764d5a 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 1ea9c16..fece2ea 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/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class index e33d1c0..f131f5c 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class differ diff --git a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class index e315716..1b35381 100644 Binary files a/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and b/src/note_but_github/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.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 cda9e16..22d594b 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 @@ -55,7 +55,7 @@ 34-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 35 36 D:\xueye\softproject\gitProject\src\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-155:19 37 android:debuggable="true" 38 android:icon="@drawable/icon_app" 38-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:36:9-42 @@ -268,6 +268,14 @@ 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\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 -149 -150 -151 +149 +150 D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:150:9-153:20 +151 android:name="net.micode.notes.ui.TrashFolderActivity" +151-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:151:13-67 +152 android:exported="false" > +152-->D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:152:13-37 +153 +154 +155 +156 diff --git a/src/note_but_github/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/note_but_github/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml index f17b551..576cf5f 100644 --- a/src/note_but_github/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ b/src/note_but_github/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml @@ -146,6 +146,11 @@ + + + \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/src/note_but_github/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml index f17b551..576cf5f 100644 --- a/src/note_but_github/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml +++ b/src/note_but_github/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml @@ -146,6 +146,11 @@ + + + \ No newline at end of file diff --git a/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat index b092461..c90273b 100644 Binary files a/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and b/src/note_but_github/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat differ diff --git a/src/note_but_github/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/note_but_github/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat index c138bc9..7338730 100644 Binary files a/src/note_but_github/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and b/src/note_but_github/app/build/intermediates/merged_res/debug/menu_note_list.xml.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 dd7f5ee..1dc58ee 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 db82bdb..3785d23 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 @@ -79,20 +79,17 @@ { "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "132,136,140,144,147,151,155,159,163,167,171", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8539,8743,8954,9164,9324,9507,9692,9877,10080,10286,10469", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8738,8949,9159,9319,9502,9687,9872,10075,10281,10464,10665" } }, { @@ -114,17 +111,20 @@ { "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" + "startLines": "135,-1,-1,-1,23,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8558,-1,-1,-1,1104,1031,-1,-1,-1,-1,-1,-1,-1,-1,-1,954,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,899,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "139,-1,-1,-1,23,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,77,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,75,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8966,-1,-1,-1,1177,1098,-1,-1,-1,-1,-1,-1,-1,-1,-1,1025,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,948,-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" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1445,1517,1586,1629,1681,1733,1782,1845,1903,1954,2038,2114,2208,2316,2387,2471,2554,2620,2703,2805,2866,2928,2979,3057,3110,3170,3275,3334,3436,3491,3562,3611,3669,3716,3775,3832,3903,3964,4021,4071,4123,4176,4226,4276,4336,4389,4455,4517,4580,4627,4682,4770,4828,4890,4940,4985,5028,5088,5155,5207,5262,5317,5370,5417,5470,5526,5574,5629,5682,5766,5833,5897,5993,6067,6148,6237,6400,6544,6623,6698,6780,6839,6919,6999,7054,7176,7279,7323,7362,7416,7457,7510,7567,7641,7706,7774,7860,7940,8009,8103,8162,8217,8279,8339,8449", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,77,71,68,42,51,51,48,62,57,50,83,75,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,51,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,43,38,53,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1440,1512,1581,1624,1676,1728,1777,1840,1898,1949,2033,2109,2203,2311,2382,2466,2549,2615,2698,2800,2861,2923,2974,3052,3105,3165,3270,3329,3431,3486,3557,3606,3664,3711,3770,3827,3898,3959,4016,4066,4118,4171,4221,4271,4331,4384,4450,4512,4575,4622,4677,4765,4823,4885,4935,4980,5023,5083,5150,5202,5257,5312,5365,5412,5465,5521,5569,5624,5677,5761,5828,5892,5988,6062,6143,6232,6395,6539,6618,6693,6775,6834,6914,6994,7049,7171,7274,7318,7357,7411,7452,7505,7562,7636,7701,7769,7855,7935,8004,8098,8157,8212,8274,8334,8444,8534" } } ] @@ -165,20 +165,17 @@ { "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2913,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "132,136,140,144,147,151,155,159,163,167,171", "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", + "startOffsets": "8536,8740,8951,9161,9321,9504,9689,9874,10077,10283,10466", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" + "endOffsets": "8735,8946,9156,9316,9499,9684,9869,10072,10278,10461,10662" } }, { @@ -200,17 +197,20 @@ { "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" + "startLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8555,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8963,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,890,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1445,1517,1586,1629,1681,1733,1782,1845,1903,1954,2038,2114,2208,2316,2387,2471,2554,2620,2703,2805,2866,2928,2979,3057,3110,3170,3275,3334,3436,3491,3562,3611,3669,3716,3775,3832,3903,3964,4021,4071,4123,4176,4226,4276,4336,4389,4455,4517,4580,4627,4682,4770,4828,4890,4940,4985,5028,5088,5155,5204,5259,5314,5367,5414,5467,5523,5571,5626,5679,5763,5830,5894,5990,6064,6145,6234,6397,6541,6620,6695,6777,6836,6916,6996,7051,7173,7276,7320,7359,7413,7454,7507,7564,7638,7703,7771,7857,7937,8006,8100,8159,8214,8276,8336,8446", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,77,71,68,42,51,51,48,62,57,50,83,75,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,48,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,43,38,53,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1440,1512,1581,1624,1676,1728,1777,1840,1898,1949,2033,2109,2203,2311,2382,2466,2549,2615,2698,2800,2861,2923,2974,3052,3105,3165,3270,3329,3431,3486,3557,3606,3664,3711,3770,3827,3898,3959,4016,4066,4118,4171,4221,4271,4331,4384,4450,4512,4575,4622,4677,4765,4823,4885,4935,4980,5023,5083,5150,5199,5254,5309,5362,5409,5462,5518,5566,5621,5674,5758,5825,5889,5985,6059,6140,6229,6392,6536,6615,6690,6772,6831,6911,6991,7046,7168,7271,7315,7354,7408,7449,7502,7559,7633,7698,7766,7852,7932,8001,8095,8154,8209,8271,8331,8441,8531" } } ] 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 47f4077..cf155a9 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 @@ -36,20 +36,17 @@ { "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "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" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "132,136,140,144,147,151,155,159,163,167,171", "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", + "startOffsets": "8539,8743,8954,9164,9324,9507,9692,9877,10080,10286,10469", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" + "endOffsets": "8738,8949,9159,9319,9502,9687,9872,10075,10281,10464,10665" } }, { @@ -71,17 +68,20 @@ { "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" + "startLines": "135,-1,-1,-1,23,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,4,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8558,-1,-1,-1,1104,1031,-1,-1,-1,-1,-1,-1,-1,-1,-1,954,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,899,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "139,-1,-1,-1,23,22,-1,-1,-1,-1,-1,-1,-1,-1,-1,21,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,20,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,77,71,-1,-1,-1,-1,-1,-1,-1,-1,-1,75,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,53,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8966,-1,-1,-1,1177,1098,-1,-1,-1,-1,-1,-1,-1,-1,-1,1025,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,948,-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" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1445,1517,1586,1629,1681,1733,1782,1845,1903,1954,2038,2114,2208,2316,2387,2471,2554,2620,2703,2805,2866,2928,2979,3057,3110,3170,3275,3334,3436,3491,3562,3611,3669,3716,3775,3832,3903,3964,4021,4071,4123,4176,4226,4276,4336,4389,4455,4517,4580,4627,4682,4770,4828,4890,4940,4985,5028,5088,5155,5207,5262,5317,5370,5417,5470,5526,5574,5629,5682,5766,5833,5897,5993,6067,6148,6237,6400,6544,6623,6698,6780,6839,6919,6999,7054,7176,7279,7323,7362,7416,7457,7510,7567,7641,7706,7774,7860,7940,8009,8103,8162,8217,8279,8339,8449", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,77,71,68,42,51,51,48,62,57,50,83,75,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,51,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,43,38,53,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1440,1512,1581,1624,1676,1728,1777,1840,1898,1949,2033,2109,2203,2311,2382,2466,2549,2615,2698,2800,2861,2923,2974,3052,3105,3165,3270,3329,3431,3486,3557,3606,3664,3711,3770,3827,3898,3959,4016,4066,4118,4171,4221,4271,4331,4384,4450,4512,4575,4622,4677,4765,4823,4885,4935,4980,5023,5083,5150,5202,5257,5312,5365,5412,5465,5521,5569,5624,5677,5761,5828,5892,5988,6062,6143,6232,6395,6539,6618,6693,6775,6834,6914,6994,7049,7171,7274,7318,7357,7411,7452,7505,7562,7636,7701,7769,7855,7935,8004,8098,8157,8212,8274,8334,8444,8534" } } ] @@ -122,20 +122,17 @@ { "source": "D:\\xueye\\softproject\\gitProject\\src\\note_but_github\\app\\src\\main\\res\\values\\styles.xml", "from": { - "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", - "startColumns": "-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1", - "startOffsets": "-1,-1,2704,-1,-1,-1,-1,-1,-1,-1,-1", - "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", - "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", - "endOffsets": "-1,-1,2913,-1,-1,-1,-1,-1,-1,-1,-1" + "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" }, "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", + "startLines": "132,136,140,144,147,151,155,159,163,167,171", "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", + "startOffsets": "8536,8740,8951,9161,9321,9504,9689,9874,10077,10283,10466", + "endLines": "135,139,143,146,150,154,158,162,166,170,174", "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" + "endOffsets": "8735,8946,9156,9316,9499,9684,9869,10072,10278,10461,10662" } }, { @@ -157,17 +154,20 @@ { "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" + "startLines": "135,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startColumns": "4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "startOffsets": "8555,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,846,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endLines": "139,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,19,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endColumns": "14,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,48,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", + "endOffsets": "8963,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,890,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-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" + "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", + "startOffsets": "739,1092,1188,1271,1367,1445,1517,1586,1629,1681,1733,1782,1845,1903,1954,2038,2114,2208,2316,2387,2471,2554,2620,2703,2805,2866,2928,2979,3057,3110,3170,3275,3334,3436,3491,3562,3611,3669,3716,3775,3832,3903,3964,4021,4071,4123,4176,4226,4276,4336,4389,4455,4517,4580,4627,4682,4770,4828,4890,4940,4985,5028,5088,5155,5204,5259,5314,5367,5414,5467,5523,5571,5626,5679,5763,5830,5894,5990,6064,6145,6234,6397,6541,6620,6695,6777,6836,6916,6996,7051,7173,7276,7320,7359,7413,7454,7507,7564,7638,7703,7771,7857,7937,8006,8100,8159,8214,8276,8336,8446", + "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131", + "endColumns": "14,95,82,95,77,71,68,42,51,51,48,62,57,50,83,75,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,48,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,43,38,53,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", + "endOffsets": "1087,1183,1266,1362,1440,1512,1581,1624,1676,1728,1777,1840,1898,1949,2033,2109,2203,2311,2382,2466,2549,2615,2698,2800,2861,2923,2974,3052,3105,3165,3270,3329,3431,3486,3557,3606,3664,3711,3770,3827,3898,3959,4016,4066,4118,4171,4221,4271,4331,4384,4450,4512,4575,4622,4677,4765,4823,4885,4935,4980,5023,5083,5150,5199,5254,5309,5362,5409,5462,5518,5566,5621,5674,5758,5825,5889,5985,6059,6140,6229,6392,6536,6615,6690,6772,6831,6911,6991,7046,7168,7271,7315,7354,7408,7449,7502,7559,7633,7698,7766,7852,7932,8001,8095,8154,8209,8271,8331,8441,8531" } } ] 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 e2c84a4..3eb51b2 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,4 +1,8 @@ [ + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_call_record.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\call_record.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" @@ -7,14 +11,42 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_yellow_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_yellow_up.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_green_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_green_single.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_white.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_white.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_menu_delete.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\menu_delete.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\menu_recyclebin_options.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\menu\\recyclebin_options.xml" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_blue_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_blue_middle.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_notification.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\notification.png" + }, { "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" @@ -23,6 +55,10 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_white_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_white_middle.9.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" @@ -35,10 +71,22 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_2x_blue.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_2x_blue.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_bg_color_btn_mask.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\bg_color_btn_mask.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note_pressed.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\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" @@ -55,10 +103,18 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_deselect_all.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\deselect_all.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_select_all.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\select_all.png" + }, { "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" @@ -91,6 +147,14 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_2x_red.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_2x_red.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_blue_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_blue_up.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" @@ -108,17 +172,21 @@ "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\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:\\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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_delete.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\delete.png" }, { - "merged": "net.micode.notes.app-merged_res-5:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-7:/layout/note_edit.xml" + "merged": "C:\\Users\\夜凌鹰劫\\.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": "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_folder.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_folder.9.png" + }, { "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" @@ -135,6 +203,10 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_bg_btn_set_color.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\bg_btn_set_color.png" + }, { "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" @@ -151,14 +223,30 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_clock.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\clock.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_green.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_green.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_4x_red.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_4x_red.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_selected.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\selected.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" @@ -167,6 +255,14 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_font_size_selector_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\font_size_selector_bg.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_dropdown_icon.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\dropdown_icon.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" @@ -175,14 +271,46 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_red_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_red_down.9.png" + }, { "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_2x_green.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_2x_green.png" + }, { "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_title_alert.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\title_alert.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_recycle_bin.xml.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\recycle_bin.xml" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_2x_yellow.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_2x_yellow.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_note_edit_color_selector_panel.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\note_edit_color_selector_panel.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_title_white.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_title_white.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_title_bar_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\title_bar_bg.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" @@ -203,6 +331,14 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_blue_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_blue_single.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_green_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_green_down.9.png" + }, { "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" @@ -223,6 +359,10 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_green_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_green_up.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" @@ -231,18 +371,42 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_yellow.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_yellow.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_2x_white.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_2x_white.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_title_green.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_title_green.9.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_yellow_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_yellow_middle.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_search_result.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\search_result.png" + }, { "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_red.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_red.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" @@ -255,10 +419,26 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_recover.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\recover.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_footer_bg.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_footer_bg.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_menu_move.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\menu_move.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_4x_yellow.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_4x_yellow.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" @@ -267,6 +447,14 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_white_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_white_down.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_4x_blue.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_4x_blue.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" @@ -275,10 +463,22 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_red_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_red_single.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_font_small.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\font_small.png" + }, { "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_white_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_white_single.9.png" + }, { "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" @@ -291,10 +491,26 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_green_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_green_middle.9.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_font_super.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\font_super.png" + }, + { + "merged": "net.micode.notes.app-merged_res-5:/menu_recyclebin_options.xml.flat", + "source": "net.micode.notes.app-main-7:/menu/recyclebin_options.xml" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_icon_app.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\icon_app.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" @@ -315,6 +531,14 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_recycle_list.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\recycle_list.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_blue.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_blue.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" @@ -335,14 +559,26 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_red_middle.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_red_middle.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_title_yellow.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_title_yellow.9.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_font_normal.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\font_normal.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" @@ -351,34 +587,82 @@ "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_4x_green.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_4x_green.png" + }, { "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": "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_title_red.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_title_red.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": "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": "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": "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": "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_edit_title_blue.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\edit_title_blue.9.png" + }, { "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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_blue_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_blue_down.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_widget_4x_white.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\widget_4x_white.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": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_new_note_normal.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\new_note_normal.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_red_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_red_up.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_yellow_single.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_yellow_single.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_background.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_background.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_yellow_down.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_yellow_down.9.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_font_large.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\font_large.png" + }, + { + "merged": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_list_white_up.9.png.flat", + "source": "C:\\Users\\夜凌鹰劫\\.gradle\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\list_white_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" diff --git a/src/note_but_github/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/src/note_but_github/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml index f17b551..576cf5f 100644 --- a/src/note_but_github/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml +++ b/src/note_but_github/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml @@ -146,6 +146,11 @@ + + + \ 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 93009bf..1a028ee 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/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 7b2f04c..1356d73 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/remote/GTaskASyncTask.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex index f6c6327..a797880 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex index 3f534f4..1742a7a 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.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 e9ff7da..9530dd6 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 d6ef43b..bae658c 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/ResourceParser$NoteBgResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex index 4499583..df0e527 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 d71be81..c9c5e67 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$WidgetBgResources.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex index 1c75231..165c86b 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/ui/AlarmAlertActivity.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex index 562e867..59df28c 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 4ebe6a1..f0ad7fa 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/DateTimePickerDialog.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex index 1fb0182..af6aac7 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex index 6c5293d..8d025fb 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.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 a2bbfeb..fe76adb 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/FoldersListAdapter.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex index c64b75d..21cae92 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.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 87e3f34..5575ec8 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.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex index 392e292..66180a3 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$1.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 1a58301..047e981 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index 5075cad..c0d9f61 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 1d976ee..8da77c6 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index dd5898a..bb94760 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index 479cbac..48800b8 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 4e2ed40..38ceb40 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 18d0339..c9ceefa 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index 682a057..fdab09c 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 00c49f2..902c2b6 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index c94c6ce..ea56e04 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index 600d8fb..ca32d6d 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index 4c8920b..4c5708b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 9dee3c8..21c3498 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.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 9fcd0de..ce8b075 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$NewNoteOnTouchListener.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index 768eac9..6e956e0 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index a0b33a7..9b1f407 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.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 d346b76..92d967c 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/NotesListItem.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex index f69c510..14c3a9e 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$1.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex index 3884261..a6e9ac5 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.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 79b819a..0e99a72 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 b27ee9b..b7cb1d9 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 d310007..19049a1 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/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex index c8c3677..dee886b 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex differ diff --git a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex index affae58..c2d3984 100644 Binary files a/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and b/src/note_but_github/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.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 2927cf5..48cc5bf 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 @@ -13,67 +13,70 @@ int drawable bg_color_btn_mask 0x7f040001 int drawable call_record 0x7f040002 int drawable clock 0x7f040003 int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 +int drawable deselect_all 0x7f040005 +int drawable dropdown_icon 0x7f040006 +int drawable edit_blue 0x7f040007 +int drawable edit_green 0x7f040008 +int drawable edit_red 0x7f040009 +int drawable edit_title_blue 0x7f04000a +int drawable edit_title_green 0x7f04000b +int drawable edit_title_red 0x7f04000c +int drawable edit_title_white 0x7f04000d +int drawable edit_title_yellow 0x7f04000e +int drawable edit_white 0x7f04000f +int drawable edit_yellow 0x7f040010 +int drawable font_large 0x7f040011 +int drawable font_normal 0x7f040012 +int drawable font_size_selector_bg 0x7f040013 +int drawable font_small 0x7f040014 +int drawable font_super 0x7f040015 +int drawable icon_app 0x7f040016 +int drawable list_background 0x7f040017 +int drawable list_blue_down 0x7f040018 +int drawable list_blue_middle 0x7f040019 +int drawable list_blue_single 0x7f04001a +int drawable list_blue_up 0x7f04001b +int drawable list_folder 0x7f04001c +int drawable list_footer_bg 0x7f04001d +int drawable list_green_down 0x7f04001e +int drawable list_green_middle 0x7f04001f +int drawable list_green_single 0x7f040020 +int drawable list_green_up 0x7f040021 +int drawable list_red_down 0x7f040022 +int drawable list_red_middle 0x7f040023 +int drawable list_red_single 0x7f040024 +int drawable list_red_up 0x7f040025 +int drawable list_white_down 0x7f040026 +int drawable list_white_middle 0x7f040027 +int drawable list_white_single 0x7f040028 +int drawable list_white_up 0x7f040029 +int drawable list_yellow_down 0x7f04002a +int drawable list_yellow_middle 0x7f04002b +int drawable list_yellow_single 0x7f04002c +int drawable list_yellow_up 0x7f04002d +int drawable menu_delete 0x7f04002e +int drawable menu_move 0x7f04002f +int drawable new_note 0x7f040030 +int drawable new_note_normal 0x7f040031 +int drawable new_note_pressed 0x7f040032 +int drawable note_edit_color_selector_panel 0x7f040033 +int drawable notification 0x7f040034 +int drawable recover 0x7f040035 +int drawable search_result 0x7f040036 +int drawable select_all 0x7f040037 +int drawable selected 0x7f040038 +int drawable title_alert 0x7f040039 +int drawable title_bar_bg 0x7f04003a +int drawable widget_2x_blue 0x7f04003b +int drawable widget_2x_green 0x7f04003c +int drawable widget_2x_red 0x7f04003d +int drawable widget_2x_white 0x7f04003e +int drawable widget_2x_yellow 0x7f04003f +int drawable widget_4x_blue 0x7f040040 +int drawable widget_4x_green 0x7f040041 +int drawable widget_4x_red 0x7f040042 +int drawable widget_4x_white 0x7f040043 +int drawable widget_4x_yellow 0x7f040044 int id account_dialog_subtitle 0x7f050000 int id account_dialog_title 0x7f050001 int id action_select_all 0x7f050002 @@ -120,28 +123,33 @@ 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 id menu_trash 0x7f05002e +int id minute 0x7f05002f +int id move 0x7f050030 +int id navigation_bar 0x7f050031 +int id note_bg_color_selector 0x7f050032 +int id note_edit_list 0x7f050033 +int id note_edit_view 0x7f050034 +int id note_item 0x7f050035 +int id note_title 0x7f050036 +int id notes_list 0x7f050037 +int id prefenerece_sync_status_textview 0x7f050038 +int id preference_sync_button 0x7f050039 +int id realdelete 0x7f05003a +int id recover 0x7f05003b +int id recycle_bin 0x7f05003c +int id select_all 0x7f05003d +int id selection_menu 0x7f05003e +int id sv_note_edit 0x7f05003f +int id tv_alert_date 0x7f050040 +int id tv_folder_name 0x7f050041 +int id tv_modified_date 0x7f050042 +int id tv_name 0x7f050043 +int id tv_time 0x7f050044 +int id tv_title 0x7f050045 +int id tv_title_bar 0x7f050046 +int id widget_bg_image 0x7f050047 +int id widget_text 0x7f050048 int layout account_dialog_title 0x7f060000 int layout add_account_text 0x7f060001 int layout datetime_picker 0x7f060002 @@ -153,120 +161,129 @@ int layout note_item 0x7f060007 int layout note_list 0x7f060008 int layout note_list_dropdown_menu 0x7f060009 int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d +int layout recycle_bin 0x7f06000b +int layout settings_header 0x7f06000c +int layout widget_2x 0x7f06000d +int layout widget_4x 0x7f06000e int menu call_note_edit 0x7f070000 int menu call_record_folder 0x7f070001 int menu note_edit 0x7f070002 int menu note_list 0x7f070003 int menu note_list_dropdown 0x7f070004 int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 +int menu recyclebin_options 0x7f070006 +int menu sub_folder 0x7f070007 int plurals search_results_title 0x7f080000 int raw introduction 0x7f090000 int string alert_message_delete_folder 0x7f0a0000 int string alert_message_delete_note 0x7f0a0001 int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 +int string alert_message_realdelete 0x7f0a0003 +int string alert_message_recover 0x7f0a0004 +int string alert_title_delete 0x7f0a0005 +int string app_name 0x7f0a0006 +int string app_widget2x2 0x7f0a0007 +int string app_widget4x4 0x7f0a0008 +int string button_delete 0x7f0a0009 +int string call_record_folder_name 0x7f0a000a +int string datetime_dialog_cancel 0x7f0a000b +int string datetime_dialog_ok 0x7f0a000c +int string delete_remind_time_message 0x7f0a000d +int string error_delete_or_recover 0x7f0a000e +int string error_note_empty_for_clock 0x7f0a000f +int string error_note_empty_for_send_to_desktop 0x7f0a0010 +int string error_note_not_exist 0x7f0a0011 +int string error_sdcard_export 0x7f0a0012 +int string error_sdcard_unmounted 0x7f0a0013 +int string error_sync_cancelled 0x7f0a0014 +int string error_sync_internal 0x7f0a0015 +int string error_sync_network 0x7f0a0016 +int string failed_sdcard_export 0x7f0a0017 +int string file_name_txt_format 0x7f0a0018 +int string file_path 0x7f0a0019 +int string folder_exist 0x7f0a001a +int string format_date_ymd 0x7f0a001b +int string format_datetime_mdhm 0x7f0a001c +int string format_exported_file_location 0x7f0a001d +int string format_folder_files_count 0x7f0a001e +int string format_move_notes_to_folder 0x7f0a001f +int string hint_foler_name 0x7f0a0020 +int string info_note_enter_desktop 0x7f0a0021 +int string menu_alert 0x7f0a0022 +int string menu_create_folder 0x7f0a0023 +int string menu_delete 0x7f0a0024 +int string menu_deselect_all 0x7f0a0025 +int string menu_export_text 0x7f0a0026 +int string menu_folder_change_name 0x7f0a0027 +int string menu_folder_delete 0x7f0a0028 +int string menu_folder_view 0x7f0a0029 +int string menu_font_large 0x7f0a002a +int string menu_font_normal 0x7f0a002b +int string menu_font_size 0x7f0a002c +int string menu_font_small 0x7f0a002d +int string menu_font_super 0x7f0a002e +int string menu_list_mode 0x7f0a002f +int string menu_move 0x7f0a0030 +int string menu_move_parent_folder 0x7f0a0031 +int string menu_normal_mode 0x7f0a0032 +int string menu_remove_remind 0x7f0a0033 +int string menu_search 0x7f0a0034 +int string menu_select_all 0x7f0a0035 +int string menu_select_none 0x7f0a0036 +int string menu_select_title 0x7f0a0037 +int string menu_send_to_desktop 0x7f0a0038 +int string menu_setting 0x7f0a0039 +int string menu_share 0x7f0a003a +int string menu_sync 0x7f0a003b +int string menu_sync_cancel 0x7f0a003c +int string menu_title_select_folder 0x7f0a003d +int string menu_trash 0x7f0a003e +int string note_alert_expired 0x7f0a003f +int string note_link_email 0x7f0a0040 +int string note_link_other 0x7f0a0041 +int string note_link_tel 0x7f0a0042 +int string note_link_web 0x7f0a0043 +int string notealert_enter 0x7f0a0044 +int string notealert_ok 0x7f0a0045 +int string notelist_menu_new 0x7f0a0046 +int string notelist_string_info 0x7f0a0047 +int string preferences_account_summary 0x7f0a0048 +int string preferences_account_title 0x7f0a0049 +int string preferences_add_account 0x7f0a004a +int string preferences_bg_random_appear_title 0x7f0a004b +int string preferences_button_sync_cancel 0x7f0a004c +int string preferences_button_sync_immediately 0x7f0a004d +int string preferences_dialog_change_account_title 0x7f0a004e +int string preferences_dialog_change_account_warn_msg 0x7f0a004f +int string preferences_dialog_select_account_tips 0x7f0a0050 +int string preferences_dialog_select_account_title 0x7f0a0051 +int string preferences_last_sync_time 0x7f0a0052 +int string preferences_last_sync_time_format 0x7f0a0053 +int string preferences_menu_cancel 0x7f0a0054 +int string preferences_menu_change_account 0x7f0a0055 +int string preferences_menu_remove_account 0x7f0a0056 +int string preferences_title 0x7f0a0057 +int string preferences_toast_cannot_change_account 0x7f0a0058 +int string preferences_toast_success_set_accout 0x7f0a0059 +int string realdelete 0x7f0a005a +int string recover 0x7f0a005b +int string recycle_list 0x7f0a005c +int string search 0x7f0a005d +int string search_hint 0x7f0a005e +int string search_label 0x7f0a005f +int string search_setting_description 0x7f0a0060 +int string set_remind_time_message 0x7f0a0061 +int string success_sdcard_export 0x7f0a0062 +int string success_sync_account 0x7f0a0063 +int string sync_progress_init_list 0x7f0a0064 +int string sync_progress_login 0x7f0a0065 +int string sync_progress_syncing 0x7f0a0066 +int string ticker_cancel 0x7f0a0067 +int string ticker_fail 0x7f0a0068 +int string ticker_success 0x7f0a0069 +int string ticker_syncing 0x7f0a006a +int string widget_havenot_content 0x7f0a006b +int string widget_under_visit_mode 0x7f0a006c int style HighlightTextAppearancePrimary 0x7f0b0000 int style HighlightTextAppearanceSecondary 0x7f0b0001 int style NoteActionBarStyle 0x7f0b0002 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 83040b8..4f71953 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 @@ -4,175 +4,184 @@ net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:string/ticker_success = 0x7f0a0062 +net.micode.notes:string/widget_havenot_content = 0x7f0a006b +net.micode.notes:string/ticker_syncing = 0x7f0a006a +net.micode.notes:string/ticker_success = 0x7f0a0069 net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 +net.micode.notes:string/ticker_cancel = 0x7f0a0067 +net.micode.notes:string/sync_progress_syncing = 0x7f0a0066 +net.micode.notes:string/sync_progress_init_list = 0x7f0a0064 +net.micode.notes:string/search_label = 0x7f0a005f +net.micode.notes:string/recover = 0x7f0a005b +net.micode.notes:string/realdelete = 0x7f0a005a +net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0059 +net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0058 +net.micode.notes:string/preferences_title = 0x7f0a0057 +net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0056 net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_select_title = 0x7f0a0034 +net.micode.notes:string/preferences_menu_change_account = 0x7f0a0055 +net.micode.notes:string/preferences_last_sync_time = 0x7f0a0052 +net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a0051 +net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004f +net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a004d +net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a004c +net.micode.notes:string/preferences_account_summary = 0x7f0a0048 +net.micode.notes:string/success_sdcard_export = 0x7f0a0062 +net.micode.notes:string/notelist_string_info = 0x7f0a0047 +net.micode.notes:string/notelist_menu_new = 0x7f0a0046 +net.micode.notes:string/notealert_ok = 0x7f0a0045 +net.micode.notes:string/notealert_enter = 0x7f0a0044 +net.micode.notes:string/note_link_web = 0x7f0a0043 +net.micode.notes:string/note_link_tel = 0x7f0a0042 +net.micode.notes:string/note_link_other = 0x7f0a0041 +net.micode.notes:string/note_link_email = 0x7f0a0040 +net.micode.notes:string/note_alert_expired = 0x7f0a003f +net.micode.notes:string/menu_sync_cancel = 0x7f0a003c +net.micode.notes:string/menu_sync = 0x7f0a003b +net.micode.notes:string/menu_share = 0x7f0a003a +net.micode.notes:string/menu_select_title = 0x7f0a0037 net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 +net.micode.notes:string/menu_select_none = 0x7f0a0036 +net.micode.notes:string/menu_title_select_folder = 0x7f0a003d +net.micode.notes:string/menu_select_all = 0x7f0a0035 +net.micode.notes:string/menu_search = 0x7f0a0034 +net.micode.notes:string/menu_remove_remind = 0x7f0a0033 +net.micode.notes:string/menu_normal_mode = 0x7f0a0032 +net.micode.notes:string/menu_move_parent_folder = 0x7f0a0031 +net.micode.notes:string/menu_move = 0x7f0a0030 +net.micode.notes:string/menu_list_mode = 0x7f0a002f +net.micode.notes:string/menu_font_super = 0x7f0a002e +net.micode.notes:string/menu_font_small = 0x7f0a002d +net.micode.notes:string/menu_folder_change_name = 0x7f0a0027 +net.micode.notes:string/menu_export_text = 0x7f0a0026 +net.micode.notes:string/menu_deselect_all = 0x7f0a0025 +net.micode.notes:string/menu_create_folder = 0x7f0a0023 +net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001f +net.micode.notes:string/format_folder_files_count = 0x7f0a001e +net.micode.notes:string/format_datetime_mdhm = 0x7f0a001c +net.micode.notes:string/format_date_ymd = 0x7f0a001b net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:string/button_delete = 0x7f0a0007 -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a +net.micode.notes:string/hint_foler_name = 0x7f0a0020 +net.micode.notes:string/folder_exist = 0x7f0a001a +net.micode.notes:string/file_path = 0x7f0a0019 +net.micode.notes:string/ticker_fail = 0x7f0a0068 +net.micode.notes:string/file_name_txt_format = 0x7f0a0018 +net.micode.notes:string/failed_sdcard_export = 0x7f0a0017 +net.micode.notes:string/set_remind_time_message = 0x7f0a0061 +net.micode.notes:string/error_sync_network = 0x7f0a0016 +net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0013 +net.micode.notes:string/datetime_dialog_ok = 0x7f0a000c +net.micode.notes:string/datetime_dialog_cancel = 0x7f0a000b +net.micode.notes:drawable/list_green_up = 0x7f040021 +net.micode.notes:string/call_record_folder_name = 0x7f0a000a +net.micode.notes:drawable/new_note_normal = 0x7f040031 +net.micode.notes:string/button_delete = 0x7f0a0009 +net.micode.notes:string/app_widget2x2 = 0x7f0a0007 +net.micode.notes:string/menu_font_normal = 0x7f0a002b +net.micode.notes:string/format_exported_file_location = 0x7f0a001d net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b +net.micode.notes:string/delete_remind_time_message = 0x7f0a000d net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/selected = 0x7f040035 +net.micode.notes:drawable/selected = 0x7f040038 net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:menu/sub_folder = 0x7f070006 +net.micode.notes:menu/sub_folder = 0x7f070007 +net.micode.notes:menu/recyclebin_options = 0x7f070006 +net.micode.notes:layout/recycle_bin = 0x7f06000b 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 = 0x7f05002f +net.micode.notes:id/move = 0x7f050030 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:drawable/new_note_pressed = 0x7f040032 net.micode.notes:id/iv_bg_blue = 0x7f05000f -net.micode.notes:layout/settings_header = 0x7f06000b +net.micode.notes:layout/settings_header = 0x7f06000c net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:drawable/list_white_single = 0x7f040027 +net.micode.notes:drawable/list_white_single = 0x7f040028 net.micode.notes:layout/note_item = 0x7f060007 net.micode.notes:xml/widget_2x_info = 0x7f0c0002 +net.micode.notes:string/menu_trash = 0x7f0a003e net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 net.micode.notes:layout/datetime_picker = 0x7f060002 net.micode.notes:id/btn_new_note = 0x7f050005 net.micode.notes:layout/note_list_footer = 0x7f06000a -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 = 0x7f05003f -net.micode.notes:id/tv_name = 0x7f05003e -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:id/sv_note_edit = 0x7f05003a -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:id/preference_sync_button = 0x7f050038 +net.micode.notes:id/widget_text = 0x7f050048 +net.micode.notes:id/tv_title_bar = 0x7f050046 +net.micode.notes:drawable/widget_2x_blue = 0x7f04003b +net.micode.notes:id/tv_time = 0x7f050044 +net.micode.notes:id/tv_name = 0x7f050043 +net.micode.notes:drawable/new_note = 0x7f040030 +net.micode.notes:id/sv_note_edit = 0x7f05003f +net.micode.notes:id/select_all = 0x7f05003d +net.micode.notes:id/recycle_bin = 0x7f05003c +net.micode.notes:string/recycle_list = 0x7f0a005c +net.micode.notes:string/error_sdcard_export = 0x7f0a0012 +net.micode.notes:id/preference_sync_button = 0x7f050039 net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:id/notes_list = 0x7f050036 +net.micode.notes:id/notes_list = 0x7f050037 net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:id/note_title = 0x7f050035 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -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 = 0x7f05002e -net.micode.notes:drawable/font_super = 0x7f040014 +net.micode.notes:drawable/title_alert = 0x7f040039 +net.micode.notes:id/note_title = 0x7f050036 +net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a0053 +net.micode.notes:id/note_edit_view = 0x7f050034 +net.micode.notes:id/navigation_bar = 0x7f050031 +net.micode.notes:string/app_widget4x4 = 0x7f0a0008 +net.micode.notes:drawable/font_normal = 0x7f040012 +net.micode.notes:id/minute = 0x7f05002f +net.micode.notes:drawable/font_super = 0x7f040015 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:string/widget_under_visit_mode = 0x7f0a006c net.micode.notes:id/menu_send_to_desktop = 0x7f05002a +net.micode.notes:drawable/deselect_all = 0x7f040005 net.micode.notes:id/menu_search = 0x7f050029 -net.micode.notes:drawable/list_green_down = 0x7f04001d +net.micode.notes:drawable/list_green_down = 0x7f04001e net.micode.notes:id/menu_new_note = 0x7f050028 -net.micode.notes:string/error_note_not_exist = 0x7f0a000e +net.micode.notes:string/error_note_not_exist = 0x7f0a0011 +net.micode.notes:string/alert_message_realdelete = 0x7f0a0003 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:string/menu_folder_view = 0x7f0a0029 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 = 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:drawable/edit_blue = 0x7f040007 +net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050038 +net.micode.notes:string/menu_font_size = 0x7f0a002c +net.micode.notes:string/menu_alert = 0x7f0a0022 +net.micode.notes:drawable/edit_title_yellow = 0x7f04000e net.micode.notes:id/menu_alert = 0x7f050021 -net.micode.notes:string/success_sync_account = 0x7f0a005c +net.micode.notes:string/success_sync_account = 0x7f0a0063 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 = 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/note_bg_color_selector = 0x7f050032 +net.micode.notes:drawable/search_result = 0x7f040036 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:string/error_sync_cancelled = 0x7f0a0014 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 = 0x7f050013 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d +net.micode.notes:string/menu_font_large = 0x7f0a002a +net.micode.notes:drawable/widget_4x_blue = 0x7f040040 net.micode.notes:id/iv_large_select = 0x7f050019 -net.micode.notes:id/widget_bg_image = 0x7f050042 +net.micode.notes:id/widget_bg_image = 0x7f050047 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:string/error_note_empty_for_clock = 0x7f0a000f +net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004e +net.micode.notes:drawable/menu_move = 0x7f04002f +net.micode.notes:drawable/widget_4x_white = 0x7f040043 net.micode.notes:id/iv_bg_blue_select = 0x7f050010 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c +net.micode.notes:id/menu_trash = 0x7f05002e +net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a0050 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:drawable/edit_green = 0x7f040008 +net.micode.notes:layout/widget_4x = 0x7f06000e +net.micode.notes:string/search = 0x7f0a005d 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 @@ -180,104 +189,112 @@ net.micode.notes:menu/note_list = 0x7f070003 net.micode.notes:id/account_dialog_title = 0x7f050001 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:drawable/widget_4x_green = 0x7f040041 net.micode.notes:style/NoteTheme = 0x7f0b0003 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:drawable/note_edit_color_selector_panel = 0x7f040033 +net.micode.notes:drawable/widget_2x_yellow = 0x7f04003f +net.micode.notes:dimen/text_font_size_large = 0x7f030000 +net.micode.notes:id/tv_alert_date = 0x7f050040 +net.micode.notes:drawable/widget_2x_red = 0x7f04003d net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a 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:drawable/widget_2x_green = 0x7f04003c +net.micode.notes:drawable/title_bar_bg = 0x7f04003a +net.micode.notes:id/action_select_all = 0x7f050002 +net.micode.notes:drawable/select_all = 0x7f040037 +net.micode.notes:id/iv_bg_red = 0x7f050013 +net.micode.notes:drawable/notification = 0x7f040034 +net.micode.notes:drawable/list_green_single = 0x7f040020 net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:id/tv_modified_date = 0x7f05003d -net.micode.notes:drawable/list_blue_middle = 0x7f040018 +net.micode.notes:id/tv_modified_date = 0x7f050042 +net.micode.notes:drawable/list_blue_middle = 0x7f040019 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:string/menu_folder_delete = 0x7f0a0028 +net.micode.notes:drawable/dropdown_icon = 0x7f040006 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 = 0x7f05003c -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:string/format_folder_files_count = 0x7f0a001b +net.micode.notes:drawable/list_yellow_single = 0x7f04002c +net.micode.notes:drawable/list_red_up = 0x7f040025 +net.micode.notes:drawable/widget_4x_yellow = 0x7f040044 +net.micode.notes:drawable/list_yellow_middle = 0x7f04002b +net.micode.notes:id/tv_folder_name = 0x7f050041 +net.micode.notes:drawable/list_yellow_down = 0x7f04002a 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:drawable/list_white_up = 0x7f040029 +net.micode.notes:drawable/edit_title_blue = 0x7f04000a +net.micode.notes:drawable/edit_red = 0x7f040009 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 -net.micode.notes:drawable/list_white_middle = 0x7f040026 +net.micode.notes:string/preferences_account_title = 0x7f0a0049 +net.micode.notes:drawable/edit_white = 0x7f04000f +net.micode.notes:drawable/list_white_middle = 0x7f040027 net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 +net.micode.notes:drawable/list_white_down = 0x7f040026 +net.micode.notes:string/preferences_menu_cancel = 0x7f0a0054 +net.micode.notes:drawable/recover = 0x7f040035 +net.micode.notes:string/preferences_add_account = 0x7f0a004a net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/icon_app = 0x7f040015 -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:string/error_delete_or_recover = 0x7f0a000e +net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a004b +net.micode.notes:layout/widget_2x = 0x7f06000d +net.micode.notes:drawable/list_footer_bg = 0x7f04001d +net.micode.notes:string/alert_title_delete = 0x7f0a0005 +net.micode.notes:drawable/edit_title_green = 0x7f04000b +net.micode.notes:drawable/icon_app = 0x7f040016 +net.micode.notes:string/menu_send_to_desktop = 0x7f0a0038 +net.micode.notes:drawable/list_red_single = 0x7f040024 +net.micode.notes:drawable/widget_4x_red = 0x7f040042 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_red_select = 0x7f050014 -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d +net.micode.notes:drawable/list_red_down = 0x7f040022 +net.micode.notes:drawable/list_red_middle = 0x7f040023 +net.micode.notes:string/alert_message_recover = 0x7f0a0004 +net.micode.notes:id/realdelete = 0x7f05003a +net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a0010 net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:drawable/list_blue_down = 0x7f040017 -net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:string/sync_progress_login = 0x7f0a005e +net.micode.notes:drawable/list_blue_down = 0x7f040018 +net.micode.notes:drawable/font_small = 0x7f040014 +net.micode.notes:string/sync_progress_login = 0x7f0a0065 net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:drawable/widget_2x_white = 0x7f04003b +net.micode.notes:drawable/widget_2x_white = 0x7f04003e net.micode.notes:layout/folder_list_item = 0x7f060004 net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/tv_title = 0x7f050040 +net.micode.notes:id/tv_title = 0x7f050045 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:drawable/font_size_selector_bg = 0x7f040013 +net.micode.notes:drawable/list_blue_up = 0x7f04001b +net.micode.notes:string/search_setting_description = 0x7f0a0060 +net.micode.notes:drawable/list_blue_single = 0x7f04001a +net.micode.notes:drawable/font_large = 0x7f040011 +net.micode.notes:id/selection_menu = 0x7f05003e +net.micode.notes:string/info_note_enter_desktop = 0x7f0a0021 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 = 0x7f050034 -net.micode.notes:drawable/edit_title_white = 0x7f04000c -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/edit_yellow = 0x7f040010 +net.micode.notes:id/note_item = 0x7f050035 +net.micode.notes:drawable/edit_title_white = 0x7f04000d +net.micode.notes:id/note_edit_list = 0x7f050033 +net.micode.notes:drawable/edit_title_red = 0x7f04000c +net.micode.notes:string/menu_delete = 0x7f0a0024 +net.micode.notes:drawable/list_folder = 0x7f04001c net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:string/search_hint = 0x7f0a0057 +net.micode.notes:string/error_sync_internal = 0x7f0a0015 +net.micode.notes:drawable/menu_delete = 0x7f04002e +net.micode.notes:string/search_hint = 0x7f0a005e 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:id/iv_bg_yellow = 0x7f050017 +net.micode.notes:drawable/list_yellow_up = 0x7f04002d +net.micode.notes:id/iv_bg_red_select = 0x7f050014 net.micode.notes:dimen/text_font_size_small = 0x7f030003 net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/app_name = 0x7f0a0004 +net.micode.notes:drawable/list_green_middle = 0x7f04001f +net.micode.notes:string/app_name = 0x7f0a0006 +net.micode.notes:id/recover = 0x7f05003b +net.micode.notes:drawable/list_background = 0x7f040017 net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:string/menu_setting = 0x7f0a0036 +net.micode.notes:string/menu_setting = 0x7f0a0039 net.micode.notes:dimen/text_font_size_medium = 0x7f030001 net.micode.notes:layout/note_edit_list_item = 0x7f060006 net.micode.notes:layout/account_dialog_title = 0x7f060000 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 e4d245d..8a6072c 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 0495c5f..53b2986 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,12 +1,12 @@ -- Merging decision tree log --- manifest -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 +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 +INJECTED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:18:1-156:12 package 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 @@ -72,7 +72,7 @@ ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\Andr android:name ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:33:22-78 application -ADDED from D:\xueye\softproject\gitProject\src\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-155:19 android:label ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:37:9-41 android:icon @@ -233,3 +233,9 @@ ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\Andr ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:148:13-49 android:name ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:147:13-58 +activity#net.micode.notes.ui.TrashFolderActivity +ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:150:9-153:20 + android:exported + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:152:13-37 + android:name + ADDED from D:\xueye\softproject\gitProject\src\note_but_github\app\src\main\AndroidManifest.xml:151:13-67 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 1c351a0..91c97e2 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/AndroidManifest.xml b/src/note_but_github/app/src/main/AndroidManifest.xml index e5c7d47..b2818d0 100644 --- a/src/note_but_github/app/src/main/AndroidManifest.xml +++ b/src/note_but_github/app/src/main/AndroidManifest.xml @@ -146,5 +146,11 @@ + + + + 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 0102e82..d2745ae 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 @@ -700,36 +700,24 @@ public class NoteEditActivity extends Activity implements OnClickListener, // 删除当前笔记的方法 private void deleteCurrentNote() { - // 检查当前笔记是否存在于数据库中 if (mWorkingNote.existInDatabase()) { - // 创建一个HashSet来存储要删除的笔记ID HashSet ids = new HashSet(); - // 获取当前笔记的ID long id = mWorkingNote.getNoteId(); - // 检查笔记ID是否为根文件夹ID if (id != Notes.ID_ROOT_FOLDER) { - // 如果不是根文件夹ID，则将ID添加到HashSet中 ids.add(id); } else { - // 如果是根文件夹ID，则记录错误日志 Log.d(TAG, "Wrong note id, should not happen"); } - // 检查当前是否处于同步模式 - if (!isSyncMode()) { - // 如果不是同步模式，则批量删除笔记 - if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { - // 如果删除失败，则记录错误日志 - Log.e(TAG, "Delete Note error"); - } - } else { - // 如果是同步模式，则将笔记移动到垃圾文件夹 - if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { - // 如果移动失败，则记录错误日志 - Log.e(TAG, "Move notes to trash folder error, should not happens"); - } +// if (!isSyncMode()) { +// if (!DataUtils.batchDeleteNotes(getContentResolver(), ids)) { +// Log.e(TAG, "Delete Note error"); +// } +// } else { + if (!DataUtils.batchMoveToFolder(getContentResolver(), ids, Notes.ID_TRASH_FOLER)) { + Log.e(TAG, "Move notes to trash folder error, should not happens"); } +// } } - // 标记当前笔记为已删除 mWorkingNote.markDeleted(true); } diff --git a/src/note_but_github/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/note_but_github/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index 690c3a2..0f02a2f 100644 --- a/src/note_but_github/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/note_but_github/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -16,6 +16,7 @@ package net.micode.notes.ui; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -479,22 +480,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } // 定义一个私有方法用于批量删除 + @SuppressLint("StaticFieldLeak") private void batchDelete() { - // 创建一个新的异步任务 new AsyncTask>() { - // 在后台执行删除操作 protected HashSet doInBackground(Void... unused) { - // 获取选中的小部件 HashSet widgets = mNotesListAdapter.getSelectedWidget(); - // 判断是否处于同步模式 if (!isSyncMode()) { - // if not synced, delete notes directly - if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter - .getSelectedItemIds())) { - } else { - Log.e(TAG, "Delete notes error, should not happens"); + if (mCurrentFolderId == Notes.ID_TRASH_FOLER){ + // if in trash, delete notes directly + if (DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter + .getSelectedItemIds())) { + } else { + Log.e(TAG, "Delete notes error, should not happens"); + } } - } else { + else{ + //move to trash + if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter + .getSelectedItemIds(), Notes.ID_TRASH_FOLER)) { + Log.e(TAG, "Move notes to trash folder error, should not happens"); + } + } + }else{ // in sync mode, we'll move the deleted note into the trash // folder if (!DataUtils.batchMoveToFolder(mContentResolver, mNotesListAdapter @@ -520,6 +527,8 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt }.execute(); } + + private void deleteFolder(long folderId) { if (folderId == Notes.ID_ROOT_FOLDER) { Log.e(TAG, "Wrong folder id, should not happen " + folderId); @@ -530,11 +539,11 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt ids.add(folderId); HashSet widgets = DataUtils.getFolderNoteWidget(mContentResolver, folderId); - if (!isSyncMode()) { - // if not synced, delete folder directly + if (mCurrentFolderId == Notes.ID_TRASH_FOLER) { + // if in trash, delete folder directly DataUtils.batchDeleteNotes(mContentResolver, ids); } else { - // in sync mode, we'll move the deleted folder into the trash folder + //move the deleted folder into the trash folder DataUtils.batchMoveToFolder(mContentResolver, ids, Notes.ID_TRASH_FOLER); } if (widgets != null) { @@ -547,6 +556,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } } + private void openNode(NoteItemData data) { Intent intent = new Intent(this, NoteEditActivity.class); intent.setAction(Intent.ACTION_VIEW); @@ -826,12 +836,30 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.menu_search: onSearchRequested(); break; + case R.id.menu_trash: + Intent intent=new Intent(NotesListActivity.this,TrashFolderActivity.class); + startActivity(intent); + break; default: break; } return true; } + private void openTrashFolder() { + // 将当前列表的编辑状态设置为子文件夹模式 + mState = ListEditState.SUB_FOLDER; + // 将当前文件夹 ID 设置为回收站的 ID + mCurrentFolderId = Notes.ID_TRASH_FOLER; + //查询已删除笔记的列表 + startAsyncNotesListQuery(); + // 不显示底部的“写便签” + mAddNewNote.setVisibility(View.GONE); + // 将顶部栏设置为 data.getSnippet 文件夹名称 + mTitleBar.setText(NotesListActivity.this + .getString(R.string.menu_trash)); + mTitleBar.setVisibility(View.VISIBLE); + } @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); diff --git a/src/note_but_github/app/src/main/java/net/micode/notes/ui/TrashFolderActivity.java b/src/note_but_github/app/src/main/java/net/micode/notes/ui/TrashFolderActivity.java new file mode 100644 index 0000000..69aeca9 --- /dev/null +++ b/src/note_but_github/app/src/main/java/net/micode/notes/ui/TrashFolderActivity.java @@ -0,0 +1,287 @@ +package net.micode.notes.ui; +import static android.widget.Toast.LENGTH_SHORT; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.app.AlertDialog; +import android.content.AsyncQueryHandler; +import android.content.ContentResolver; +import android.database.Cursor; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.AdapterView.OnItemClickListener; +import android.widget.ListView; +import android.widget.Toast; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; +import net.micode.notes.tool.DataUtils; + +import java.io.File; + +public class TrashFolderActivity extends Activity { + private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; + + private BackgroundQueryHandler mBackgroundQueryHandler; + + private NotesListAdapter mNotesListAdapter; + + private ListView mNotesListView; + + + + private long mCurrentFolderId; + + private ContentResolver mContentResolver; + + private static final String TAG = "RecycleActivity"; + + private MenuItem menuItem; + + private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.recycle_bin); + initResources(); + + } + + /** + * 查询背景状态，初始化页面背景,与背景切换功能中相同 + */ + + + /** + * 切换自定义背景,与背景切换功能中相同 + * @param path 图片地址 + */ + private void bitmapBg(String path){ + Bitmap bm; + try{ + File file=new File(path); + if (file.exists()){//bitmap转换图片 + bm = BitmapFactory.decodeFile(path); + Drawable drawable = new BitmapDrawable(bm); + getWindow().setBackgroundDrawable(drawable); + } + }catch (Exception e){//抛出异常 + e.printStackTrace(); + Toast.makeText(this, "自定义背景切换失败", LENGTH_SHORT).show(); + } + } + + @Override + protected void onStart() { + super.onStart(); + startAsyncNotesListQuery();//启动查询 + } + + /** + * 初始化各种资源的函数 + */ + @SuppressLint({"InflateParams", "WorldReadableFiles"}) + private void initResources() { + mContentResolver = this.getContentResolver(); + mBackgroundQueryHandler = new BackgroundQueryHandler(this.getContentResolver()); + mCurrentFolderId = Notes.ID_TRASH_FOLER; + mNotesListView = findViewById(R.id.recycle_bin); + mNotesListView.addFooterView(LayoutInflater.from(this).inflate(R.layout.note_list_footer, null), + null, false); + mNotesListView.setOnItemClickListener(new OnListItemClickListener()); + mNotesListAdapter = new NotesListAdapter(this); + mNotesListAdapter.setChoiceMode(true); + mNotesListView.setAdapter(mNotesListAdapter); + + } + + /** + * 查询回收站便签列表,与NoteListActivity中相似 + */ + private void startAsyncNotesListQuery() { + //查询便签列表,与NoteListActivity类似 + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, NORMAL_SELECTION, new String[]{ + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + + @SuppressLint("HandlerLeak") + private final class BackgroundQueryHandler extends AsyncQueryHandler { + public BackgroundQueryHandler(ContentResolver contentResolver) { + super(contentResolver); + } + + @Override + protected void onQueryComplete(int token, Object cookie, Cursor cursor) { + if (token == FOLDER_NOTE_LIST_QUERY_TOKEN) { + mNotesListAdapter.changeCursor(cursor); + } + } + } + + @Override + public void onBackPressed() { + super.onBackPressed(); + finish(); + } + + /** + * 顶部菜单生成,生成顶部的全选 还原 删除 按钮 + */ + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + //重置菜单 + menu.clear(); + //从自定义xml中获取样式 + getMenuInflater().inflate(R.menu.recyclebin_options, menu); + //绑定全选按钮 + menuItem = menu.findItem(R.id.select_all); + return true; + } + + /** + * 删除所选便签的方法,直接永久删除便签,并调用弹窗供用户进行确认 + */ + private void batchDelete() { + //如果没有选中任何便签 + if (mNotesListAdapter.getSelectedCount() == 0) { + Log.e(TAG, "Send to desktop error"); + //小弹窗提醒 + Toast.makeText(this, R.string.error_delete_or_recover, LENGTH_SHORT).show(); + return; + } + // 构建确认弹窗 + AlertDialog.Builder builder = new AlertDialog.Builder(this); + //设置弹窗标题 + builder.setTitle(getString(R.string.alert_title_delete)); + //设置弹窗图标 + builder.setIcon(android.R.drawable.ic_dialog_alert); + //设置弹窗消息 + builder.setMessage(getString(R.string.alert_message_realdelete)); + //设置积极选项 + builder.setPositiveButton(android.R.string.ok, + (dialog, which) -> {//点击确认选项后的事件 + if (!DataUtils.batchDeleteNotes(mContentResolver, mNotesListAdapter + .getSelectedItemIds())) { + Log.e(TAG, "Delete notes error, should not happens"); + } + //重置所有便签的选择状态 + mNotesListAdapter.selectAll(false); + }); + //设置消极选项 + builder.setNegativeButton(android.R.string.cancel, null); + //弹出弹窗 + builder.show(); + } + + /** + * 还原所选中便签的方法,原理为将便签移出trash文件夹到根文件夹,构建弹窗供用户确认 + */ + void recover() { + //如果没有选中任何便签 + if (mNotesListAdapter.getSelectedCount() == 0) { + Log.e(TAG, "Send to desktop error"); + //小弹窗提醒 + Toast.makeText(this, R.string.error_delete_or_recover, LENGTH_SHORT).show(); + return; + } + //构建弹窗 + AlertDialog.Builder builder = new AlertDialog.Builder(this); + //设置弹窗标题 + builder.setTitle(getString(R.string.recover)); + //设置弹窗图标 + builder.setIcon(android.R.drawable.ic_dialog_alert); + //设置弹窗内消息 + builder.setMessage(getString(R.string.alert_message_recover)); + //设置积极选项 + builder.setPositiveButton(android.R.string.ok, + (dialog, which) -> {//确认后执行的方法 + if (mNotesListAdapter.getSelectedCount() != 0) { + //移动所选便签至根文件夹 + DataUtils.batchMoveToFolder(mContentResolver, + mNotesListAdapter.getSelectedItemIds(), Notes.ID_ROOT_FOLDER); + //重置所有便签的选择状态 + mNotesListAdapter.selectAll(false); + } + else//空选便签时执行 + Log.e(TAG, "Recover error, no note was selected"); + }); + //设置消极选项 + builder.setNegativeButton(android.R.string.cancel, null); + //显示弹窗 + builder.show(); + } + + /** + * 当顶部菜单中的选项被选择时所执行的函数 + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + + if (item.getItemId() == R.id.recover) {//还原选项 + //还原便签 + recover(); + + } else if (item.getItemId() == R.id.realdelete) {//删除选项 + //删除便签 + batchDelete(); + + } else if (item.getItemId() == R.id.select_all) {//全选选项 + //全选按钮状态切换 + if (!mNotesListAdapter.isAllSelected()) {//若便签没有被全选的情况下点击全选按钮 + //切换取消全选图标 + item.setIcon(getResources().getDrawable(R.drawable.deselect_all)); + //选择所有便签 + mNotesListAdapter.selectAll(true); + } else {//如果便签已经被全选 + //切换全选图标 + item.setIcon(getResources().getDrawable(R.drawable.select_all)); + //取消全选所有便签 + mNotesListAdapter.selectAll(false); + } + } + return true; + } + + /** + * 点击便签事件监听器,当点击任意便签项时触发 + */ + private class OnListItemClickListener implements OnItemClickListener { + + public void onItemClick(AdapterView parent, View view, int position, long id) { + //当点击的是便签项时 + if (view instanceof NotesListItem) { + //从视图获取便签项 + NoteItemData item = ((NotesListItem) view).getItemData(); + //判断是不是便签,防止点击到文件夹的情况,与上一句一样基本上没用 + if (item.getType() == Notes.TYPE_NOTE) { + //定位 + position = position - mNotesListView.getHeaderViewsCount(); + //改变单个便签的被选择状态 + mNotesListAdapter.setCheckedItem(position, !mNotesListAdapter.isSelectedItem(position)); + + //用于判断是否手动全选了便签 + if (mNotesListAdapter.isAllSelected()) + //切换取消全选图标 + menuItem.setIcon(getResources().getDrawable(R.drawable.deselect_all)); + else + //切换全选图标 + menuItem.setIcon(getResources().getDrawable(R.drawable.select_all)); + } + } + } + + } +} diff --git a/src/note_but_github/app/src/main/res/layout/note_list.xml b/src/note_but_github/app/src/main/res/layout/note_list.xml index 6b25d38..d2c21cf 100644 --- a/src/note_but_github/app/src/main/res/layout/note_list.xml +++ b/src/note_but_github/app/src/main/res/layout/note_list.xml @@ -37,6 +37,7 @@ android:textColor="#FFEAD1AE" android:textSize="@dimen/text_font_size_medium" /> + + diff --git a/src/note_but_github/app/src/main/res/layout/recycle_bin.xml b/src/note_but_github/app/src/main/res/layout/recycle_bin.xml new file mode 100644 index 0000000..f4f1548 --- /dev/null +++ b/src/note_but_github/app/src/main/res/layout/recycle_bin.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/note_but_github/app/src/main/res/menu/note_list.xml b/src/note_but_github/app/src/main/res/menu/note_list.xml index 42ea736..a2e8b6e 100644 --- a/src/note_but_github/app/src/main/res/menu/note_list.xml +++ b/src/note_but_github/app/src/main/res/menu/note_list.xml @@ -36,4 +36,8 @@ + + diff --git a/src/note_but_github/app/src/main/res/menu/recyclebin_options.xml b/src/note_but_github/app/src/main/res/menu/recyclebin_options.xml new file mode 100644 index 0000000..d527f8e --- /dev/null +++ b/src/note_but_github/app/src/main/res/menu/recyclebin_options.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/note_but_github/app/src/main/res/values/strings.xml b/src/note_but_github/app/src/main/res/values/strings.xml index 55df868..d37e881 100644 --- a/src/note_but_github/app/src/main/res/values/strings.xml +++ b/src/note_but_github/app/src/main/res/values/strings.xml @@ -17,6 +17,13 @@ + Trash Can + recycle_list + error_delete_or_recover + alert_message_recover + alert_message_realdelete + 恢复 + 彻底删除 Notes Notes 2x2 Notes 4x4