diff --git a/app/build.gradle b/app/build.gradle index 231236e25..fd0d346b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,7 @@ android { versionNameSuffix ' DEBUG' } } - flavorDimensions "version" + flavorDimensions = ["version"] productFlavors { normal { dimension "version" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt index 26a1c8b36..4d8556377 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt @@ -147,7 +147,9 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper) + if (_binding != null) { + outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper) + } } private fun setUpTitle() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt index 7ea737b7c..6970148a3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt @@ -9,7 +9,7 @@ class HomeBinding( val container = homeBinding.container val contentContainer = homeBinding.contentContainer val appBarLayout = homeBinding.appBarLayout - val toolbar = homeBinding.toolbar + val toolbar = homeBinding.appBarLayout.toolbar val bannerImage = homeBinding.imageLayout.bannerImage val userImage = homeBinding.imageLayout.userImage val lastAdded = homeBinding.homeContent.absPlaylists.lastAdded @@ -18,6 +18,5 @@ class HomeBinding( val history = homeBinding.homeContent.absPlaylists.history val recyclerView = homeBinding.homeContent.recyclerView val titleWelcome = homeBinding.imageLayout.titleWelcome - val appNameText = homeBinding.appNameText val suggestions = homeBinding.homeContent.suggestions } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt index 729fa44fb..1bac40a7f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt @@ -179,7 +179,7 @@ class HomeFragment : } val hexColor = String.format("#%06X", 0xFFFFFF and accentColor()) val appName = "Retro Music".parseAsHtml() - binding.appNameText.text = appName + binding.appBarLayout.title = appName } private fun loadProfile() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt index 5b8508379..24218f6fb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt @@ -17,6 +17,7 @@ package code.name.monkey.retromusic.fragments.settings import android.os.Bundle import android.view.View import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference +import code.name.monkey.retromusic.APPBAR_MODE import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE import code.name.monkey.retromusic.R @@ -47,5 +48,10 @@ class PersonalizeSettingsFragment : AbsSettingsFragment() { setSummary(prefs, newValue) true } + val appBarMode: ATEListPreference? = findPreference(APPBAR_MODE) + appBarMode?.setOnPreferenceChangeListener { _, _ -> + restartActivity() + true + } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt index 2b180e072..407124c01 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt @@ -39,14 +39,11 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback { } private fun setupToolbar() { - applyToolbar(binding.toolbar) - binding.toolbar.setNavigationOnClickListener { - requireActivity().onBackPressedDispatcher.onBackPressed() - } val navController: NavController = findNavController(R.id.contentFrame) + binding.appBarLayout.toolbar.setNavigationIcon(R.drawable.ic_arrow_back) navController.addOnDestinationChangedListener { _, _, _ -> - binding.collapsingToolbarLayout.title = - navController.currentDestination?.let { getStringFromDestination(it) } + binding.appBarLayout.title = + navController.currentDestination?.let { getStringFromDestination(it) }.toString() } } diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt index 7e336e74a..4d31e1149 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt @@ -59,7 +59,7 @@ class TopAppBarLayout @JvmOverloads constructor( simpleAppbarBinding?.toolbar!! } - var title: String + var title: CharSequence get() = if (mode == AppBarMode.COLLAPSING) { collapsingAppbarBinding?.collapsingToolbarLayout?.title.toString() } else { diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml index d59ff629a..a9e0cca1e 100644 --- a/app/src/main/res/layout-land/fragment_home.xml +++ b/app/src/main/res/layout-land/fragment_home.xml @@ -18,42 +18,12 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> - - - - - - - - - - - - + app:liftOnScroll="true" /> - - - - - - - - - - - - + android:theme="@style/CenteredCheckBoxTheme" /> - - - - - - - + android:theme="@style/CenteredCheckBoxTheme" /> \ No newline at end of file