diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt index 21423e176..8713de33c 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt @@ -98,6 +98,12 @@ class HomeFragment : Fragment() { ) } + R.id.action_about -> { + parentFragment?.parentFragment?.findNavController()?.navigate( + MainFragmentDirections.actionShowAbout() + ) + } + R.id.submenu_sorting -> { } // Sorting option was selected, check then and update the mode diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt index d0521892e..6566a1b38 100644 --- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsFragment.kt @@ -41,14 +41,6 @@ class SettingsFragment : Fragment() { val binding = FragmentSettingsBinding.inflate(inflater) binding.settingsToolbar.apply { - setOnMenuItemClickListener { - findNavController().navigate( - SettingsFragmentDirections.actionShowAbout() - ) - - true - } - setNavigationOnClickListener { findNavController().navigateUp() } @@ -57,7 +49,7 @@ class SettingsFragment : Fragment() { binding.applyEdge { bars -> binding.settingsAppbar.updatePadding(top = bars.top) - // The padding + clipToPadding method does not seem to work with a + // The padding + clipToPadding method does not work with a // FragmentContainerView. Do it directly in SettingsListFragment instead. } diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index cc143287f..13c51726d 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -23,7 +23,6 @@ diff --git a/app/src/main/res/menu/menu_detail.xml b/app/src/main/res/menu/menu_detail.xml deleted file mode 100644 index 3b7440e1a..000000000 --- a/app/src/main/res/menu/menu_detail.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml index 3f43384dc..761a96150 100644 --- a/app/src/main/res/menu/menu_home.xml +++ b/app/src/main/res/menu/menu_home.xml @@ -39,4 +39,10 @@ android:icon="@drawable/ic_settings" android:title="@string/set_title" app:showAsAction="never"/> + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml deleted file mode 100644 index 6c07f1147..000000000 --- a/app/src/main/res/menu/menu_settings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_main.xml b/app/src/main/res/navigation/nav_main.xml index 49824152e..b447fa884 100644 --- a/app/src/main/res/navigation/nav_main.xml +++ b/app/src/main/res/navigation/nav_main.xml @@ -38,6 +38,13 @@ app:exitAnim="@anim/anim_stationary" app:popEnterAnim="@anim/anim_stationary" app:popExitAnim="@anim/anim_nav_slide_down" /> + - - + tools:layout="@layout/fragment_settings" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml index 14636a9e3..20fd5f73d 100644 --- a/app/src/main/res/values/styles_ui.xml +++ b/app/src/main/res/values/styles_ui.xml @@ -64,7 +64,6 @@ @@ -152,7 +151,6 @@ @dimen/text_size_huge viewStart @font/inter_bold - ?attr/colorAccent