From 4de51eb9e36de59672c2793cbf0ab234d0d1c003 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Sat, 26 Oct 2019 14:02:38 +0530 Subject: [PATCH] Fix peak theme controller --- .../player/peak/PeakPlayerControlFragment.kt | 26 ++++++++++++++----- .../main/res/layout/fragment_peak_player.xml | 3 +-- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt index 3a61a222f..16d9f4ed9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt @@ -128,13 +128,13 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { } private fun updatePlayPauseDrawableState() { - when { - MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) - else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) + if (MusicPlayerRemote.isPlaying) { + playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) + } else { + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) } } - private fun setUpMusicControllers() { setUpPlayPauseFab() setUpPrevNext() @@ -144,11 +144,17 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { } private fun setUpShuffleButton() { - shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() } + shuffleButton.setOnClickListener { + println("shuffleButton Click") + MusicPlayerRemote.toggleShuffleMode() + } } private fun setUpRepeatButton() { - repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() } + repeatButton.setOnClickListener { + println("repeatButton Click") + MusicPlayerRemote.cycleRepeatMode() + } } override fun setUpProgressSlider() { @@ -214,4 +220,12 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { super.onServiceConnected() updatePlayPauseDrawableState() } + + override fun onRepeatModeChanged() { + updateRepeatState() + } + + override fun onShuffleModeChanged() { + updateShuffleState() + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml index 00852f0c9..3d288f694 100644 --- a/app/src/main/res/layout/fragment_peak_player.xml +++ b/app/src/main/res/layout/fragment_peak_player.xml @@ -65,7 +65,6 @@ android:focusable="true" android:focusableInTouchMode="true" android:freezesText="true" - android:gravity="center" android:marqueeRepeatLimit="marquee_forever" android:scrollHorizontally="true" android:singleLine="true" @@ -75,7 +74,7 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toEndOf="@+id/imageContainer" app:layout_constraintTop_toBottomOf="@+id/toolbarContainer" - tools:text="@tools:sample/lorem/random" /> + tools:text="@tools:sample/lorem" />