From 574491fa74923e39d9cbf900da92d3e5e70368fd Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Tue, 9 Apr 2024 16:12:17 +0800
Subject: [PATCH] fix: :ambulance: nav_header_main.xml

---
 .../java/cc/niushuai/dididone/MainActivity.java    |  2 +-
 app/src/main/res/layout/nav_header_main.xml        | 13 ++++++++-----
 app/src/main/res/menu/activity_main_drawer.xml     | 12 ++++++------
 app/src/main/res/navigation/mobile_navigation.xml  | 14 +++++++-------
 app/src/main/res/values/ids.xml                    |  6 ++++++
 5 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/values/ids.xml

diff --git a/app/src/main/java/cc/niushuai/dididone/MainActivity.java b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
index 6eb66f6..aae9772 100644
--- a/app/src/main/java/cc/niushuai/dididone/MainActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
@@ -62,7 +62,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.nav_home, R.id.nav_gallery, R.id.nav_slideshow)
+                R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_statistic)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index c145545..625f015 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -14,22 +14,25 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        app:ico_color="@color/red"
+        app:ico_icon="ion_ios_heart"
+        />
+<!--        app:srcCompat="@mipmap/ic_launcher_round"-->
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/nav_header_title"
+        android:text="@string/n_nav_header_title"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/nav_header_subtitle" />
+        android:text="@string/n_nav_header_subtitle" />
 </LinearLayout>
\ 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 d7f2df2..af8f537 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -5,16 +5,16 @@
 
     <group android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_home"
+            android:id="@id/n_nav_calendar"
             android:icon="@drawable/ic_menu_camera"
-            android:title="@string/menu_home" />
+            android:title="@string/n_menu_name_calendar" />
         <item
-            android:id="@+id/nav_gallery"
+            android:id="@id/n_nav_statistic"
             android:icon="@drawable/ic_menu_gallery"
-            android:title="@string/menu_gallery" />
+            android:title="@string/n_menu_name_statistic" />
         <item
-            android:id="@+id/nav_slideshow"
+            android:id="@id/n_nav_setting"
             android:icon="@drawable/ic_menu_slideshow"
-            android:title="@string/menu_slideshow" />
+            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 3ea909d..6e89fb2 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -3,23 +3,23 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobile_navigation"
-    app:startDestination="@+id/nav_home">
+    app:startDestination="@id/n_nav_calendar">
 
     <fragment
-        android:id="@+id/nav_home"
+        android:id="@id/n_nav_calendar"
         android:name="cc.niushuai.dididone.ui.home.HomeFragment"
-        android:label="@string/menu_home"
+        android:label="@string/n_menu_name_calendar"
         tools:layout="@layout/fragment_home" />
 
     <fragment
-        android:id="@+id/nav_gallery"
+        android:id="@id/n_nav_statistic"
         android:name="cc.niushuai.dididone.ui.gallery.GalleryFragment"
-        android:label="@string/menu_gallery"
+        android:label="@string/n_menu_name_statistic"
         tools:layout="@layout/fragment_gallery" />
 
     <fragment
-        android:id="@+id/nav_slideshow"
+        android:id="@id/n_nav_setting"
         android:name="cc.niushuai.dididone.ui.slideshow.SlideshowFragment"
-        android:label="@string/menu_slideshow"
+        android:label="@string/n_menu_name_setting"
         tools:layout="@layout/fragment_slideshow" />
 </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
new file mode 100644
index 0000000..1ae9eea
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="n_nav_calendar" type="id"/>
+    <item name="n_nav_statistic" type="id"/>
+    <item name="n_nav_setting" type="id"/>
+</resources>
\ No newline at end of file