diff --git a/.gradle/7.0.2/executionHistory/executionHistory.bin b/.gradle/7.0.2/executionHistory/executionHistory.bin index 77cf668..6a713a6 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 3f1039b..2923218 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 222a8b1..f425883 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 abaee8e..fd37e8c 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 0748526..a4ee2d9 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/javaCompile.lock b/.gradle/7.0.2/javaCompile/javaCompile.lock index 0bb9dc4..c63490a 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 7bae0e8..5cee1ed 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index c989db4..c21bef2 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,17 @@ - + - + - - + + - - + + \ No newline at end of file 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 48ffd1b..97adb86 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 c886405..7e4cf89 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 8fb3ce4..115a041 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 5217f62..bb16015 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 f540dd1..3df5b7b 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 d8b3efe..6f0ca7b 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 acef87e..05d7ef0 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 7c9d9ae..7ae5335 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 @@ -#Sun Dec 10 22:15:36 CST 2023 +#Sun Dec 10 22:21:05 CST 2023 D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list_footer.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat @@ -11,8 +11,8 @@ D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_ D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat +D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_list.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\widget_2x.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\menu\\note_list_options.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat @@ -34,15 +34,15 @@ D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\font_large.p D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\mi.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_mi.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\menu\\note_edit.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\hutao.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_hutao.png.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\op_start.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_op_start.png.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\account_dialog_title.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat @@ -53,18 +53,18 @@ D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\menu\\note_list_dropdown.xm D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\xml\\preferences.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\color\\primary_text_dark.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\mi1.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_mi1.png.flat +D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\folder_list_item.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable\\new_note.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\xml\\searchable.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\xml\\widget_4x_info.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\delete.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\settings_header.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\add_account_text.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\dialog_edit.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit.xml.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\color\\secondary_text_dark.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\menu\\sub_folder.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\font_super.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat @@ -94,12 +94,12 @@ D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\edit_title_r D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\xml\\widget_2x_info.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\keli.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_keli.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat +D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\note_edit_list_item.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\selected.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\activity_splash.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat +D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\clock.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat D\:\\Android\\Projects\\Notes1\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat +D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\incremental\\mergeDebugResources\\stripped.dir\\layout\\activity_splash.xml=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_splash.xml.flat diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index c134bf5..260ba2a 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -2600,7 +2600,7 @@ 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" + 60%90%50%70%45%72%"转到主屏幕""转到上一层级""更多选项""完成""查看全部""选择应用""关闭""开启""Alt+""Ctrl+""Delete 键""Enter 键""Fn+""Meta+""Shift+""空格键""Sym+""Menu+""搜索…""清除查询""搜索查询""搜索""提交查询""语音搜索""分享方式""使用%s分享""收起""搜索""瀏覽主頁""向上瀏覽""更多選項""完成""顯示全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""刪除""Enter 鍵""Fn +""Meta +""Shift +""空白鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""分享對象""使用「%s」分享""收合""搜尋""瀏覽首頁""向上瀏覽""更多選項""完成""查看全部""選擇應用程式""關閉""開啟""Alt +""Ctrl +""Delete 鍵""Enter 鍵""Fn +""Meta +""Shift +""空格鍵""Sym +""Menu +""搜尋…""清除查詢""搜尋查詢""搜尋""提交查詢""語音搜尋""選擇分享對象""與「%s」分享""收合""搜尋""Zulazulela ekhaya""Zulazulela phezulu""Izinketho eziningi""Kwenziwe""Buka konke""Khetha uhlelo lokusebenza""VALIWE""VULIWE""Alt+""Ctrl+""susa""enter""Function+""Meta+""Shift+""space""Sym+""Imenyu+""Iyasesha...""Sula inkinga""Umbuzo wosesho""Sesha""Hambisa umbuzo""Ukusesha ngezwi""Yabelana no-""Yabelana ne-%s""Goqa""Sesha" -%s --%s --%s @@ -2683,7 +2683,7 @@ 郵件 便簽便簽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“的搜尋結果 - + 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 8f396ac..b1e7a43 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 @@ -#Sun Dec 10 22:15:42 CST 2023 +#Sun Dec 10 22:39:22 CST 2023 base.0=D\:\\Android\\Projects\\Notes1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex renamed.0=classes.dex path.0=classes.dex diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class index 7eb8874..292964f 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity$1.class differ diff --git a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class index c86366f..0560089 100644 Binary files a/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class and b/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/SplashActivity.class differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex index e2d6037..fb026cc 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity$1.dex differ diff --git a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex index e004a8d..d9144f5 100644 Binary files a/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex and b/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/SplashActivity.dex differ diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index ffa55a0..7797a37 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 260282b..761b457 100644 --- a/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt +++ b/app/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt @@ -191,16 +191,16 @@ net/micode/notes/databinding/DatetimePickerBinding.java net.micode.notes.databinding.DatetimePickerBinding net/micode/notes/databinding/SettingsHeaderBinding.java net.micode.notes.databinding.SettingsHeaderBinding -net/micode/notes/ui/SplashActivity.java - net.micode.notes.ui.SplashActivity - net.micode.notes.ui.SplashActivity$1 - net.micode.notes.ui.SplashActivity$2 - net.micode.notes.ui.SplashActivity$3 +net/micode/notes/databinding/FolderListItemBinding.java + net.micode.notes.databinding.FolderListItemBinding net/micode/notes/data/Contact.java net.micode.notes.data.Contact net/micode/notes/gtask/data/SqlData.java net.micode.notes.gtask.data.SqlData net/micode/notes/ui/ShowResultActivity.java net.micode.notes.ui.ShowResultActivity -net/micode/notes/databinding/FolderListItemBinding.java - net.micode.notes.databinding.FolderListItemBinding +net/micode/notes/ui/SplashActivity.java + net.micode.notes.ui.SplashActivity + net.micode.notes.ui.SplashActivity$1 + net.micode.notes.ui.SplashActivity$2 + net.micode.notes.ui.SplashActivity$3 diff --git a/app/src/main/java/net/micode/notes/ui/SplashActivity.java b/app/src/main/java/net/micode/notes/ui/SplashActivity.java index b3405a7..fd8c821 100644 --- a/app/src/main/java/net/micode/notes/ui/SplashActivity.java +++ b/app/src/main/java/net/micode/notes/ui/SplashActivity.java @@ -5,9 +5,7 @@ import android.media.MediaPlayer; import android.os.Bundle; import android.os.Handler; import android.support.v7.app.AppCompatActivity; -import android.view.View; import android.view.animation.AlphaAnimation; -import android.widget.Button; import android.widget.TextView; import net.micode.notes.R; @@ -26,7 +24,7 @@ public class SplashActivity extends AppCompatActivity { // 创建 MediaPlayer 对象,并指定要播放的音频文件 - playAudio(R.raw.testmusic); +// playAudio(R.raw.testmusic); // 获取 TextView 的引用 @@ -39,24 +37,19 @@ public class SplashActivity extends AppCompatActivity { // 应用动画效果到 TextView 的背景上 textView.startAnimation(alphaAnimation); - //自主点击跳转 + /** + * 版本问题,目前主流已经废弃了~ + */ + /*//自主点击跳转 Button skipButton = findViewById(R.id.skip_button); skipButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // 在 Activity 销毁时停止播放音频并释放 MediaPlayer 资源 - if (mMediaPlayer != null) { - mMediaPlayer.stop(); - mMediaPlayer.release(); - mMediaPlayer = null; - } - - // 点击按钮后跳转到主页面 Intent intent = new Intent(SplashActivity.this, NotesListActivity.class); startActivity(intent); finish(); // 销毁欢迎页 } - }); + });*/ // 当计时结束时,跳转至 NotesListActivity mHandler.postDelayed(new Runnable() { diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index a33feec..12b15ed 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -42,13 +42,14 @@ -