From f6002b0c6c5ce14eb261db65c08d2b8404273213 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Mon, 20 Mar 2023 17:12:23 +0530 Subject: [PATCH] Code cleanup --- .../base/AbsSlidingMusicPanelActivity.kt | 68 +++++++++++++++---- .../fragments/base/AbsPlayerFragment.kt | 2 - .../player/adaptive/AdaptiveFragment.kt | 5 -- .../player/blur/BlurPlayerFragment.kt | 4 -- .../fragments/player/card/CardFragment.kt | 5 -- .../player/cardblur/CardBlurFragment.kt | 5 -- .../player/circle/CirclePlayerFragment.kt | 2 - .../player/classic/ClassicPlayerFragment.kt | 18 +++-- .../fragments/player/color/ColorFragment.kt | 5 -- .../fragments/player/fit/FitFragment.kt | 5 -- .../player/flat/FlatPlayerFragment.kt | 5 -- .../player/full/FullPlayerFragment.kt | 4 -- .../player/gradient/GradientPlayerFragment.kt | 32 ++++++--- .../player/home/HomePlayerFragment.kt | 4 -- .../player/material/MaterialFragment.kt | 5 -- .../fragments/player/md3/MD3PlayerFragment.kt | 5 -- .../fragments/player/normal/PlayerFragment.kt | 5 -- .../player/peek/PeekPlayerFragment.kt | 4 -- .../player/plain/PlainPlayerFragment.kt | 5 -- .../player/simple/SimplePlayerFragment.kt | 4 -- .../player/tiny/TinyPlayerFragment.kt | 4 -- 21 files changed, 86 insertions(+), 110 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index 2f19dc711..246e9ba27 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -34,10 +34,44 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.fragment.app.commit import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.* +import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP +import code.name.monkey.retromusic.ALBUM_COVER_STYLE +import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM +import code.name.monkey.retromusic.CAROUSEL_EFFECT +import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON +import code.name.monkey.retromusic.EXTRA_SONG_INFO +import code.name.monkey.retromusic.KEEP_SCREEN_ON +import code.name.monkey.retromusic.LIBRARY_CATEGORIES +import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID +import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.SCREEN_ON_LYRICS +import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING +import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS +import code.name.monkey.retromusic.TAB_TEXT_MODE +import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS +import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN +import code.name.monkey.retromusic.TOGGLE_VOLUME import code.name.monkey.retromusic.activities.PermissionActivity import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.currentFragment +import code.name.monkey.retromusic.extensions.darkAccentColor +import code.name.monkey.retromusic.extensions.dip +import code.name.monkey.retromusic.extensions.getBottomInsets +import code.name.monkey.retromusic.extensions.hide +import code.name.monkey.retromusic.extensions.isColorLight +import code.name.monkey.retromusic.extensions.isLandscape +import code.name.monkey.retromusic.extensions.keepScreenOn +import code.name.monkey.retromusic.extensions.maybeSetScreenOn +import code.name.monkey.retromusic.extensions.peekHeightAnimate +import code.name.monkey.retromusic.extensions.setLightNavigationBar +import code.name.monkey.retromusic.extensions.setLightNavigationBarAuto +import code.name.monkey.retromusic.extensions.setLightStatusBar +import code.name.monkey.retromusic.extensions.setLightStatusBarAuto +import code.name.monkey.retromusic.extensions.setNavigationBarColorPreOreo +import code.name.monkey.retromusic.extensions.setTaskDescriptionColor +import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.NowPlayingScreen.* @@ -69,7 +103,13 @@ import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.util.logD import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetBehavior.* +import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING +import com.google.android.material.bottomsheet.BottomSheetBehavior.from import org.koin.androidx.viewmodel.ext.android.viewModel @@ -98,6 +138,16 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), private var navigationBarColorAnimator: ValueAnimator? = null private val argbEvaluator: ArgbEvaluator = ArgbEvaluator() + private val onBackPressedCallback = object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + println("Handle back press ${bottomSheetBehavior.state}") + if (!handleBackPress()) { + remove() + onBackPressedDispatcher.onBackPressed() + } + } + } + private val bottomSheetCallbackList by lazy { object : BottomSheetCallback() { @@ -114,6 +164,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), } override fun onStateChanged(bottomSheet: View, newState: Int) { + onBackPressedCallback.isEnabled = newState == STATE_EXPANDED when (newState) { STATE_EXPANDED -> { onPanelExpanded() @@ -172,6 +223,8 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), } navigationBarColor = surfaceColor() + + onBackPressedDispatcher.addCallback(onBackPressedCallback) } private fun setupBottomSheet() { @@ -191,14 +244,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), if (bottomSheetBehavior.state == STATE_EXPANDED) { setMiniPlayerAlphaProgress(1f) } - onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - if (!handleBackPress()) { - remove() - onBackPressedDispatcher.onBackPressed() - } - } - }) } override fun onDestroy() { @@ -363,7 +408,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), } private fun handleBackPress(): Boolean { - if (bottomSheetBehavior.peekHeight != 0 && playerFragment.onBackPressed()) return true if (panelState == STATE_EXPANDED) { collapsePanel() return true diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index a1d52c580..8be801b9d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -248,8 +248,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme abstract fun onHide() - abstract fun onBackPressed(): Boolean - abstract fun toolbarIconColor(): Int override fun onServiceConnected() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt index 4071e7dbf..e5e2159ac 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt @@ -113,11 +113,6 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) { } override fun onHide() { - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun onDestroyView() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt index 48798ff45..bd0f09c96 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt @@ -106,10 +106,6 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur), override fun onHide() { } - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor(): Int { return Color.WHITE } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt index d2ce1d9cb..3553c35ab 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt @@ -49,11 +49,6 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) { override fun onHide() { playbackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt index 9a4726610..a5ac12b2d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt @@ -62,11 +62,6 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player), override fun onHide() { playbackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt index eacc6e43d..fb1144e30 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt @@ -195,8 +195,6 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), override fun onHide() { } - override fun onBackPressed(): Boolean = false - override fun toolbarIconColor(): Int = colorControlNormal() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index eb0709792..ed51772bd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -23,6 +23,7 @@ import android.os.Bundle import android.view.View import android.view.animation.LinearInterpolator import android.widget.SeekBar +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar import androidx.fragment.app.commit @@ -163,6 +164,13 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player binding.text.setOnClickListener { goToArtist(requireActivity()) } + requireActivity().onBackPressedDispatcher.addCallback(object: OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) { + getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED + } + } + }) } private fun hideVolumeIfAvailable() { @@ -257,16 +265,6 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player override fun onHide() { } - override fun onBackPressed(): Boolean { - var wasExpanded = false - if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) { - wasExpanded = getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED - getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED - return wasExpanded - } - return wasExpanded - } - override fun toolbarIconColor(): Int { return Color.WHITE } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt index 7031f60bd..12221274d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt @@ -79,11 +79,6 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) { override fun onHide() { playbackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt index 72d219bee..54a9c9f22 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt @@ -49,11 +49,6 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) { override fun onHide() { playbackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt index 12e5343b9..23cd4f63f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt @@ -100,11 +100,6 @@ class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) { override fun onHide() { controlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index 0470188f5..9d418e21d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt @@ -86,10 +86,6 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) { override fun onHide() { } - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor(): Int { return Color.WHITE } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt index 3ab5c83f3..9cd2c7cf7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt @@ -21,6 +21,7 @@ import android.graphics.PorterDuff import android.graphics.drawable.AnimatedVectorDrawable import android.os.Bundle import android.view.View +import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.Toolbar @@ -94,16 +95,19 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play } override fun onStateChanged(bottomSheet: View, newState: Int) { + onBackPressedCallback.isEnabled = newState == STATE_EXPANDED when (newState) { STATE_EXPANDED, STATE_DRAGGING, -> { mainActivity.getBottomSheetBehavior().isDraggable = false } + STATE_COLLAPSED -> { resetToCurrentPosition() mainActivity.getBottomSheetBehavior().isDraggable = true } + else -> { mainActivity.getBottomSheetBehavior().isDraggable = true } @@ -111,6 +115,17 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play } } + private val onBackPressedCallback = object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + if (getQueuePanel().state == STATE_EXPANDED) { + getQueuePanel().state = STATE_COLLAPSED + } else { + isEnabled = false + requireActivity().onBackPressedDispatcher.onBackPressed() + } + } + } + private fun setupFavourite() { binding.playbackControlsFragment.songFavourite.setOnClickListener { toggleFavorite(MusicPlayerRemote.currentSong) @@ -164,6 +179,10 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play insets } binding.playbackControlsFragment.root.drawAboveSystemBars() + requireActivity().onBackPressedDispatcher.addCallback( + viewLifecycleOwner, + onBackPressedCallback + ) } @SuppressLint("ClickableViewAccessibility") @@ -201,16 +220,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play override fun onHide() { } - override fun onBackPressed(): Boolean { - var wasExpanded = false - if (getQueuePanel().state == STATE_EXPANDED) { - wasExpanded = getQueuePanel().state == STATE_EXPANDED - getQueuePanel().state = STATE_COLLAPSED - return wasExpanded - } - return wasExpanded - } - override fun toolbarIconColor(): Int { return Color.WHITE } @@ -417,6 +426,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) + else -> binding.shuffleButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN @@ -437,6 +447,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_ALL -> { binding.repeatButton.setImageResource(R.drawable.ic_repeat) binding.repeatButton.setColorFilter( @@ -444,6 +455,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_THIS -> { binding.repeatButton.setImageResource(R.drawable.ic_repeat_one) binding.repeatButton.setColorFilter( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt index f40a4433b..c374010dc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt @@ -84,10 +84,6 @@ class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player), binding.text.text = song.artistName } - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor(): Int { return Color.WHITE } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt index cb00c8de0..ee88983c7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt @@ -90,11 +90,6 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) { override fun onHide() { playbackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor() = colorControlNormal() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt index 850316dc8..f90aadb81 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt @@ -45,11 +45,6 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) { override fun onHide() { controlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor(): Int { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt index 381ded676..45bbac39d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt @@ -82,11 +82,6 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player), override fun onHide() { controlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor() = colorControlNormal() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt index e27ff6961..3fe563dc8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt @@ -88,10 +88,6 @@ class PeekPlayerFragment : AbsPlayerFragment(R.layout.fragment_peek_player) { override fun onHide() { } - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor() = colorControlNormal() override val paletteColor: Int diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt index 4fc01cb6d..a2cc47387 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt @@ -102,11 +102,6 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) { override fun onHide() { plainPlaybackControlsFragment.hide() - onBackPressed() - } - - override fun onBackPressed(): Boolean { - return false } override fun toolbarIconColor() = colorControlNormal() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt index 63aac7083..fd7f41e1b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt @@ -71,10 +71,6 @@ class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player) controlsFragment.hide() } - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor() = colorControlNormal() override fun onColorChanged(color: MediaNotificationProcessor) { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt index 5088d03cb..b028fc3d7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt @@ -62,10 +62,6 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player), override fun onHide() {} - override fun onBackPressed(): Boolean { - return false - } - override fun toolbarIconColor(): Int { return toolbarColor }