diff --git a/app/build.gradle b/app/build.gradle index 30e72371..44d5b417 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { } signingConfigs { release { - Properties properties = getProperties('/Users/apple/Documents/Github/retro.properties ') + Properties properties = getProperties('C:/Users/h4h13/Documents/GitHub/retro.properties ') storeFile file(getProperty(properties, 'storeFile')) keyAlias getProperty(properties, 'keyAlias') storePassword getProperty(properties, 'storePassword') diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt index 42c0d1d4..1e78b690 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt @@ -51,8 +51,7 @@ fun EditText.appHandleColor(): EditText { } -fun View.translateXAnimate(value: Float) { - println("translateXAnimate $value") +fun View.translateXAnimate(value: Float) { ObjectAnimator.ofFloat(this, "translationY", value) .apply { duration = 300 diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt index fcfdc3c2..e88000af 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt @@ -27,9 +27,6 @@ open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout), val navOptions by lazy { navOptions { - popUpTo(R.id.action_home) { - inclusive = false - } launchSingleTop = false anim { enter = R.anim.retro_fragment_open_enter diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt index 1b2144aa..10a1630e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt @@ -5,6 +5,7 @@ import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import androidx.core.text.HtmlCompat +import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController import androidx.navigation.ui.NavigationUI import code.name.monkey.appthemehelper.ThemeStore @@ -13,10 +14,12 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog -import code.name.monkey.retromusic.extensions.findNavController +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment +import code.name.monkey.retromusic.model.CategoryInfo import code.name.monkey.retromusic.state.NowPlayingPanelState +import code.name.monkey.retromusic.util.PreferenceUtil import kotlinx.android.synthetic.main.fragment_library.* import org.koin.androidx.viewmodel.ext.android.sharedViewModel @@ -53,10 +56,19 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) { } private fun setupNavigationController() { - val navController = findNavController(R.id.fragment_container) + val navHostFragment = whichFragment(R.id.fragment_container) + val navController = navHostFragment.navController + val navInflater = navController.navInflater + val navGraph = navInflater.inflate(R.navigation.library_graph) + + val categoryInfo: CategoryInfo = PreferenceUtil.libraryCategory.first { it.visible } + if (categoryInfo.visible) { + navGraph.startDestination = categoryInfo.category.id + } + navController.graph = navGraph NavigationUI.setupWithNavController(mainActivity.getBottomNavigationView(), navController) - navController.addOnDestinationChangedListener { controller, destination, arguments -> - appBarLayout.setExpanded(true,true) + navController.addOnDestinationChangedListener { _, _, _ -> + appBarLayout.setExpanded(true, true) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt index 978c2fe1..e11eb050 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt +++ b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt @@ -39,5 +39,4 @@ data class CategoryInfo( Genres(R.id.action_genre, R.string.genres, R.drawable.ic_guitar), Folder(R.id.action_folder, R.string.folders, R.drawable.ic_folder); } - } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 59a58832..67663cbe 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -28,10 +28,10 @@ tools:ignore="UnusedAttribute"> @@ -48,7 +48,5 @@ android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="match_parent" android:layout_height="match_parent" - app:defaultNavHost="true" - app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" - app:navGraph="@navigation/library_graph" /> + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> \ No newline at end of file diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml index d1f82c7f..b993244d 100755 --- a/app/src/main/res/xml/pref_advanced.xml +++ b/app/src/main/res/xml/pref_advanced.xml @@ -59,15 +59,6 @@ android:title="@string/pref_keep_screen_on_title" app:icon="@drawable/ic_settings_brigntness" /> -