Fixed status bar color when cab is on while switching tabs
This commit is contained in:
parent
1dc310d657
commit
fa191b0cf4
6 changed files with 29 additions and 9 deletions
|
@ -7,6 +7,7 @@ import android.view.MenuItem
|
||||||
import androidx.annotation.MenuRes
|
import androidx.annotation.MenuRes
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import code.name.monkey.appthemehelper.util.VersionUtils
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.extensions.surfaceColor
|
import code.name.monkey.retromusic.extensions.surfaceColor
|
||||||
import code.name.monkey.retromusic.interfaces.ICabCallback
|
import code.name.monkey.retromusic.interfaces.ICabCallback
|
||||||
|
@ -31,7 +32,10 @@ abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
|
||||||
|
|
||||||
override fun onCabFinished(cab: AttachedCab): Boolean {
|
override fun onCabFinished(cab: AttachedCab): Boolean {
|
||||||
clearChecked()
|
clearChecked()
|
||||||
activity.window.statusBarColor = Color.TRANSPARENT
|
activity.window.statusBarColor = when {
|
||||||
|
VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
|
||||||
|
else -> Color.BLACK
|
||||||
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -346,6 +346,13 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
|
||||||
libraryViewModel.forceReload(ReloadType.Albums)
|
libraryViewModel.forceReload(ReloadType.Albums)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
super.onPause()
|
||||||
|
if (cab.isActive()) {
|
||||||
|
cab.destroy()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun handleBackPress(): Boolean {
|
private fun handleBackPress(): Boolean {
|
||||||
cab?.let {
|
cab?.let {
|
||||||
if (it.isActive()) {
|
if (it.isActive()) {
|
||||||
|
|
|
@ -382,4 +382,11 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
|
||||||
super.onResume()
|
super.onResume()
|
||||||
libraryViewModel.forceReload(ReloadType.Artists)
|
libraryViewModel.forceReload(ReloadType.Artists)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
super.onPause()
|
||||||
|
if (cab.isActive()) {
|
||||||
|
cab.destroy()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -148,12 +148,8 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
saveScrollPosition()
|
saveScrollPosition()
|
||||||
}
|
if (cab.isActive()) {
|
||||||
|
cab.destroy()
|
||||||
override fun onSaveInstanceState(outState: Bundle) {
|
|
||||||
super.onSaveInstanceState(outState)
|
|
||||||
if (_binding != null) {
|
|
||||||
outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,6 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override val titleRes: Int
|
override val titleRes: Int
|
||||||
get() = R.string.songs
|
get() = R.string.songs
|
||||||
|
|
||||||
|
@ -346,6 +345,13 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
|
||||||
libraryViewModel.forceReload(ReloadType.Songs)
|
libraryViewModel.forceReload(ReloadType.Songs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
super.onPause()
|
||||||
|
if (cab.isActive()) {
|
||||||
|
cab.destroy()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
@JvmField
|
@JvmField
|
||||||
var TAG: String = SongsFragment::class.java.simpleName
|
var TAG: String = SongsFragment::class.java.simpleName
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue