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 @@ + + + \ 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 @@ 16dp 16dp 8dp - 176dp + 155dp 16dp \ 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 @@