修改了大量美术素材，添加了橙色主题

修改了资源转换器以适配新的主题
将新增的主题添加到可用背景色列表中

app/src/main/java/net/micode/notes/tool/ResourceParser.java

@@ -33,6 +33,7 @@ public class ResourceParser {
     public static final int WHITE = 2;
     public static final int GREEN = 3;
     public static final int RED = 4;
+    public static final int ORANGE = 5;
 
     public static final int BG_DEFAULT_COLOR = YELLOW;
 
@@ -49,7 +50,8 @@ public class ResourceParser {
                 R.drawable.edit_blue,
                 R.drawable.edit_white,
                 R.drawable.edit_green,
-                R.drawable.edit_red
+                R.drawable.edit_red,
+                R.drawable.edit_orange
         };
 
         private final static int[] BG_EDIT_TITLE_RESOURCES = new int[]{
@@ -57,7 +59,8 @@ public class ResourceParser {
                 R.drawable.edit_title_blue,
                 R.drawable.edit_title_white,
                 R.drawable.edit_title_green,
-                R.drawable.edit_title_red
+                R.drawable.edit_title_red,
+                R.drawable.edit_title_orange
         };
 
         public static int getNoteBgResource(int id) {
@@ -84,7 +87,8 @@ public class ResourceParser {
                 R.drawable.list_blue_up,
                 R.drawable.list_white_up,
                 R.drawable.list_green_up,
-                R.drawable.list_red_up
+                R.drawable.list_red_up,
+                R.drawable.list_orange_up
         };
 
         private final static int[] BG_NORMAL_RESOURCES = new int[]{
@@ -92,7 +96,8 @@ public class ResourceParser {
                 R.drawable.list_blue_middle,
                 R.drawable.list_white_middle,
                 R.drawable.list_green_middle,
-                R.drawable.list_red_middle
+                R.drawable.list_red_middle,
+                R.drawable.list_orange_middle
         };
 
         private final static int[] BG_LAST_RESOURCES = new int[]{
@@ -101,6 +106,7 @@ public class ResourceParser {
                 R.drawable.list_white_down,
                 R.drawable.list_green_down,
                 R.drawable.list_red_down,
+                R.drawable.list_orange_down
         };
 
         private final static int[] BG_SINGLE_RESOURCES = new int[]{
@@ -108,7 +114,8 @@ public class ResourceParser {
                 R.drawable.list_blue_single,
                 R.drawable.list_white_single,
                 R.drawable.list_green_single,
-                R.drawable.list_red_single
+                R.drawable.list_red_single,
+                R.drawable.list_orange_single
         };
 
         public static int getNoteBgFirstRes(int id) {
@@ -139,6 +146,7 @@ public class ResourceParser {
                 R.drawable.widget_2x_white,
                 R.drawable.widget_2x_green,
                 R.drawable.widget_2x_red,
+                R.drawable.widget_2x_orange
         };
 
         public static int getWidget2xBgResource(int id) {
@@ -150,7 +158,8 @@ public class ResourceParser {
                 R.drawable.widget_4x_blue,
                 R.drawable.widget_4x_white,
                 R.drawable.widget_4x_green,
-                R.drawable.widget_4x_red
+                R.drawable.widget_4x_red,
+                R.drawable.widget_4x_orange
         };
 
         public static int getWidget4xBgResource(int id) {

app/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java

@@ -99,6 +99,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorBtnsMap.put(R.id.iv_bg_blue, ResourceParser.BLUE);
         sBgSelectorBtnsMap.put(R.id.iv_bg_green, ResourceParser.GREEN);
         sBgSelectorBtnsMap.put(R.id.iv_bg_white, ResourceParser.WHITE);
+        sBgSelectorBtnsMap.put(R.id.iv_bg_orange, ResourceParser.ORANGE);
     }
     // 背景选择器Map
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -109,6 +110,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         sBgSelectorSelectionMap.put(ResourceParser.BLUE, R.id.iv_bg_blue_select);
         sBgSelectorSelectionMap.put(ResourceParser.GREEN, R.id.iv_bg_green_select);
         sBgSelectorSelectionMap.put(ResourceParser.WHITE, R.id.iv_bg_white_select);
+        sBgSelectorSelectionMap.put(ResourceParser.ORANGE, R.id.iv_bg_orange_select);
     }
     // 字体选择Map
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();

app/src/main/res/layout/note_edit.xml

@@ -123,6 +123,7 @@
         android:background="@drawable/bg_color_btn_mask"
         android:layout_gravity="top|right" />
 
+<!--    背景颜色选择器-->
     <LinearLayout
         android:id="@+id/note_bg_color_selector"
         android:layout_width="wrap_content"
@@ -132,7 +133,7 @@
         android:layout_marginRight="8dip"
         android:layout_gravity="top|right"
         android:visibility="gone">
-
+<!--        黄色背景-->
         <FrameLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -153,7 +154,7 @@
                 android:visibility="gone"
                 android:src="@drawable/selected" />
         </FrameLayout>
-
+<!--        蓝色背景-->
         <FrameLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -174,7 +175,7 @@
                 android:layout_marginRight="3dip"
                 android:src="@drawable/selected" />
         </FrameLayout>
-
+<!--        白色背景-->
         <FrameLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -195,7 +196,7 @@
                 android:layout_marginRight="2dip"
                 android:src="@drawable/selected" />
         </FrameLayout>
-
+<!--        绿色背景-->
         <FrameLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -215,7 +216,7 @@
                 android:visibility="gone"
                 android:src="@drawable/selected" />
         </FrameLayout>
-
+<!--        红色背景-->
         <FrameLayout
             android:layout_width="0dip"
             android:layout_height="match_parent"
@@ -235,6 +236,28 @@
                 android:visibility="gone"
                 android:src="@drawable/selected" />
         </FrameLayout>
+<!--        橙色背景(自定义)-->
+        <FrameLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_bg_orange"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <ImageView
+                android:id="@+id/iv_bg_orange_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:layout_marginRight="2dip"
+                android:src="@drawable/selected" />
+        </FrameLayout>
+
     </LinearLayout>
 
     <LinearLayout

local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Mar 31 16:29:58 CST 2023
-sdk.dir=D\:\\android studio SDK
+#Fri Apr 21 14:33:57 CST 2023
+sdk.dir=C\:\\Users\\MikkoAyaka\\AppData\\Local\\Android\\Sdk