From 3b0ca1e66ec6226e5bae9cc015b321147a2d0e43 Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Mon, 22 Apr 2024 14:50:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:heavy=5Fplus=5Fsign:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/niushuai/dididone/MainActivity.java     |  3 ++-
 app/src/main/res/drawable/ic_menu_pic_fill.xml      |  9 +++++++++
 app/src/main/res/drawable/ic_menu_setting.xml       |  9 +++++++++
 app/src/main/res/menu/activity_main_drawer.xml      |  6 +++++-
 app/src/main/res/navigation/mobile_navigation.xml   | 13 +++++++------
 app/src/main/res/values/ids.xml                     |  4 ++--
 6 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_menu_pic_fill.xml
 create mode 100644 app/src/main/res/drawable/ic_menu_setting.xml

diff --git a/app/src/main/java/cc/niushuai/dididone/MainActivity.java b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
index 2d7595c..3e99b9e 100644
--- a/app/src/main/java/cc/niushuai/dididone/MainActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
@@ -47,7 +47,8 @@ public class MainActivity extends BaseActivity {
                 R.id.n_nav_calendar,
                 R.id.n_nav_statistic,
                 R.id.n_nav_project,
-                R.id.n_nav_icon)
+                R.id.n_nav_icon,
+                R.id.n_nav_setting)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
diff --git a/app/src/main/res/drawable/ic_menu_pic_fill.xml b/app/src/main/res/drawable/ic_menu_pic_fill.xml
new file mode 100644
index 0000000..2bc6251
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_pic_fill.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M842.7,128 L181.3,128C116.6,128 64,180.6 64,245.3l0,533.4C64,843.4 116.6,896 181.3,896l661.4,0C907.4,896 960,843.4 960,778.7L960,245.3C960,180.6 907.4,128 842.7,128zM288,288c35.4,0 64,28.6 64,64s-28.6,64 -64,64c-35.3,0 -64,-28.6 -64,-64S252.7,288 288,288zM832,736c0,17.7 -14.3,31.5 -32,31.5L225.9,768c-0.1,0 -0.2,0 -0.4,0 -10.1,0 -19.6,-4.3 -25.7,-12.4 -6.1,-8.2 -7.9,-18.6 -4.9,-28.4 2.3,-7.5 58.3,-183.6 180.1,-183.6 38.1,0.9 67.4,9.8 95.8,18.3 35.7,10.7 70.5,19.9 109.7,13.8 20.4,-3.3 28.9,-23.8 43.3,-70 19,-60.8 47.8,-152.7 174.7,-152.7 17.5,0 31.8,14.1 32,31.6L832,511.6 832,736z"
+      android:fillColor="#2c2c2c"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_setting.xml b/app/src/main/res/drawable/ic_menu_setting.xml
new file mode 100644
index 0000000..b7e19ad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_setting.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="128dp"
+    android:height="128dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M925.6,443.1h-41.4c-19,0 -39.1,-14.8 -44.7,-32.9l-23.7,-57.7c-9,-16.7 -5.3,-41.3 8,-54.7l29.4,-29.3c13.4,-13.5 13.4,-35.4 0,-48.8L804.4,171c-13.4,-13.4 -35.3,-13.4 -48.8,0l-29.3,29.3c-13.4,13.4 -38,17.1 -54.8,8.1l-57.6,-23.7C595.8,179.1 581,159 581,140V98.5c0,-18.9 -15.6,-34.5 -34.4,-34.5h-68.9c-19,0 -34.5,15.6 -34.5,34.5v41.4c0,19 -14.8,39.1 -32.9,44.7l-57.7,23.7c-16.7,9 -41.3,5.3 -54.7,-8.1l-29.4,-29.3c-13.4,-13.4 -35.3,-13.4 -48.7,0l-48.7,48.7c-13.4,13.4 -13.4,35.4 0,48.8l29.3,29.3c13.5,13.4 17.1,38 8.1,54.7l-23.7,57.7c-5.6,18.1 -25.7,32.9 -44.7,32.9H98.8c-19,0 -34.5,15.5 -34.5,34.5v68.9c0,19 15.5,34.5 34.5,34.5h41.3c19,0 39,14.9 44.6,32.9l23.8,57.7c8.9,16.7 5.3,41.4 -8.1,54.8l-29.3,29.3c-13.3,13.4 -13.3,35.3 0,48.8l48.8,48.8c13.4,13.4 35.3,13.4 48.7,0l29.4,-29.3c13.3,-13.4 38,-17 54.6,-8l57.8,23.7c18.1,5.6 32.9,25.7 32.9,44.7v41.2c0,18.9 15.5,34.5 34.5,34.5h68.9c18.9,0 34.4,-15.5 34.4,-34.5v-41.2c0,-19 14.9,-39.1 32.9,-44.7l57.7,-23.7c16.7,-9 41.4,-5.4 54.8,8l29.2,29.3c13.4,13.4 35.4,13.4 48.8,0l48.8,-48.8c13.4,-13.4 13.4,-35.4 0,-48.8l-29.4,-29.3c-13.3,-13.3 -17,-38 -8,-54.8l23.7,-57.7c5.7,-18.1 25.8,-32.9 44.7,-32.9h41.4c18.9,0 34.4,-15.5 34.4,-34.5v-69c-0.1,-18.8 -15.6,-34.3 -34.5,-34.3m-241.2,68.8c0,95.2 -77.1,172.3 -172.3,172.3 -95.2,0 -172.3,-77.1 -172.3,-172.3 0,-95.1 77.1,-172.3 172.3,-172.3 95.2,0.1 172.3,77.2 172.3,172.3"
+      android:fillColor="#030000"/>
+</vector>
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 900589a..6790a79 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -18,7 +18,11 @@
             android:title="@string/n_menu_name_project" />
         <item
             android:id="@id/n_nav_icon"
-            android:icon="@drawable/ic_menu_icon"
+            android:icon="@drawable/ic_menu_pic_fill"
             android:title="@string/n_menu_name_icon" />
+        <item
+            android:id="@id/n_nav_setting"
+            android:icon="@drawable/ic_menu_setting"
+            android:title="@string/n_menu_name_setting" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index adbadc8..47679f0 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -16,12 +16,7 @@
         android:name="cc.niushuai.dididone.ui.statistic.StatisticFragment"
         android:label="@string/n_menu_name_statistic"
         tools:layout="@layout/fragment_statistic" />
-    <!--
-        <fragment
-            android:id="@id/n_nav_setting"
-            android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
-            android:label="@string/n_menu_name_setting"
-            tools:layout="@layout/fragment_setting" />-->
+
 
     <fragment
         android:id="@id/n_nav_project"
@@ -33,4 +28,10 @@
         android:name="cc.niushuai.dididone.ui.setting.icon.IconFragment"
         android:label="@string/n_menu_name_icon" />
 
+    <fragment
+        android:id="@id/n_nav_setting"
+        android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
+        android:label="@string/n_menu_name_setting"
+        tools:layout="@layout/fragment_setting" />
+
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 5df30be..2e51288 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -3,10 +3,10 @@
     <!--导航菜单 id-->
     <item name="n_nav_calendar" type="id" />
     <item name="n_nav_statistic" type="id" />
+    <item name="n_nav_project" type="id" />
+    <item name="n_nav_icon" type="id" />
     <item name="n_nav_setting" type="id" />
     <!--日历页 id  数据集合-->
     <item name="c_calendar_check_in_list" type="id" />
     <item name="s_set_target_list" type="id" />
-    <item name="n_nav_icon" type="id" />
-    <item name="n_nav_project" type="id" />
 </resources>
\ No newline at end of file