修复菜单退出以及界面样式

2 years ago · bf73d4c0bc
parent 9567dfb80f
commit bf73d4c0bc
48 changed files with 358 additions and 320 deletions
--- a/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/.gradle/7.5/executionHistory/executionHistory.bin
--- a/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/.gradle/7.5/executionHistory/executionHistory.lock
--- a/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/.gradle/7.5/fileHashes/fileHashes.bin
--- a/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/.gradle/7.5/fileHashes/fileHashes.lock
--- a/.gradle/7.5/fileHashes/resourceHashesCache.bin
+++ b/.gradle/7.5/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/configuration-cache/cadx65my5juc9dcyzlsib2doc/buildfingerprint.bin
+++ b/.gradle/configuration-cache/cadx65my5juc9dcyzlsib2doc/buildfingerprint.bin
--- a/.gradle/configuration-cache/cadx65my5juc9dcyzlsib2doc/work.bin
+++ b/.gradle/configuration-cache/cadx65my5juc9dcyzlsib2doc/work.bin
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/app/build/intermediates/apk/debug/app-debug.apk
+++ b/app/build/intermediates/apk/debug/app-debug.apk
--- a/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
+++ b/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar
--- a/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
--- a/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
+++ b/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex
--- a/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
+++ b/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,4 +1,4 @@
-#Sun May 21 20:23:07 CST 2023
+#Sun May 21 22:01:41 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable/verify_btn_pressed.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable_verify_btn_pressed.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
@ -6,6 +6,7 @@ net.micode.notes.app-main-7\:/drawable/btn_new_note.png=E\:\\andriodProj\\my_not
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
 net.micode.notes.app-main-7\:/font/consolas.ttf=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\font_consolas.ttf.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/font_small.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat
+net.micode.notes.app-main-7\:/font-v26/font_josefin_sans.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\font-v26_font_josefin_sans.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_white.9.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_white.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_down.9.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat
@ -29,8 +30,10 @@ net.micode.notes.app-main-7\:/anim/pop_exit_anim.xml=E\:\\andriodProj\\my_note\\
 net.micode.notes.app-main-7\:/menu/call_record_folder.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/widget_2x_red.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat
 net.micode.notes.app-main-7\:/layout/widget_2x.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat
+net.micode.notes.app-main-7\:/font/font_josefin_sans.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\font_font_josefin_sans.xml.flat
 net.micode.notes.app-main-7\:/anim/anim_rotate.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\anim_anim_rotate.xml.flat
 net.micode.notes.app-main-7\:/layout/add_account_text.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat
+net.micode.notes.app-main-7\:/font/josefin_sans.ttf=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\font_josefin_sans.ttf.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/selected.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat
 net.micode.notes.app-main-7\:/anim/anim_out.xml=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\anim_anim_out.xml.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/list_blue_middle.9.png=E\:\\andriodProj\\my_note\\gitProject\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat
--- a/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
--- 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 May 21 20:23:08 CST 2023
+#Sun May 21 22:01:41 CST 2023
 path.4=13/classes.dex
 path.3=12/classes.dex
 path.2=11/classes.dex
--- a/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
+++ b/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
--- 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
--- a/app/build/intermediates/merged_res/debug/drawable_note_btn_lf.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable_note_btn_lf.png.flat
--- a/app/build/intermediates/merged_res/debug/drawable_note_btn_main.png.flat
+++ b/app/build/intermediates/merged_res/debug/drawable_note_btn_main.png.flat
--- a/app/build/intermediates/merged_res/debug/font-v26_font_josefin_sans.xml.flat
+++ b/app/build/intermediates/merged_res/debug/font-v26_font_josefin_sans.xml.flat
--- a/app/build/intermediates/merged_res/debug/font_font_josefin_sans.xml.flat
+++ b/app/build/intermediates/merged_res/debug/font_font_josefin_sans.xml.flat
--- a/app/build/intermediates/merged_res/debug/font_josefin_sans.ttf.flat
+++ b/app/build/intermediates/merged_res/debug/font_josefin_sans.ttf.flat
--- a/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
+++ b/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat
--- 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
@ -119,6 +119,10 @@
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\layout_note_item.xml.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\layout\\note_item.xml"
    },
+    {
+        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\font-v26_font_josefin_sans.xml.flat",
+        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\font-v26\\font_josefin_sans.xml"
+    },
    {
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_note_edit_color_selector_panel.png.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\note_edit_color_selector_panel.png"
@ -323,6 +327,10 @@
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\color_secondary_text_dark.xml.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\color\\secondary_text_dark.xml"
    },
+    {
+        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\font_font_josefin_sans.xml.flat",
+        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\font\\font_josefin_sans.xml"
+    },
    {
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable_backup_note_checked.png.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable\\backup_note_checked.png"
@ -363,6 +371,10 @@
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_call_record.png.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\call_record.png"
    },
+    {
+        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\font_josefin_sans.ttf.flat",
+        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\font\\josefin_sans.ttf"
+    },
    {
        "merged": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-merged_res-5:\\drawable-hdpi_list_white_single.9.png.flat",
        "source": "E:\\gradle_rep\\daemon\\7.5\\net.micode.notes.app-main-7:\\drawable-hdpi\\list_white_single.9.png"
--- a/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
+++ b/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_0.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_0.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_1.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_1.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_2.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_2.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_3.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_3.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_4.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_4.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_5.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_5.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_6.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_6.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_7.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/03b9b9b865b2a03b7f7f36d050030f4f5bf3b6f11d84eb7b18783b9be0d1a56e_7.jar
--- a/app/build/intermediates/project_dex_archive/debug/out/6d9eb325a241fbde1a89cd59255920beeaa41dd991e260e24b2f576adccd3601_5.jar
+++ b/app/build/intermediates/project_dex_archive/debug/out/6d9eb325a241fbde1a89cd59255920beeaa41dd991e260e24b2f576adccd3601_5.jar
--- 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
--- a/app/build/intermediates/runtime_symbol_list/debug/R.txt
+++ b/app/build/intermediates/runtime_symbol_list/debug/R.txt
@ -1829,6 +1829,8 @@ int drawable widget_4x_white 0x7f0800e4
 int drawable widget_4x_yellow 0x7f0800e5
 int font consolas 0x7f090000
 int font font_consolas 0x7f090001
+int font font_josefin_sans 0x7f090002
+int font josefin_sans 0x7f090003
 int id ALT 0x7f0a0000
 int id BOTTOM_END 0x7f0a0001
 int id BOTTOM_START 0x7f0a0002
--- a/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
+++ b/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt
--- a/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
+++ b/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt
@ -1830,6 +1830,8 @@ drawable widget_4x_white
 drawable widget_4x_yellow
 font consolas
 font font_consolas
+font font_josefin_sans
+font josefin_sans
 id ALT
 id BOTTOM_END
 id BOTTOM_START
--- a/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
+++ b/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
--- a/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@ -947,7 +947,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt
                }
                break;
            case NOTE_MENU:
-                mState = ListEditState.NOTE_LIST;
+                mState = ListEditState.NOTE_BTN_GROUP;
                btn_menu_btn.hiddenMenu();
                break;
            case NOTE_BTN_GROUP:
--- a/app/src/main/res/drawable/note_btn_lf.png
+++ b/app/src/main/res/drawable/note_btn_lf.png
--- a/app/src/main/res/drawable/note_btn_main.png
+++ b/app/src/main/res/drawable/note_btn_main.png
--- a/app/src/main/res/font-v26/font_josefin_sans.xml
+++ b/app/src/main/res/font-v26/font_josefin_sans.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+	<font
+			android:fontStyle="normal"
+			android:fontWeight="100"
+			android:font="@font/josefin_sans"
+	/>
+</font-family>
--- a/app/src/main/res/font/font_josefin_sans.xml
+++ b/app/src/main/res/font/font_josefin_sans.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+	<font
+			android:fontStyle="normal"
+			android:fontWeight="100"
+			android:font="@font/josefin_sans"
+	/>
+</font-family>
--- a/app/src/main/res/font/josefin_sans.ttf
+++ b/app/src/main/res/font/josefin_sans.ttf
--- a/app/src/main/res/layout/note_list.xml
+++ b/app/src/main/res/layout/note_list.xml
@ -124,8 +124,9 @@
 			android:id="@+id/empty_view"
 			android:background="#10000000"
 			android:text="MENU"
-			android:textSize="80sp"
-			android:textColor="#eeeeee"
+			android:textSize="100sp"
+			android:fontFamily="@font/josefin_sans"
+			android:textColor="#ffffff"
 			android:layout_gravity="center"
 			android:gravity="center"
 			android:layout_width="match_parent"