From fae33e7cfba4bea363b810c3af2eb466e6fd2580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=80=9D=E6=BA=90?= <1308063943@qq.com>
Date: Wed, 14 May 2025 18:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                    |  1 +
 .idea/vcs.xml                                       |  4 +++-
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../main/java/net/micode/notes/MainActivity.java    |  4 +++-
 app/src/main/res/layout/activity_main.xml           |  3 ++-
 app/src/main/res/layout/note_edit_list_item.xml     | 13 ++++++-------
 app/src/main/res/layout/note_list.xml               |  2 +-
 app/src/main/res/layout/note_list_footer.xml        |  9 +++++----
 app/src/main/res/values/styles.xml                  | 10 ++++++++--
 9 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d843f34..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 663346a..3bce31f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-
+        android:theme="@style/Theme.Hsy_version"
         tools:targetApi="31">
 
         <activity
diff --git a/app/src/main/java/net/micode/notes/MainActivity.java b/app/src/main/java/net/micode/notes/MainActivity.java
index 8091753..11b7972 100644
--- a/app/src/main/java/net/micode/notes/MainActivity.java
+++ b/app/src/main/java/net/micode/notes/MainActivity.java
@@ -20,5 +20,7 @@ public class MainActivity extends AppCompatActivity {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
             return insets;
         });
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86a5d97..9608f47 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,4 +16,5 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/app/src/main/res/layout/note_edit_list_item.xml b/app/src/main/res/layout/note_edit_list_item.xml
index a885f9c..a5547e8 100644
--- a/app/src/main/res/layout/note_edit_list_item.xml
+++ b/app/src/main/res/layout/note_edit_list_item.xml
@@ -15,8 +15,7 @@
      limitations under the License.
 -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
 
@@ -24,16 +23,16 @@
         android:id="@+id/cb_edit_item"
         android:layout_width="wrap_content"
         android:layout_height="28dip"
+        android:layout_gravity="top|left"
         android:checked="false"
-        android:focusable="false"
-        android:layout_gravity="top|left" />
+        android:focusable="false" />
 
     <net.micode.notes.ui.NoteEditText
         android:id="@+id/et_edit_text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:lineSpacingMultiplier="1.2"
         android:layout_gravity="center_vertical"
-        android:textAppearance="@style/TextAppearancePrimaryItem"
-        android:background="@null" />
+        android:background="@null"
+        android:lineSpacingMultiplier="1.2"
+        android:textAppearance="@style/TextAppearancePrimaryItem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/note_list.xml b/app/src/main/res/layout/note_list.xml
index 6b25d38..54bd52c 100644
--- a/app/src/main/res/layout/note_list.xml
+++ b/app/src/main/res/layout/note_list.xml
@@ -55,4 +55,4 @@
         android:layout_height="wrap_content"
         android:focusable="false"
         android:layout_gravity="bottom" />
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/note_list_footer.xml b/app/src/main/res/layout/note_list_footer.xml
index 5ca7b22..9ebc3fc 100644
--- a/app/src/main/res/layout/note_list_footer.xml
+++ b/app/src/main/res/layout/note_list_footer.xml
@@ -15,10 +15,11 @@
      limitations under the License.
 -->
 
-<View
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="100dip"
-    android:visibility="invisible"
+    android:background="@drawable/list_footer_bg"
     android:focusable="false"
-    android:background="@drawable/list_footer_bg" />
\ No newline at end of file
+    android:visibility="invisible" />
+
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d750e65..a0323bf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,7 +63,13 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-        <item name="android:displayOptions" />
-        <item name="android:visibility">gone</item>
+        <item name="android:visibility">visible</item>
     </style>
+
+<!--    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">-->
+<!--        <item name="android:displayOptions" />-->
+<!--        <item name="android:visibility">gone</item>-->
+<!--    </style>-->
+
+
 </resources>
\ No newline at end of file