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 @@ - - - - - - - - - - - - - - - - - - - - - - \ 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" /> + android:title="@string/n_menu_name_icon" /> \ 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" /> - + + + + \ 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 @@ + + \ 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 @@ App 图标 打卡项 + Icon \ No newline at end of file