From 10f76b6ac117faa708a38a4d825a38eda343902e Mon Sep 17 00:00:00 2001
From: PickupRAIN <1610526863@qq.com>
Date: Thu, 18 Jan 2024 17:13:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/AndroidManifest.xml                  | 34 ++++++-
 .../net/micode/notes/tool/ResourceParser.java | 99 ++++++++++---------
 .../net/micode/notes/ui/NoteEditActivity.java |  2 +
 src/main/res/layout/note_edit.xml             | 22 ++++-
 src/main/res/values/strings.xml               | 10 ++
 5 files changed, 120 insertions(+), 47 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index e5c7d47..4c482c1 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -36,12 +36,12 @@
         android:icon="@drawable/icon_app"
         android:label="@string/app_name" >
         <activity
-            android:name=".ui.NotesListActivity"
+            android:name=".ui.LoginView"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
             android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme"
             android:windowSoftInputMode="adjustPan" >
 
             <intent-filter>
@@ -50,6 +50,36 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.LoginActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
+        <activity
+            android:name=".ui.ChangeLoginPasswordActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
+        <activity
+            android:name=".ui.NotesListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:theme="@style/NoteTheme"
+            android:windowSoftInputMode="adjustPan" >
+        </activity>
+
         <activity
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java
index 1ad3ad6..6b35729 100644
--- a/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/main/java/net/micode/notes/tool/ResourceParser.java
@@ -30,6 +30,8 @@ public class ResourceParser {
     public static final int GREEN            = 3;
     public static final int RED              = 4;
 
+    public static final int DUCK             = 5;
+
     public static final int BG_DEFAULT_COLOR = YELLOW;
 
     public static final int TEXT_SMALL       = 0;
@@ -41,19 +43,24 @@ public class ResourceParser {
 
     public static class NoteBgResources {
         private final static int [] BG_EDIT_RESOURCES = new int [] {
-            R.drawable.edit_yellow,
-            R.drawable.edit_blue,
-            R.drawable.edit_white,
-            R.drawable.edit_green,
-            R.drawable.edit_red
+                R.drawable.edit_yellow,
+                R.drawable.edit_blue,
+                R.drawable.edit_white,
+                R.drawable.edit_green,
+                R.drawable.edit_red,
+                R.drawable.note_bg_photo_wangyi
+
+
         };
 
         private final static int [] BG_EDIT_TITLE_RESOURCES = new int [] {
-            R.drawable.edit_title_yellow,
-            R.drawable.edit_title_blue,
-            R.drawable.edit_title_white,
-            R.drawable.edit_title_green,
-            R.drawable.edit_title_red
+                R.drawable.edit_title_yellow,
+                R.drawable.edit_title_blue,
+                R.drawable.edit_title_white,
+                R.drawable.edit_title_green,
+                R.drawable.edit_title_red,
+                R.drawable.note_bg_photo_wangyi
+
         };
 
         public static int getNoteBgResource(int id) {
@@ -76,35 +83,39 @@ public class ResourceParser {
 
     public static class NoteItemBgResources {
         private final static int [] BG_FIRST_RESOURCES = new int [] {
-            R.drawable.list_yellow_up,
-            R.drawable.list_blue_up,
-            R.drawable.list_white_up,
-            R.drawable.list_green_up,
-            R.drawable.list_red_up
+                R.drawable.list_yellow_up,
+                R.drawable.list_blue_up,
+                R.drawable.list_white_up,
+                R.drawable.list_green_up,
+                R.drawable.list_red_up,
+                R.drawable.note_bg_photo_wangyi
         };
 
         private final static int [] BG_NORMAL_RESOURCES = new int [] {
-            R.drawable.list_yellow_middle,
-            R.drawable.list_blue_middle,
-            R.drawable.list_white_middle,
-            R.drawable.list_green_middle,
-            R.drawable.list_red_middle
+                R.drawable.list_yellow_middle,
+                R.drawable.list_blue_middle,
+                R.drawable.list_white_middle,
+                R.drawable.list_green_middle,
+                R.drawable.list_red_middle,
+                R.drawable.note_bg_photo_wangyi
         };
 
         private final static int [] BG_LAST_RESOURCES = new int [] {
-            R.drawable.list_yellow_down,
-            R.drawable.list_blue_down,
-            R.drawable.list_white_down,
-            R.drawable.list_green_down,
-            R.drawable.list_red_down,
+                R.drawable.list_yellow_down,
+                R.drawable.list_blue_down,
+                R.drawable.list_white_down,
+                R.drawable.list_green_down,
+                R.drawable.list_red_down,
+                R.drawable.note_bg_photo_wangyi
         };
 
         private final static int [] BG_SINGLE_RESOURCES = new int [] {
-            R.drawable.list_yellow_single,
-            R.drawable.list_blue_single,
-            R.drawable.list_white_single,
-            R.drawable.list_green_single,
-            R.drawable.list_red_single
+                R.drawable.list_yellow_single,
+                R.drawable.list_blue_single,
+                R.drawable.list_white_single,
+                R.drawable.list_green_single,
+                R.drawable.list_red_single,
+                R.drawable.note_bg_photo_wangyi
         };
 
         public static int getNoteBgFirstRes(int id) {
@@ -130,11 +141,11 @@ public class ResourceParser {
 
     public static class WidgetBgResources {
         private final static int [] BG_2X_RESOURCES = new int [] {
-            R.drawable.widget_2x_yellow,
-            R.drawable.widget_2x_blue,
-            R.drawable.widget_2x_white,
-            R.drawable.widget_2x_green,
-            R.drawable.widget_2x_red,
+                R.drawable.widget_2x_yellow,
+                R.drawable.widget_2x_blue,
+                R.drawable.widget_2x_white,
+                R.drawable.widget_2x_green,
+                R.drawable.widget_2x_red,
         };
 
         public static int getWidget2xBgResource(int id) {
@@ -142,11 +153,11 @@ public class ResourceParser {
         }
 
         private final static int [] BG_4X_RESOURCES = new int [] {
-            R.drawable.widget_4x_yellow,
-            R.drawable.widget_4x_blue,
-            R.drawable.widget_4x_white,
-            R.drawable.widget_4x_green,
-            R.drawable.widget_4x_red
+                R.drawable.widget_4x_yellow,
+                R.drawable.widget_4x_blue,
+                R.drawable.widget_4x_white,
+                R.drawable.widget_4x_green,
+                R.drawable.widget_4x_red
         };
 
         public static int getWidget4xBgResource(int id) {
@@ -156,10 +167,10 @@ public class ResourceParser {
 
     public static class TextAppearanceResources {
         private final static int [] TEXTAPPEARANCE_RESOURCES = new int [] {
-            R.style.TextAppearanceNormal,
-            R.style.TextAppearanceMedium,
-            R.style.TextAppearanceLarge,
-            R.style.TextAppearanceSuper
+                R.style.TextAppearanceNormal,
+                R.style.TextAppearanceMedium,
+                R.style.TextAppearanceLarge,
+                R.style.TextAppearanceSuper
         };
 
         public static int getTexAppearanceResource(int id) {
diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 839a139..ba9e8c8 100644
--- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -93,6 +93,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_ph_duck, ResourceParser.DUCK);
     }
 
     private static final Map<Integer, Integer> sBgSelectorSelectionMap = new HashMap<Integer, Integer>();
@@ -102,6 +103,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.DUCK, R.id.iv_ph_duck_select);
     }
 
     private static final Map<Integer, Integer> sFontSizeBtnsMap = new HashMap<Integer, Integer>();
diff --git a/src/main/res/layout/note_edit.xml b/src/main/res/layout/note_edit.xml
index d6fcae5..9fb5782 100644
--- a/src/main/res/layout/note_edit.xml
+++ b/src/main/res/layout/note_edit.xml
@@ -133,7 +133,7 @@
         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="@drawable/note_edit_color_selector_panel_test"
         android:layout_marginTop="30dip"
         android:layout_marginRight="8dip"
         android:layout_gravity="top|right"
@@ -241,6 +241,26 @@
                 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_ph_duck"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+            <ImageView
+                android:id="@+id/iv_ph_duck_select"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:focusable="false"
+                android:visibility="gone"
+                android:src="@drawable/selected" />
+        </FrameLayout>
     </LinearLayout>
 
     <LinearLayout
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 55df868..9b6fff9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -126,6 +126,16 @@
     <string name="search">Notes</string>
     <string name="datetime_dialog_ok">set</string>
     <string name="datetime_dialog_cancel">cancel</string>
+    <string name="login_view_text">玛卡巴卡斗志昂扬</string>
+    <string name="activity_login_view">LoginView</string>
+    <string name="prompt_account">用户名:</string>
+    <string name="prompt_password">密码:</string>
+    <string name="prompt_login">登录</string>
+    <string name="cancel">取消</string>
+    <string name="app_already_quit">程序已退出</string>
+    <string name="Loading">正在登录，你给我等着</string>
+    <string name="invalid">有人抢银行啦</string>
+    <string name="font_mode_change">Font mode change</string>
     <plurals name="search_results_title">
          <item quantity="one"><xliff:g id="number" example="1">%1$s</xliff:g> result for \"<xliff:g id="search" example="???">%2$s</xliff:g>\"</item>
         <!-- Case of 0 or 2 or more results. -->