From dda7edc035bd95810e2d09cbbc2ce3b72f559a4b Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Thu, 11 Apr 2024 11:09:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:hushed:=20=E8=A7=A3=E5=86=B3=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/niushuai/dididone/MainActivity.java    |  2 +-
 .../dididone/ui/setting/SettingFragment.java  |  2 -
 .../main/res/layout/fragment_setting.xml.bak  | 81 -------------------
 .../main/res/menu/activity_main_drawer.xml    |  4 +-
 .../main/res/navigation/mobile_navigation.xml | 11 ++-
 app/src/main/res/values/ids.xml               |  2 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 15 insertions(+), 88 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_setting.xml.bak

diff --git a/app/src/main/java/cc/niushuai/dididone/MainActivity.java b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
index c1ea6d9..8731fec 100644
--- a/app/src/main/java/cc/niushuai/dididone/MainActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
@@ -64,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
         mAppBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_setting)
+                R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_icon)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
diff --git a/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
index b96c312..aa006bc 100644
--- a/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
+++ b/app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
@@ -40,8 +40,6 @@ public class SettingFragment extends Fragment {
         binding.sSetAppIcon.setOnClickListener(view -> {
             Log.d(getTag(), "sSetAppIcon click");
 
-            ActivityUtil.startActivity(getActivity(), IconActivity.class);
-
             Log.d(getTag(), "sSetAppIcon click complete");
         });
     }
diff --git a/app/src/main/res/layout/fragment_setting.xml.bak b/app/src/main/res/layout/fragment_setting.xml.bak
deleted file mode 100644
index 60721d8..0000000
--- a/app/src/main/res/layout/fragment_setting.xml.bak
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/gray_light"
-    tools:context=".ui.setting.SettingFragment">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:text="@string/s_set_app"
-            android:textAlignment="inherit"
-            android:textColor="#CE21D873"
-            android:textSize="30dp" />
-
-        <LinearLayout
-            android:id="@+id/s_set_app_icon"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/s_set_linear_layout_height"
-            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
-            android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
-            android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
-            android:layout_gravity="center_vertical"
-            android:background="@drawable/round_text_view_15dp"
-            >
-
-            <ImageView
-                android:layout_width="@dimen/s_set_linear_image_view_size"
-                android:layout_height="@dimen/s_set_linear_image_view_size"
-                android:layout_marginLeft="@dimen/s_set_linear_image_view_marginLeft"
-                android:layout_marginTop="@dimen/s_set_linear_image_view_marginTop"
-                app:ico_color="@color/gray"
-                app:ico_icon="faw_laugh" />
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/s_set_linear_text_view_marginLeft"
-                android:gravity="left|center"
-                android:text="@string/s_set_icon"
-                android:textSize="20dp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/s_set_app_project"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/s_set_linear_layout_height"
-            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
-            android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
-            android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
-            android:background="@drawable/round_text_view_15dp"
-            >
-
-            <ImageView
-                android:layout_width="@dimen/s_set_linear_image_view_size"
-                android:layout_height="@dimen/s_set_linear_image_view_size"
-                android:layout_marginLeft="@dimen/s_set_linear_image_view_marginLeft"
-                android:layout_marginTop="@dimen/s_set_linear_image_view_marginTop"
-                app:ico_color="@color/gray"
-                app:ico_icon="cmd_cards_variant" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginLeft="@dimen/s_set_linear_text_view_marginLeft"
-                android:gravity="left|center"
-                android:text="@string/s_set_project"
-                android:textSize="20dp" />
-        </LinearLayout>
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index af8f537..4834691 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -13,8 +13,8 @@
             android:icon="@drawable/ic_menu_gallery"
             android:title="@string/n_menu_name_statistic" />
         <item
-            android:id="@id/n_nav_setting"
+            android:id="@id/n_nav_icon"
             android:icon="@drawable/ic_menu_slideshow"
-            android:title="@string/n_menu_name_setting" />
+            android:title="@string/n_menu_name_icon" />
     </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 16ca443..dedb90b 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -16,10 +16,17 @@
         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" />
+        tools:layout="@layout/fragment_setting" />-->
+
+    <fragment
+        android:id="@id/n_nav_icon"
+        android:name="cc.niushuai.dididone.ui.setting.icon.IconFragment"
+        android:label="@string/n_menu_name_icon"
+        />
+
 </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 1870ba1..3da320e 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -7,4 +7,6 @@
     <!--日历页 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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0ea1ec8..fed344a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,5 +20,6 @@
     <string name="s_set_app">App</string>
     <string name="s_set_icon">图标</string>
     <string name="s_set_project">打卡项</string>
+    <string name="n_menu_name_icon">Icon</string>
 
 </resources>
\ No newline at end of file