From 484a1a37704519ce621c48f2baf16a26cdbff6c9 Mon Sep 17 00:00:00 2001
From: niushuai233 <shuai.niu@foxmail.com>
Date: Tue, 9 Apr 2024 17:08:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:fire:=20:=E4=B8=BB=E4=BD=93=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E7=AC=AC=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/niushuai/dididone/MainActivity.java   | 15 +++++++--------
 app/src/main/res/drawable/side_nav_bar_brown.xml  |  9 +++++++++
 app/src/main/res/layout/nav_header_main.xml       |  2 +-
 app/src/main/res/values/dimens.xml                |  2 +-
 app/src/main/res/values/themes.xml                |  6 +++---
 5 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/side_nav_bar_brown.xml

diff --git a/app/src/main/java/cc/niushuai/dididone/MainActivity.java b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
index 6ce3c31..00fdcb2 100644
--- a/app/src/main/java/cc/niushuai/dididone/MainActivity.java
+++ b/app/src/main/java/cc/niushuai/dididone/MainActivity.java
@@ -1,7 +1,6 @@
 package cc.niushuai.dididone;
 
 import android.os.Bundle;
-import android.view.Menu;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.LayoutInflaterCompat;
@@ -60,7 +59,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_statistic)
+                R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_setting)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);
@@ -68,12 +67,12 @@ public class MainActivity extends AppCompatActivity {
         NavigationUI.setupWithNavController(navigationView, navController);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        // Inflate the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.main, menu);
+//        return true;
+//    }
 
     @Override
     public boolean onSupportNavigateUp() {
diff --git a/app/src/main/res/drawable/side_nav_bar_brown.xml b/app/src/main/res/drawable/side_nav_bar_brown.xml
new file mode 100644
index 0000000..6bf3bb9
--- /dev/null
+++ b/app/src/main/res/drawable/side_nav_bar_brown.xml
@@ -0,0 +1,9 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="135"
+        android:endColor="#86E35ED5"
+        android:centerColor="#B2CA9E2F"
+        android:startColor="#5E8BF8A3"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 625f015..dc9cf34 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/side_nav_bar"
+    android:background="@drawable/side_nav_bar_brown"
     android:gravity="bottom"
     android:orientation="vertical"
     android:paddingLeft="@dimen/activity_horizontal_margin"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4ab4520..74d450c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,6 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">155dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 24ef365..46607d1 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.DiDiDone" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">#F0B82B</item>
+        <item name="colorPrimaryVariant">#F0B82B</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>