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 d6e8d1ee..1ce30de0 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
@@ -24,9 +24,13 @@ import java.util.*
open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
MusicServiceEventListener {
+
val navOptions by lazy {
navOptions {
- launchSingleTop = true
+ popUpTo(R.id.action_home) {
+ inclusive = false
+ }
+ launchSingleTop = false
anim {
enter = R.anim.retro_fragment_open_enter
exit = R.anim.retro_fragment_open_exit
@@ -35,6 +39,7 @@ open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
}
}
}
+
var playerActivity: AbsMusicServiceActivity? = null
private set
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
index c4ef8d2b..65ad534a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
@@ -87,7 +87,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) ||
FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) ||
FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton()));
- public static final String PATH = "path";
+
private static final String CRUMBS = "crumbs";
private static final int LOADER_ID = 5;
private SongFileAdapter adapter;
@@ -128,18 +128,6 @@ public class FoldersFragment extends AbsMainActivityFragment implements
return startFolder;
}
- public static FoldersFragment newInstance(File directory) {
- FoldersFragment frag = new FoldersFragment();
- Bundle b = new Bundle();
- b.putSerializable(PATH, directory);
- frag.setArguments(b);
- return frag;
- }
-
- public static FoldersFragment newInstance(Context context) {
- return newInstance(PreferenceUtil.INSTANCE.getStartDirectory());
- }
-
private static File tryGetCanonicalFile(File file) {
try {
return file.getCanonicalFile();
@@ -174,7 +162,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
if (savedInstanceState == null) {
//noinspection ConstantConditions
- setCrumb(new BreadCrumbLayout.Crumb(FileUtil.safeGetCanonicalFile((File) requireArguments().getSerializable(PATH))), true);
+ setCrumb(new BreadCrumbLayout.Crumb(FileUtil.safeGetCanonicalFile(PreferenceUtil.INSTANCE.getStartDirectory())), true);
} else {
breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS));
getLoaderManager().initLoader(LOADER_ID, null, this);
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 1c743f92..41d40f09 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,19 +5,17 @@ import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.NavigationUI
import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.findNavController
import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.fragments.folder.FoldersFragment
-import code.name.monkey.retromusic.util.PreferenceUtil
import com.google.android.material.appbar.AppBarLayout
import kotlinx.android.synthetic.main.fragment_library.*
class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
-
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
setHasOptionsMenu(true)
@@ -36,26 +34,7 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
private fun setupNavigationController() {
val navController = findNavController(R.id.fragment_container)
- mainActivity.getBottomNavigationView().setOnNavigationItemSelectedListener {
- var handled = false
- if (navController.graph.findNode(it.itemId) != null) {
- navController.navigate(it.itemId, null, navOptions)
- handled = true
- }
- when (it.itemId) {
- R.id.action_folder -> navController.navigate(
- R.id.action_folder,
- Bundle().apply {
- putSerializable(
- FoldersFragment.PATH,
- PreferenceUtil.startDirectory
- )
- },
- navOptions
- )
- }
- return@setOnNavigationItemSelectedListener handled
- }
+ NavigationUI.setupWithNavController(mainActivity.getBottomNavigationView(), navController)
}
override fun onPrepareOptionsMenu(menu: Menu) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
index 6e8760dc..833aba8b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
@@ -52,7 +52,7 @@ class PlayerPlaybackControlsFragment :
showBonceAnimation(playPauseButton)
}
title.isSelected = true
-
+ text.isSelected = true
}
override fun setColor(color: MediaNotificationProcessor) {
diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml
index 345a4ed7..e22bfae2 100644
--- a/app/src/main/res/layout/bread_crumb.xml
+++ b/app/src/main/res/layout/bread_crumb.xml
@@ -15,7 +15,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="8dp"
- android:textAllCaps="true"
+ android:textAllCaps="false"
+ android:textAppearance="@style/TextViewNormal"
android:textColor="#fff"
tools:ignore="RtlSymmetry,UnusedAttribute"
tools:text="Storage"
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 23b8b3e8..fefa849b 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -42,7 +42,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-