diff --git a/.gradle/7.0.2/executionHistory/executionHistory.bin b/.gradle/7.0.2/executionHistory/executionHistory.bin index 05df24a..4eb08ec 100644 Binary files a/.gradle/7.0.2/executionHistory/executionHistory.bin and b/.gradle/7.0.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.0.2/executionHistory/executionHistory.lock b/.gradle/7.0.2/executionHistory/executionHistory.lock index cc3692b..7b7ee69 100644 Binary files a/.gradle/7.0.2/executionHistory/executionHistory.lock and b/.gradle/7.0.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.0.2/fileHashes/fileHashes.bin b/.gradle/7.0.2/fileHashes/fileHashes.bin index e9746c0..333ee7b 100644 Binary files a/.gradle/7.0.2/fileHashes/fileHashes.bin and b/.gradle/7.0.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.0.2/fileHashes/fileHashes.lock b/.gradle/7.0.2/fileHashes/fileHashes.lock index b91c6bd..1220c77 100644 Binary files a/.gradle/7.0.2/fileHashes/fileHashes.lock and b/.gradle/7.0.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.0.2/javaCompile/classAnalysis.bin b/.gradle/7.0.2/javaCompile/classAnalysis.bin index f03bfaf..310ea32 100644 Binary files a/.gradle/7.0.2/javaCompile/classAnalysis.bin and b/.gradle/7.0.2/javaCompile/classAnalysis.bin differ diff --git a/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/.gradle/7.0.2/javaCompile/jarAnalysis.bin index 6fb344e..d584df4 100644 Binary files a/.gradle/7.0.2/javaCompile/jarAnalysis.bin and b/.gradle/7.0.2/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/7.0.2/javaCompile/javaCompile.lock b/.gradle/7.0.2/javaCompile/javaCompile.lock index 2dc8ff9..cb72cf4 100644 Binary files a/.gradle/7.0.2/javaCompile/javaCompile.lock and b/.gradle/7.0.2/javaCompile/javaCompile.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a5d26cd..eb1fe31 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin index 9e72e76..64e99e9 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin index afa042b..c43f0d8 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin index 979ef6f..672da7f 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin index c2b51cf..22e93de 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin index 11b370d..b9b9521 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin differ diff --git a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin index 4893d78..205ff07 100644 Binary files a/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and b/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin differ diff --git a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 932074a..6a2d5b1 100644 Binary files a/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties index 57f241a..19a0b57 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties +++ b/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Sat Dec 09 14:55:52 CST 2023 +#Sat Dec 09 21:01:18 CST 2023 H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_4x.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat @@ -6,8 +6,8 @@ H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9. H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\raw\\introduction=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\mi1.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_mi1.png.flat -H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat +H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat @@ -31,8 +31,8 @@ H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\incremental\\mergeDe H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\menu\\note_list_options.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat +H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\color\\primary_text_dark.xml=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat H\:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 0dcea0c..5df5384 100644 --- a/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Sat Dec 09 14:55:57 CST 2023 +#Sat Dec 09 22:36:46 CST 2023 base.0=H\:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index 0046700..6274730 100644 Binary files a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class index 205d5d2..386e2c1 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class index 4db2929..16c8c4a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$10.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class index fa988de..8551a66 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$11.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class index 3f2349e..0774297 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$12.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class index 478ba85..09b571b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$13.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class index ea16146..1127e63 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class index e57712e..4805dd2 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class index 3767a10..aa390ea 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class index a16cce4..1c2439a 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class index 2cfb034..769385b 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class index 1d6256b..207f366 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class index d036445..7bc4638 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class index 761d3d3..96bab51 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class index 06f7bfc..9e5d611 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class index e370009..84d6522 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class index 3e6284d..13a884d 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class index 3f17281..20cbf82 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class index 026ac82..842bd22 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class index 3efd275..7133039 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class index e02efec..ed142e4 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class index b9d9944..7724416 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class differ diff --git a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json index bda1e56..b39c91a 100644 --- a/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ b/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json @@ -147,14 +147,14 @@ "merged": "H:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat", "source": "H:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml" }, - { - "merged": "H:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", - "source": "H:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" - }, { "merged": "H:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat", "source": "H:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\raw-zh-rCN\\introduction" }, + { + "merged": "H:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat", + "source": "H:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png" + }, { "merged": "H:\\gitee\\xiaomi-notes--note1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat", "source": "H:\\gitee\\xiaomi-notes--note1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png" diff --git a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ index 08a4e52..970312d 100644 Binary files a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex index 44475ad..103f219 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex index 33a7697..e41c14c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$10.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex index 24813b9..2a40fa5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$11.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex index 8fcf96d..2ccf360 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$12.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex index 3a4503d..329d36a 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$13.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex index e50f3cd..62d5bb1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex index 077bd6b..2cecab6 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex index f2840be..5b406fa 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex index b4a4225..eb24715 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex index 481ebb0..26c6d14 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex index 0295d15..339af38 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex index e86d0f9..9bc45b1 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex index 6f11449..6734b21 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex index 8363fce..6d90d10 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex index e6ee5b6..3383df8 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex index b41a353..c97a758 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex index 316c7e9..d2c455c 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex index ef139d3..c7d68e3 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex index f66e0a9..b695022 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex index f793795..f78ed46 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex index 2ed8d85..22f660b 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex differ diff --git a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt index d0cb9b8..a67488f 100644 --- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt @@ -1,124 +1,120 @@ -net.micode.notes:style/Dialog_Msg = 0x7f0f016a -net.micode.notes:layout/dialog_edit = 0x7f0a0036 -net.micode.notes:id/yes = 0x7f0800d5 -net.micode.notes:string/preferences_last_sync_time = 0x7f0e0082 -net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0134 -net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f0129 -net.micode.notes:id/search_close_btn = 0x7f0800a0 -net.micode.notes:style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar = 0x7f0f014c +net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0048 net.micode.notes:style/Base.V26.Widget.AppCompat.Toolbar = 0x7f0f005c +net.micode.notes:style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar = 0x7f0f014c +net.micode.notes:id/search_close_btn = 0x7f0800a0 net.micode.notes:string/note_link_tel = 0x7f0e0072 net.micode.notes:style/Widget.AppCompat.SearchView = 0x7f0f015a +net.micode.notes:string/failed_sdcard_export = 0x7f0e0040 +net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014 +net.micode.notes:styleable/SwitchCompat = 0x7f100027 net.micode.notes:style/Widget.AppCompat.Light.DropDownItem.Spinner = 0x7f0f0146 +net.micode.notes:style/Dialog_Msg = 0x7f0f016a +net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f00a7 +net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 +net.micode.notes:styleable/Toolbar = 0x7f100029 net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0f00fb net.micode.notes:style/Theme.Notes1.Fullscreen = 0x7f0f0114 -net.micode.notes:styleable/Toolbar = 0x7f100029 -net.micode.notes:layout/abc_popup_menu_item_layout = 0x7f0a0013 -net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000c -net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8 -net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0167 net.micode.notes:style/TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f00f6 -net.micode.notes:style/Platform.ThemeOverlay.AppCompat.Dark = 0x7f0f00a7 -net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton.Overflow = 0x7f0f00be -net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.MinWidth = 0x7f0f0048 -net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0089 -net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 -net.micode.notes:string/search = 0x7f0e008e -net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0165 -net.micode.notes:style/Base.V7.Widget.AppCompat.Toolbar = 0x7f0f0066 -net.micode.notes:style/Base.Theme.AppCompat.Dialog.MinWidth = 0x7f0f0041 -net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f007b +net.micode.notes:style/Widget.Support.CoordinatorLayout = 0x7f0f0167 net.micode.notes:style/Base.TextAppearance.AppCompat.Display1 = 0x7f0f0011 -net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022 -net.micode.notes:dimen/notification_top_pad_large_text = 0x7f06006b +net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f014e +net.micode.notes:id/yes = 0x7f0800d5 net.micode.notes:style/Widget.AppCompat.PopupWindow = 0x7f0f0154 -net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0144 +net.micode.notes:dimen/notification_top_pad_large_text = 0x7f06006b +net.micode.notes:string/abc_searchview_description_submit = 0x7f0e0022 net.micode.notes:style/Base.Widget.AppCompat.PopupMenu = 0x7f0f008f net.micode.notes:id/time = 0x7f0800bf net.micode.notes:string/action_sign_in_short = 0x7f0e0028 -net.micode.notes:style/Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0131 -net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f00e7 -net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f0126 +net.micode.notes:style/TextAppearance.AppCompat.Subhead.Inverse = 0x7f0f00d8 +net.micode.notes:style/Base.TextAppearance.AppCompat = 0x7f0f000c +net.micode.notes:style/Widget.AppCompat.Button.Borderless = 0x7f0f0129 +net.micode.notes:style/Base.V7.Widget.AppCompat.Toolbar = 0x7f0f0066 +net.micode.notes:style/Widget.AppCompat.DropDownItem.Spinner = 0x7f0f0134 +net.micode.notes:style/Widget.AppCompat.Light.ActivityChooserView = 0x7f0f0144 +net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f003b net.micode.notes:style/Base.V21.Theme.AppCompat.Light = 0x7f0f0053 net.micode.notes:style/Widget.AppCompat.CompoundButton.Switch = 0x7f0f0132 net.micode.notes:style/Widget.AppCompat.Light.ActionButton = 0x7f0f0140 -net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title = 0x7f0f003b -net.micode.notes:styleable/SwitchCompat = 0x7f100027 -net.micode.notes:string/abc_menu_alt_shortcut_label = 0x7f0e0014 -net.micode.notes:string/failed_sdcard_export = 0x7f0e0040 -net.micode.notes:id/no = 0x7f0800d4 -net.micode.notes:id/account_dialog_title = 0x7f080007 +net.micode.notes:id/menu_quit_secret = 0x7f080076 net.micode.notes:style/ThemeOverlay.AppCompat = 0x7f0f0115 -net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011e -net.micode.notes:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f0f0105 +net.micode.notes:id/account_dialog_title = 0x7f080007 +net.micode.notes:id/no = 0x7f0800d4 +net.micode.notes:style/Base.Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f0089 +net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f014f net.micode.notes:xml/widget_2x_info = 0x7f110002 net.micode.notes:string/file_path = 0x7f0e0042 -net.micode.notes:style/Widget.AppCompat.ListView = 0x7f0f014f +net.micode.notes:style/Widget.AppCompat.ActionBar.Solid = 0x7f0f011e +net.micode.notes:style/Theme.AppCompat.DayNight.DialogWhenLarge = 0x7f0f0105 net.micode.notes:style/Widget.AppCompat.ButtonBar = 0x7f0f012e net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.Switch = 0x7f0f007c -net.micode.notes:id/tv_title_bar = 0x7f0800cb net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f00dc -net.micode.notes:string/preferences_account_title = 0x7f0e0079 +net.micode.notes:id/tv_title_bar = 0x7f0800cb net.micode.notes:id/wrap_content = 0x7f0800d2 net.micode.notes:style/Widget.AppCompat.Light.ActionBar = 0x7f0f0137 -net.micode.notes:style/Widget.AppCompat.SearchView.ActionBar = 0x7f0f015b -net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 -net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 +net.micode.notes:style/RtlUnderlay.Widget.AppCompat.ActionButton.Overflow = 0x7f0f00be +net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f +net.micode.notes:styleable/ViewBackgroundHelper = 0x7f10002b net.micode.notes:styleable/RecycleListView = 0x7f100022 net.micode.notes:style/TextAppearanceSuper = 0x7f0f00fc +net.micode.notes:styleable/ActivityChooserView = 0x7f100005 +net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f006a net.micode.notes:style/Base.Widget.AppCompat.ProgressBar = 0x7f0f0092 +net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb +net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011f net.micode.notes:string/notealert_enter = 0x7f0e0074 net.micode.notes:id/src_over = 0x7f0800b1 -net.micode.notes:style/Base.Widget.AppCompat.ActionBar.TabText = 0x7f0f006a -net.micode.notes:styleable/ActivityChooserView = 0x7f100005 +net.micode.notes:style/Widget.Compat.NotificationActionContainer = 0x7f0f0165 +net.micode.notes:string/search = 0x7f0e008e +net.micode.notes:style/Base.AlertDialog.AppCompat = 0x7f0f0005 net.micode.notes:style/TextAppearance.Compat.Notification.Time = 0x7f0f00f2 net.micode.notes:style/ThemeOverlay.AppCompat.Dialog = 0x7f0f0119 net.micode.notes:styleable/StateListDrawable = 0x7f100025 net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1 = 0x7f0f00b8 net.micode.notes:style/Theme.AppCompat.Dialog = 0x7f0f0107 -net.micode.notes:drawable/abc_seekbar_tick_mark_material = 0x7f07003f net.micode.notes:style/TextAppearance.AppCompat.Widget.Button = 0x7f0f00e5 net.micode.notes:style/Base.Widget.AppCompat.DrawerArrowToggle = 0x7f0f007d net.micode.notes:style/Theme.AppCompat.Light.Dialog.Alert = 0x7f0f010e net.micode.notes:style/Base.Animation.AppCompat.DropDownUp = 0x7f0f0008 +net.micode.notes:style/Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f0131 +net.micode.notes:style/Widget.AppCompat.ActivityChooserView = 0x7f0f0126 +net.micode.notes:style/TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f00e7 +net.micode.notes:drawable/edit_title_white = 0x7f070060 +net.micode.notes:style/Theme.AppCompat.DayNight.Dialog = 0x7f0f0102 net.micode.notes:styleable/PopupWindow = 0x7f100020 net.micode.notes:layout/abc_action_menu_item_layout = 0x7f0a0002 -net.micode.notes:style/Widget.AppCompat.ActionBar.TabBar = 0x7f0f011f -net.micode.notes:style/TextAppearance.AppCompat.Large.Inverse = 0x7f0f00cb -net.micode.notes:style/Theme.AppCompat.DayNight.Dialog = 0x7f0f0102 -net.micode.notes:drawable/edit_title_white = 0x7f070060 -net.micode.notes:styleable/ViewBackgroundHelper = 0x7f10002b net.micode.notes:style/Widget.AppCompat.Light.ListView.DropDown = 0x7f0f0148 net.micode.notes:layout/abc_cascading_menu_item_layout = 0x7f0a000b -net.micode.notes:style/Base.ThemeOverlay.AppCompat = 0x7f0f004a +net.micode.notes:style/Base.Theme.AppCompat.Dialog.MinWidth = 0x7f0f0041 net.micode.notes:drawable/new_note_normal = 0x7f070088 +net.micode.notes:style/Base.ThemeOverlay.AppCompat = 0x7f0f004a +net.micode.notes:string/preferences_last_sync_time = 0x7f0e0082 net.micode.notes:id/action_bar_subtitle = 0x7f08000d net.micode.notes:style/ThemeOverlay.AppCompat.Dialog.Alert = 0x7f0f011a net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Switch = 0x7f0f0037 -net.micode.notes:attr/colorControlHighlight = 0x7f03004f -net.micode.notes:id/async = 0x7f080021 net.micode.notes:id/withText = 0x7f0800d1 net.micode.notes:style/Theme.AppCompat.DayNight.Dialog.MinWidth = 0x7f0f0104 net.micode.notes:id/tag_unhandled_key_event_manager = 0x7f0800b8 net.micode.notes:style/TextAppearance.AppCompat.Button = 0x7f0f00c2 net.micode.notes:style/TextAppearanceLarge = 0x7f0f00f7 net.micode.notes:style/Base.V7.Theme.AppCompat = 0x7f0f005f -net.micode.notes:styleable/ViewStubCompat = 0x7f10002c -net.micode.notes:string/abc_activitychooserview_choose_application = 0x7f0e0005 net.micode.notes:style/Base.TextAppearance.AppCompat.Display4 = 0x7f0f0014 +net.micode.notes:styleable/ViewStubCompat = 0x7f10002c net.micode.notes:id/notes_list = 0x7f08008c net.micode.notes:string/search_menu_title = 0x7f0e0091 -net.micode.notes:style/TextAppearance.AppCompat.Title = 0x7f0f00d9 +net.micode.notes:style/Base.Widget.AppCompat.CompoundButton.RadioButton = 0x7f0f007b net.micode.notes:style/Widget.Theme.Notes1.ActionBar.Fullscreen = 0x7f0f0168 +net.micode.notes:style/TextAppearance.AppCompat.Title = 0x7f0f00d9 +net.micode.notes:string/preferences_account_title = 0x7f0e0079 +net.micode.notes:id/async = 0x7f080021 +net.micode.notes:attr/colorControlHighlight = 0x7f03004f +net.micode.notes:layout/widget_2x = 0x7f0a0034 +net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc +net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.Title = 0x7f0f00b6 net.micode.notes:style/Theme.AppCompat.Light.DarkActionBar = 0x7f0f010c net.micode.notes:drawable/notification_bg_normal_pressed = 0x7f070092 -net.micode.notes:layout/widget_2x = 0x7f0a0034 -net.micode.notes:style/TextAppearance.AppCompat.Light.SearchResult.Subtitle = 0x7f0f00cc -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f013e net.micode.notes:dimen/disabled_alpha_material_light = 0x7f060055 -net.micode.notes:layout/abc_screen_simple = 0x7f0a0015 -net.micode.notes:style/Widget.AppCompat.ListPopupWindow = 0x7f0f014e +net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView = 0x7f0f013e net.micode.notes:style/Base.TextAppearance.AppCompat.Tooltip = 0x7f0f0027 net.micode.notes:id/menu_alert = 0x7f08006b net.micode.notes:string/info_note_enter_desktop = 0x7f0e004a @@ -131,6 +127,7 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Medium = 0x7f0f001b net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.TabBar = 0x7f0f0084 net.micode.notes:style/Base.Widget.AppCompat.ActionButton.CloseMode = 0x7f0f006d net.micode.notes:id/beginning = 0x7f080022 +net.micode.notes:layout/dialog_edit = 0x7f0a0036 net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown = 0x7f0f00b7 net.micode.notes:style/TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f00d3 net.micode.notes:style/TextAppearance.Compat.Notification.Line2 = 0x7f0f00f1 @@ -148,15 +145,20 @@ net.micode.notes:style/Base.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0071 net.micode.notes:styleable/CompoundButton = 0x7f100011 net.micode.notes:styleable/AnimatedStateListDrawableCompat = 0x7f100007 net.micode.notes:style/Base.Widget.AppCompat.Spinner = 0x7f0f009b -net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f0043 net.micode.notes:style/Base.TextAppearance.AppCompat.Headline = 0x7f0f0015 net.micode.notes:style/RtlOverlay.Widget.AppCompat.DialogTitle.Icon = 0x7f0f00b0 +net.micode.notes:style/Base.Theme.AppCompat.Light = 0x7f0f0043 net.micode.notes:string/menu_send_to_desktop = 0x7f0e0069 net.micode.notes:style/Theme.AppCompat.NoActionBar = 0x7f0f0112 net.micode.notes:style/Base.Theme.AppCompat.Light.Dialog.Alert = 0x7f0f0046 -net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0110 -net.micode.notes:layout/notification_action_tombstone = 0x7f0a002a net.micode.notes:style/Widget.AppCompat.Light.PopupMenu.Overflow = 0x7f0f014a +net.micode.notes:layout/notification_action_tombstone = 0x7f0a002a +net.micode.notes:style/Theme.AppCompat.Light.DialogWhenLarge = 0x7f0f0110 +net.micode.notes:dimen/abc_text_size_display_4_material = 0x7f060040 +net.micode.notes:layout/abc_activity_chooser_view = 0x7f0a0006 +net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f070026 +net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_light = 0x7f07004b +net.micode.notes:style/Widget.AppCompat.SearchView.ActionBar = 0x7f0f015b net.micode.notes:style/Base.Widget.AppCompat.SearchView.ActionBar = 0x7f0f0098 net.micode.notes:string/error_sdcard_unmounted = 0x7f0e003c net.micode.notes:id/font_size_selector = 0x7f080045 @@ -180,33 +182,32 @@ net.micode.notes:style/Base.Widget.AppCompat.ActionBar = 0x7f0f0067 net.micode.notes:string/abc_font_family_button_material = 0x7f0e000a net.micode.notes:styleable/View = 0x7f10002a net.micode.notes:style/Widget.AppCompat.Light.ActionButton.Overflow = 0x7f0f0142 -net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f013f net.micode.notes:string/menu_folder_change_name = 0x7f0e0053 +net.micode.notes:style/Widget.AppCompat.Light.ActionBar.TabView.Inverse = 0x7f0f013f net.micode.notes:style/Base.Widget.AppCompat.ImageButton = 0x7f0f0081 net.micode.notes:string/menu_quit_secret = 0x7f0e0062 net.micode.notes:string/abc_font_family_body_1_material = 0x7f0e0008 net.micode.notes:style/Base.TextAppearance.AppCompat.Display2 = 0x7f0f0012 -net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0164 -net.micode.notes:drawable/list_blue_middle = 0x7f07006e net.micode.notes:id/content = 0x7f080032 net.micode.notes:xml/searchable = 0x7f110001 net.micode.notes:style/TextAppearance.AppCompat.Tooltip = 0x7f0f00db +net.micode.notes:style/Widget.AppCompat.Toolbar.Button.Navigation = 0x7f0f0164 +net.micode.notes:drawable/list_blue_middle = 0x7f07006e net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dialog = 0x7f0f004e net.micode.notes:style/Base.DialogWindowTitleBackground.AppCompat = 0x7f0f000b -net.micode.notes:string/menu_delete = 0x7f0e0050 net.micode.notes:style/Base.Widget.AppCompat.DropDownItem.Spinner = 0x7f0f007f -net.micode.notes:drawable/abc_text_select_handle_middle_mtrl_light = 0x7f07004b -net.micode.notes:drawable/abc_item_background_holo_dark = 0x7f070026 -net.micode.notes:id/action_bar = 0x7f080008 +net.micode.notes:string/menu_delete = 0x7f0e0050 net.micode.notes:style/Base.DialogWindowTitle.AppCompat = 0x7f0f000a +net.micode.notes:id/action_bar = 0x7f080008 +net.micode.notes:string/abc_activitychooserview_choose_application = 0x7f0e0005 net.micode.notes:style/Base.ThemeOverlay.AppCompat.Dark.ActionBar = 0x7f0f004d net.micode.notes:style/Base.ThemeOverlay.AppCompat.ActionBar = 0x7f0f004b net.micode.notes:id/iv_bg_blue_select = 0x7f080055 -net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f07002d net.micode.notes:attr/colorPrimary = 0x7f030052 net.micode.notes:drawable/abc_ic_clear_material = 0x7f070015 net.micode.notes:style/Platform.AppCompat = 0x7f0f00a4 net.micode.notes:style/Base.Theme.AppCompat.CompactMenu = 0x7f0f003d +net.micode.notes:drawable/abc_list_pressed_holo_light = 0x7f07002d net.micode.notes:style/Base.TextAppearance.Widget.AppCompat.ExpandedMenu.Item = 0x7f0f0039 net.micode.notes:style/Widget.AppCompat.Light.ActionMode.Inverse = 0x7f0f0143 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button = 0x7f0f002f @@ -214,9 +215,9 @@ net.micode.notes:style/TextAppearance.AppCompat.Inverse = 0x7f0f00c9 net.micode.notes:drawable/abc_ratingbar_indicator_material = 0x7f070036 net.micode.notes:string/menu_font_normal = 0x7f0e0057 net.micode.notes:string/dummy_button = 0x7f0e0036 +net.micode.notes:style/Base.TextAppearance.AppCompat.Small.Inverse = 0x7f0f0022 net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar.Solid = 0x7f0f0083 net.micode.notes:style/Base.V7.Theme.AppCompat.Dialog = 0x7f0f0060 -net.micode.notes:style/Base.TextAppearance.AppCompat.Small.Inverse = 0x7f0f0022 net.micode.notes:style/Base.TextAppearance.AppCompat.Medium.Inverse = 0x7f0f001c net.micode.notes:layout/notification_template_part_time = 0x7f0a002e net.micode.notes:style/Base.TextAppearance.AppCompat.Large.Inverse = 0x7f0f0018 @@ -233,8 +234,8 @@ net.micode.notes:string/status_bar_notification_info_overflow = 0x7f0e0094 net.micode.notes:id/menu_select_image = 0x7f080079 net.micode.notes:string/notelist_string_info = 0x7f0e0077 net.micode.notes:style/Base.Widget.AppCompat.Light.ActionBar = 0x7f0f0082 -net.micode.notes:string/prompt_email = 0x7f0e008b net.micode.notes:string/widget_havenot_content = 0x7f0e00a1 +net.micode.notes:string/prompt_email = 0x7f0e008b net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.Button.Colored = 0x7f0f0031 net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0e0089 net.micode.notes:layout/abc_dialog_title_material = 0x7f0a000c @@ -248,9 +249,9 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult = 0x7f0f001e net.micode.notes:string/preferences_title = 0x7f0e0087 net.micode.notes:style/Widget.AppCompat.Button.Colored = 0x7f0f012c net.micode.notes:styleable/AppCompatImageView = 0x7f10000a -net.micode.notes:style/TextAppearance.Compat.Notification = 0x7f0f00ef -net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f00af net.micode.notes:string/preferences_last_sync_time_format = 0x7f0e0083 +net.micode.notes:style/RtlOverlay.Widget.AppCompat.ActionBar.TitleItem = 0x7f0f00af +net.micode.notes:style/TextAppearance.Compat.Notification = 0x7f0f00ef net.micode.notes:string/menu_folder_delete = 0x7f0e0054 net.micode.notes:style/ThemeOverlay.AppCompat.Light = 0x7f0f011b net.micode.notes:style/Base.V7.Widget.AppCompat.AutoCompleteTextView = 0x7f0f0064 @@ -259,8 +260,8 @@ net.micode.notes:drawable/title_alert = 0x7f07009b net.micode.notes:styleable/GradientColorItem = 0x7f100019 net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0e007b net.micode.notes:string/alert_message_delete_notes = 0x7f0e002b -net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f0033 net.micode.notes:string/cancel = 0x7f0e0032 +net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.DropDownItem = 0x7f0f0033 net.micode.notes:string/success_sync_account = 0x7f0e0096 net.micode.notes:string/preferences_add_account = 0x7f0e007a net.micode.notes:attr/windowFixedWidthMajor = 0x7f03010d @@ -290,8 +291,8 @@ net.micode.notes:style/Widget.AppCompat.ListView.DropDown = 0x7f0f0150 net.micode.notes:string/error_sync_network = 0x7f0e003f net.micode.notes:string/abc_font_family_menu_material = 0x7f0e0011 net.micode.notes:string/menu_moren = 0x7f0e005e -net.micode.notes:style/Base.V21.Theme.AppCompat.Light.Dialog = 0x7f0f0054 net.micode.notes:string/prompt_password = 0x7f0e008d +net.micode.notes:style/Base.V21.Theme.AppCompat.Light.Dialog = 0x7f0f0054 net.micode.notes:style/Widget.AppCompat.ActionButton.Overflow = 0x7f0f0124 net.micode.notes:string/menu_keli = 0x7f0e005c net.micode.notes:style/Platform.V25.AppCompat.Light = 0x7f0f00ac @@ -316,12 +317,12 @@ net.micode.notes:style/Widget.AppCompat.Spinner.DropDown = 0x7f0f015f net.micode.notes:style/Widget.AppCompat.Button.ButtonBar.AlertDialog = 0x7f0f012b net.micode.notes:layout/notification_action = 0x7f0a0029 net.micode.notes:styleable/ButtonBarLayout = 0x7f10000f +net.micode.notes:string/abc_font_family_display_4_material = 0x7f0e000f +net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00c4 +net.micode.notes:string/datetime_dialog_ok = 0x7f0e0034 net.micode.notes:id/menu_sync = 0x7f08007d net.micode.notes:id/navigation_bar = 0x7f080083 net.micode.notes:style/Base.Widget.AppCompat.SeekBar.Discrete = 0x7f0f009a -net.micode.notes:string/datetime_dialog_ok = 0x7f0e0034 -net.micode.notes:string/abc_font_family_display_4_material = 0x7f0e000f -net.micode.notes:style/TextAppearance.AppCompat.Display1 = 0x7f0f00c4 net.micode.notes:string/app_name = 0x7f0e002d net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0f00a0 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Title = 0x7f0f002b @@ -332,12 +333,12 @@ net.micode.notes:string/abc_shareactionprovider_share_with_application = 0x7f0e0 net.micode.notes:id/text_num = 0x7f0800be net.micode.notes:id/title_template = 0x7f0800c2 net.micode.notes:string/success_sdcard_export = 0x7f0e0095 -net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0163 -net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f00bb net.micode.notes:style/Base.Widget.AppCompat.Button.Colored = 0x7f0f0076 net.micode.notes:string/abc_searchview_description_query = 0x7f0e0020 net.micode.notes:style/TextAppearance.Compat.Notification.Title = 0x7f0f00f3 net.micode.notes:style/Base.TextAppearance.AppCompat.Small = 0x7f0f0021 +net.micode.notes:style/Widget.AppCompat.Toolbar = 0x7f0f0163 +net.micode.notes:style/RtlOverlay.Widget.AppCompat.Search.DropDown.Text = 0x7f0f00bb net.micode.notes:string/abc_searchview_description_clear = 0x7f0e001f net.micode.notes:string/abc_search_hint = 0x7f0e001e net.micode.notes:string/sync_progress_login = 0x7f0e0098 @@ -371,10 +372,10 @@ net.micode.notes:layout/abc_alert_dialog_material = 0x7f0a0009 net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0e0080 net.micode.notes:style/RtlOverlay.Widget.AppCompat.PopupMenuItem.InternalGroup = 0x7f0f00b2 net.micode.notes:raw/introduction = 0x7f0d0000 -net.micode.notes:plurals/search_results_title = 0x7f0c0000 net.micode.notes:menu/sub_folder = 0x7f0b0006 net.micode.notes:string/set_remind_time_message = 0x7f0e0093 net.micode.notes:id/action_text = 0x7f080019 +net.micode.notes:plurals/search_results_title = 0x7f0c0000 net.micode.notes:menu/note_list_options = 0x7f0b0005 net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.ActionBar.Menu = 0x7f0f0028 net.micode.notes:style/Base.Theme.AppCompat.Dialog.Alert = 0x7f0f003f @@ -387,8 +388,8 @@ net.micode.notes:layout/widget_4x = 0x7f0a0035 net.micode.notes:string/note_link_email = 0x7f0e0070 net.micode.notes:layout/abc_search_dropdown_item_icons_2line = 0x7f0a0018 net.micode.notes:drawable/hutao = 0x7f070069 -net.micode.notes:drawable/list_white_down = 0x7f07007b net.micode.notes:layout/notification_template_icon_group = 0x7f0a002c +net.micode.notes:drawable/list_white_down = 0x7f07007b net.micode.notes:styleable/FullscreenAttrs = 0x7f100017 net.micode.notes:id/clip_vertical = 0x7f080030 net.micode.notes:id/selection_menu = 0x7f0800a8 @@ -402,13 +403,13 @@ net.micode.notes:styleable/LinearLayoutCompat = 0x7f10001a net.micode.notes:layout/note_list = 0x7f0a0026 net.micode.notes:string/delete_remind_time_message = 0x7f0e0035 net.micode.notes:id/actions = 0x7f08001a -net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 net.micode.notes:string/widget_under_visit_mode = 0x7f0e00a2 +net.micode.notes:layout/abc_list_menu_item_layout = 0x7f0a0010 net.micode.notes:layout/abc_expanded_menu_layout = 0x7f0a000d net.micode.notes:string/error_note_empty_for_clock = 0x7f0e0038 +net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 net.micode.notes:style/Theme.AppCompat.Light = 0x7f0f010b net.micode.notes:style/Animation.AppCompat.Dialog = 0x7f0f0002 -net.micode.notes:layout/abc_alert_dialog_button_bar_material = 0x7f0a0008 net.micode.notes:string/menu_move_parent_folder = 0x7f0e0060 net.micode.notes:integer/status_bar_notification_info_maxnum = 0x7f090004 net.micode.notes:layout/abc_action_mode_bar = 0x7f0a0004 @@ -418,8 +419,8 @@ net.micode.notes:layout/settings_header = 0x7f0a0032 net.micode.notes:color/switch_thumb_disabled_material_light = 0x7f050054 net.micode.notes:id/action_bar_container = 0x7f08000a net.micode.notes:id/tv_modified_date = 0x7f0800c7 -net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionMode.Subtitle = 0x7f0f00e1 +net.micode.notes:layout/abc_list_menu_item_icon = 0x7f0a000f net.micode.notes:styleable/MenuItem = 0x7f10001e net.micode.notes:style/Widget.AppCompat.ListMenuView = 0x7f0f014d net.micode.notes:string/file_name_txt_format = 0x7f0e0041 @@ -453,8 +454,8 @@ net.micode.notes:id/preference_sync_button = 0x7f080092 net.micode.notes:string/abc_searchview_description_voice = 0x7f0e0023 net.micode.notes:dimen/compat_notification_large_icon_max_height = 0x7f060052 net.micode.notes:style/Widget.AppCompat.CompoundButton.CheckBox = 0x7f0f0130 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa net.micode.notes:id/prefenerece_sync_status_textview = 0x7f080091 +net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0f00fa net.micode.notes:id/tv_time = 0x7f0800c9 net.micode.notes:id/notification_main_column_container = 0x7f08008f net.micode.notes:drawable/delete = 0x7f070058 @@ -515,6 +516,10 @@ net.micode.notes:color/secondary_text_dark = 0x7f05004e net.micode.notes:id/group_divider = 0x7f080049 net.micode.notes:style/Base.TextAppearance.AppCompat.SearchResult.Subtitle = 0x7f0f001f net.micode.notes:id/fullscreen_content_controls = 0x7f080048 +net.micode.notes:layout/abc_screen_simple_overlay_action_mode = 0x7f0a0016 +net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070002 +net.micode.notes:attr/displayOptions = 0x7f030064 +net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f0116 net.micode.notes:dimen/abc_text_size_body_2_material = 0x7f06003a net.micode.notes:style/Base.Widget.AppCompat.ActionBar.Solid = 0x7f0f0068 net.micode.notes:layout/abc_list_menu_item_checkbox = 0x7f0a000e @@ -557,11 +562,10 @@ net.micode.notes:style/Base.Widget.AppCompat.ButtonBar = 0x7f0f0078 net.micode.notes:id/always = 0x7f08001f net.micode.notes:dimen/activity_horizontal_margin = 0x7f06004b net.micode.notes:id/alertTitle = 0x7f08001d -net.micode.notes:id/menu_quit_secret = 0x7f080076 -net.micode.notes:id/action_mode_close_button = 0x7f080017 net.micode.notes:string/notelist_menu_new = 0x7f0e0076 net.micode.notes:color/material_grey_50 = 0x7f05003c net.micode.notes:style/Base.TextAppearance.AppCompat.Widget.PopupMenu.Header = 0x7f0f0034 +net.micode.notes:id/action_mode_close_button = 0x7f080017 net.micode.notes:id/action_mode_bar = 0x7f080015 net.micode.notes:attr/actionOverflowButtonStyle = 0x7f03001d net.micode.notes:id/action_context_bar = 0x7f080010 @@ -733,10 +737,6 @@ net.micode.notes:drawable/abc_ic_commit_search_api_mtrl_alpha = 0x7f070016 net.micode.notes:style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse = 0x7f0f00de net.micode.notes:drawable/abc_btn_switch_to_on_mtrl_00001 = 0x7f07000b net.micode.notes:drawable/abc_btn_radio_to_on_mtrl_015 = 0x7f07000a -net.micode.notes:style/ThemeOverlay.AppCompat.ActionBar = 0x7f0f0116 -net.micode.notes:layout/abc_screen_simple_overlay_action_mode = 0x7f0a0016 -net.micode.notes:drawable/abc_btn_borderless_material = 0x7f070002 -net.micode.notes:attr/displayOptions = 0x7f030064 net.micode.notes:id/action_image = 0x7f080012 net.micode.notes:drawable/abc_ab_share_pack_mtrl_alpha = 0x7f070000 net.micode.notes:drawable/abc_action_bar_item_background_material = 0x7f070001 @@ -761,8 +761,8 @@ net.micode.notes:style/Base.TextAppearance.AppCompat.Display3 = 0x7f0f0013 net.micode.notes:id/iv_alert_icon = 0x7f080053 net.micode.notes:dimen/text_font_size_large = 0x7f06006c net.micode.notes:color/material_grey_100 = 0x7f05003a -net.micode.notes:id/et_phone = 0x7f0800d3 net.micode.notes:color/abc_tint_default = 0x7f050013 +net.micode.notes:id/et_phone = 0x7f0800d3 net.micode.notes:id/up = 0x7f0800cd net.micode.notes:id/menu_delete = 0x7f08006c net.micode.notes:drawable/abc_control_background_material = 0x7f070010 diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index d5f430f..3a12034 100644 Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt b/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt index 19b636a..f3d574b 100644 --- a/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt +++ b/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt @@ -3,6 +3,8 @@ net/micode/notes/model/WorkingNote.java net.micode.notes.model.WorkingNote$NoteSettingChangedListener net/micode/notes/gtask/data/Task.java net.micode.notes.gtask.data.Task +net/micode/notes/data/DataFetch.java + net.micode.notes.data.DataFetch net/micode/notes/gtask/data/MetaData.java net.micode.notes.gtask.data.MetaData net/micode/notes/databinding/NoteEditBinding.java @@ -47,9 +49,13 @@ net/micode/notes/ui/NotesListActivity.java net.micode.notes.ui.NotesListActivity net.micode.notes.ui.NotesListActivity$1 net.micode.notes.ui.NotesListActivity$10 + net.micode.notes.ui.NotesListActivity$10$1 + net.micode.notes.ui.NotesListActivity$10$2 net.micode.notes.ui.NotesListActivity$11 net.micode.notes.ui.NotesListActivity$12 net.micode.notes.ui.NotesListActivity$13 + net.micode.notes.ui.NotesListActivity$14 + net.micode.notes.ui.NotesListActivity$15 net.micode.notes.ui.NotesListActivity$2 net.micode.notes.ui.NotesListActivity$3 net.micode.notes.ui.NotesListActivity$4 @@ -57,8 +63,6 @@ net/micode/notes/ui/NotesListActivity.java net.micode.notes.ui.NotesListActivity$6 net.micode.notes.ui.NotesListActivity$7 net.micode.notes.ui.NotesListActivity$8 - net.micode.notes.ui.NotesListActivity$8$1 - net.micode.notes.ui.NotesListActivity$8$2 net.micode.notes.ui.NotesListActivity$9 net.micode.notes.ui.NotesListActivity$BackgroundQueryHandler net.micode.notes.ui.NotesListActivity$ListEditState @@ -81,6 +85,8 @@ net/micode/notes/ui/NoteItemData.java net.micode.notes.ui.NoteItemData net/micode/notes/gtask/exception/ActionFailureException.java net.micode.notes.gtask.exception.ActionFailureException +net/micode/notes/tool/MD5Calc.java + net.micode.notes.tool.MD5Calc net/micode/notes/ui/NoteEditActivity.java net.micode.notes.ui.NoteEditActivity net.micode.notes.ui.NoteEditActivity$1 diff --git a/app/src/main/java/net/micode/notes/data/DataFetch.java b/app/src/main/java/net/micode/notes/data/DataFetch.java new file mode 100644 index 0000000..606f837 --- /dev/null +++ b/app/src/main/java/net/micode/notes/data/DataFetch.java @@ -0,0 +1,79 @@ +package net.micode.notes.data; + +import android.content.Context; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.text.TextUtils; +import android.view.View; +import android.widget.EditText; +import android.widget.Toast; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; + +public class DataFetch extends AppCompatActivity { + /*** + * 判断文件是否存在 + * @param strFile + * @return + */ + public boolean fileIsExists(Context context, String strFile) { + boolean fileExistFlag; + try{ + context.openFileInput(strFile); + fileExistFlag = true; + } catch (FileNotFoundException e){ + fileExistFlag = false; + } + return fileExistFlag; + } + + /** + * 文件内容写函数 + * @param context + * @param file_name + * @param key + */ + public void writeFile(Context context, String file_name, String key){ + try { + FileOutputStream fos = context.openFileOutput(file_name, Context.MODE_PRIVATE); + OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8"); + osw.write(key); + osw.flush(); + fos.flush(); //输出缓冲区中所有的内容 + osw.close(); + fos.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 文件内容读取函数 + * @param context + * @param filename + */ + public String readFile(Context context, String filename) { + try { + FileInputStream fis = context.openFileInput(filename); + InputStreamReader isr = new InputStreamReader(fis, "UTF-8"); + char[] input = new char[fis.available()]; //available()用于获取filename内容的长度,但是对中文有问题,建议使用BufferReader + isr.read(input); //读取并存储到input中 + isr.close(); + fis.close();//读取完成后关闭 + String str = new String(input); + return str; + } catch (Exception e) { + e.printStackTrace(); + } + return "error"; + } + +} diff --git a/app/src/main/java/net/micode/notes/tool/MD5Calc.java b/app/src/main/java/net/micode/notes/tool/MD5Calc.java new file mode 100644 index 0000000..f0e1fab --- /dev/null +++ b/app/src/main/java/net/micode/notes/tool/MD5Calc.java @@ -0,0 +1,30 @@ +package net.micode.notes.tool; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class MD5Calc { + /** + * Java中的md5 + * @param content 输入的值 + * @return 输出md5加密后的值 + */ + public static String md5Java(String content) { + byte[] hash; + try { + hash = MessageDigest.getInstance("MD5").digest(content.getBytes()); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("NoSuchAlgorithmException", e); + } + + StringBuilder hex = new StringBuilder(hash.length * 2); + for (byte b : hash) { + if ((b & 0xFF) < 0x10) { + hex.append(0); + } + hex.append(Integer.toHexString(b & 0xff)); + } + + return hex.toString(); + } +} diff --git a/app/src/main/java/net/micode/notes/ui/EditDialog.java b/app/src/main/java/net/micode/notes/ui/EditDialog.java index 9a38ba1..99ce68b 100644 --- a/app/src/main/java/net/micode/notes/ui/EditDialog.java +++ b/app/src/main/java/net/micode/notes/ui/EditDialog.java @@ -19,7 +19,7 @@ import net.micode.notes.R; public class EditDialog extends Dialog { private Button yes, no;//确定按钮 private TextView titleTv;//消息标题文本 - private EditText et_phone;//输入电话 + private EditText et_key;//输入密码 private String titleStr;//从外界设置的title文本 private String messageStr;//从外界设置的消息文本 //确定文本和取消文本的显示内容 @@ -77,7 +77,7 @@ public class EditDialog extends Dialog { @Override public void onClick(View v) { if (yesOnclickListener != null) { - yesOnclickListener.onYesClick(et_phone.getText().toString()); + yesOnclickListener.onYesClick(et_key.getText().toString()); } } }); @@ -116,9 +116,8 @@ public class EditDialog extends Dialog { yes = (Button) findViewById(R.id.yes); no = (Button) findViewById(R.id.no); titleTv = (TextView) findViewById(R.id.title); - et_phone = (EditText) findViewById(R.id.et_phone); + et_key = (EditText) findViewById(R.id.et_phone); } - /** * 从外界Activity为Dialog设置标题 * @@ -141,7 +140,7 @@ public class EditDialog extends Dialog { * 设置确定按钮和取消被点击的接口 */ public interface onYesOnclickListener { - public void onYesClick(String phone); + public void onYesClick(String key); } public interface onNoOnclickListener { diff --git a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java index c1cc7c8..f2af1f3 100644 --- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -31,6 +31,7 @@ import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; +import android.provider.ContactsContract; import android.support.v7.app.AppCompatActivity; import android.text.Editable; import android.text.TextUtils; @@ -64,11 +65,13 @@ 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.data.DataFetch; import net.micode.notes.gtask.remote.GTaskSyncService; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; import net.micode.notes.tool.ResourceParser; +import net.micode.notes.tool.MD5Calc; import net.micode.notes.ui.NotesListAdapter.AppWidgetAttribute; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; @@ -885,44 +888,74 @@ public class NotesListActivity extends AppCompatActivity implements OnClickListe case R.id.menu_secret: { //进入私密模式 //TODO /** - * 隐私空间密码询问 + * 隐私空间密码询问,如果此前没有设置过密码,则弹出密码设置框,密码会放在data/data/net.micode.notes/files/privacy_space_key.txt文件中 */ - final EditDialog editDialog = new EditDialog(NotesListActivity.this); - editDialog.setTitle("正在进入隐私空间"); - editDialog.setYesOnclickListener("确定", new EditDialog.onYesOnclickListener() { - @Override - public void onYesClick(String phone) { - AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); - dialog.setTitle("重要提醒"); - dialog.setMessage("您确认进入私密模式吗?"); - dialog.setCancelable(false); - dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - secret_mode = 1; + DataFetch datafetch = new DataFetch(); + if(!datafetch.fileIsExists(NotesListActivity.this, "privacy_space_key.txt")){ + final EditDialog registerKeyDialog = new EditDialog(NotesListActivity.this); + registerKeyDialog.setTitle("请设置隐私空间密码"); + registerKeyDialog.setYesOnclickListener("确定", new EditDialog.onYesOnclickListener() { + @Override + public void onYesClick(String key) { + String hashed_key = MD5Calc.md5Java(key); + datafetch.writeFile(NotesListActivity.this, "privacy_space_key.txt", hashed_key); + Toast.makeText(NotesListActivity.this, "您已设置隐私空间密码", Toast.LENGTH_SHORT).show(); + registerKeyDialog.dismiss(); + } + }); + registerKeyDialog.setNoOnclickListener("取消", new EditDialog.onNoOnclickListener(){ + public void onNoClick(){ + registerKeyDialog.dismiss(); + } + }); + registerKeyDialog.show(); + } + else { + final EditDialog editKeyDialog = new EditDialog(NotesListActivity.this); + editKeyDialog.setTitle("正在进入隐私空间"); + editKeyDialog.setYesOnclickListener("确定", new EditDialog.onYesOnclickListener() { + @Override + public void onYesClick(String key) { + String correct_hashed_key = datafetch.readFile(NotesListActivity.this, "privacy_space_key.txt"); + String input_hashed_key = MD5Calc.md5Java(key); + if(correct_hashed_key.equals(input_hashed_key)){ + AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); + dialog.setTitle("重要提醒"); + dialog.setMessage("您确认进入私密模式吗?"); + dialog.setCancelable(false); + dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + secret_mode = 1; + startAsyncNotesListQuery(); + // //更换背景图 + // getWindow().setBackgroundDrawableResource(R.drawable.mi1); + Toast.makeText(NotesListActivity.this, "您已进入私密模式", Toast.LENGTH_SHORT).show(); + } + }); + dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + dialog.show(); startAsyncNotesListQuery(); -// //更换背景图 -// getWindow().setBackgroundDrawableResource(R.drawable.mi1); - Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); + editKeyDialog.dismiss(); } - }); - dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which){} - }); - dialog.show(); - startAsyncNotesListQuery(); - editDialog.dismiss(); - } - }); - editDialog.setNoOnclickListener("取消", new EditDialog.onNoOnclickListener(){ - @Override - public void onNoClick(){ - editDialog.dismiss(); - } - }); - editDialog.show(); - + else { + Toast.makeText(NotesListActivity.this, "密码输入错误!", Toast.LENGTH_SHORT).show(); + editKeyDialog.dismiss(); + } + } + }); + editKeyDialog.setNoOnclickListener("取消", new EditDialog.onNoOnclickListener() { + @Override + public void onNoClick() { + editKeyDialog.dismiss(); + } + }); + editKeyDialog.show(); + } // Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); break; }