From c35607e8ce77f7f651c920f78de996627cd59157 Mon Sep 17 00:00:00 2001
From: Surponess <byx1056547649@163.com>
Date: Sun, 1 Feb 2026 10:51:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=83=8C=E6=99=AF=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Notes-master/res/layout/note_edit.xml     | 64 +++++++++++--------
 .../net/micode/notes/ui/NoteEditActivity.java |  3 +
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/Notes-master/res/layout/note_edit.xml b/src/Notes-master/res/layout/note_edit.xml
index 236ac74..12ca889 100644
--- a/src/Notes-master/res/layout/note_edit.xml
+++ b/src/Notes-master/res/layout/note_edit.xml
@@ -211,7 +211,7 @@
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:layout_marginEnd="4dp"
-                        android:background="@drawable/bg_btn_set_color"
+                        android:background="@drawable/bg_btn_insert_photo"
                         android:backgroundTint="@null"
                         android:focusable="false"
                         android:clickable="true"/>
@@ -222,7 +222,7 @@
                         android:layout_width="40dp"
                         android:layout_height="40dp"
                         android:layout_marginEnd="4dp"
-                        android:background="@drawable/bg_btn_set_color"
+                        android:background="@drawable/bg_btn_voice_transfomer"
                         android:backgroundTint="@null"
                         android:focusable="false"
                         android:clickable="true"
@@ -300,21 +300,26 @@
         android:id="@+id/note_bg_color_selector"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/note_edit_color_selector_panel"
+        android:background="#FFFFFF"
         android:layout_marginTop="30dip"
         android:layout_marginRight="8dip"
         android:layout_gravity="top|right"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:padding="4dip"
+        android:minWidth="280dip"
+        android:elevation="4dp"
+        android:orientation="horizontal">
 
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_yellow"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="#FFF9C4" />
 
             <ImageView
                 android:id="@+id/iv_bg_yellow_select"
@@ -328,14 +333,15 @@
         </FrameLayout>
 
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_blue"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="#BBDEFB" />
 
             <ImageView
                 android:id="@+id/iv_bg_blue_select"
@@ -345,19 +351,19 @@
                 android:layout_marginRight="3dip"
                 android:focusable="false"
                 android:visibility="gone"
-
                 android:src="@drawable/selected" />
         </FrameLayout>
 
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_white"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="#FFFFFF" />
 
             <ImageView
                 android:id="@+id/iv_bg_white_select"
@@ -371,14 +377,15 @@
         </FrameLayout>
 
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_green"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="#C8E6C9" />
 
             <ImageView
                 android:id="@+id/iv_bg_green_select"
@@ -391,14 +398,15 @@
         </FrameLayout>
 
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_red"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                android:background="#FFCDD2" />
 
             <ImageView
                 android:id="@+id/iv_bg_red_select"
@@ -412,9 +420,9 @@
 
         <!-- Custom background image option -->
         <FrameLayout
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_margin="4dip">
 
             <ImageView
                 android:id="@+id/iv_bg_custom"
diff --git a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
index 032779e..5a3ac8a 100644
--- a/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master/src/net/micode/notes/ui/NoteEditActivity.java
@@ -977,6 +977,9 @@ public class NoteEditActivity extends BaseActivity implements OnClickListener,
             Integer bgColorId = sBgSelectorBtnsMap.get(id);
             if (bgColorId == -1) {
                 // 处理自定义背景图片选择
+                findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
+                        View.GONE);
+                mWorkingNote.setBgColorId(bgColorId);
                 mNoteBgColorSelector.setVisibility(View.GONE);
                 pickBackgroundImageFromGallery();
             } else {