From e5021959c3eb2c3f34c37c72dd6e7d5c9441ef4c Mon Sep 17 00:00:00 2001 From: tzugen Date: Fri, 8 Apr 2022 21:24:04 +0200 Subject: [PATCH 1/2] Fix a small bug in togglePlayPause() --- .../org/moire/ultrasonic/service/MediaPlayerController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt index 98bb9206..e3978c22 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt @@ -289,7 +289,7 @@ class MediaPlayerController( @Synchronized fun togglePlayPause() { if (playbackState == Player.STATE_IDLE) autoPlayStart = true - if (controller?.isPlaying == false) { + if (controller?.isPlaying == true) { controller?.pause() } else { controller?.play() From 92ef78a36ac4054d29e3002101e8f0ecc8a6ad6b Mon Sep 17 00:00:00 2001 From: tzugen Date: Fri, 8 Apr 2022 21:28:14 +0200 Subject: [PATCH 2/2] Move alpha value to const val. --- .../moire/ultrasonic/fragment/PlayerFragment.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt index 475094db..417af338 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt @@ -422,9 +422,9 @@ class PlayerFragment : private fun updateShuffleButtonState(isEnabled: Boolean) { if (isEnabled) { - shuffleButton.alpha = 1f + shuffleButton.alpha = ALPHA_ACTIVATED } else { - shuffleButton.alpha = 0.6f + shuffleButton.alpha = ALPHA_DEACTIVATED } } @@ -436,7 +436,7 @@ class PlayerFragment : requireContext(), R.attr.media_repeat_off ) ) - repeatButton.alpha = 0.6f + repeatButton.alpha = ALPHA_DEACTIVATED } 1 -> { repeatButton.setImageDrawable( @@ -444,7 +444,7 @@ class PlayerFragment : requireContext(), R.attr.media_repeat_single ) ) - repeatButton.alpha = 1f + repeatButton.alpha = ALPHA_ACTIVATED } 2 -> { repeatButton.setImageDrawable( @@ -452,7 +452,7 @@ class PlayerFragment : requireContext(), R.attr.media_repeat_all ) ) - repeatButton.alpha = 1f + repeatButton.alpha = ALPHA_ACTIVATED } else -> { } @@ -954,7 +954,7 @@ class PlayerFragment : super.onSelectedChanged(viewHolder, actionState) if (actionState == ACTION_STATE_DRAG) { - viewHolder?.itemView?.alpha = 0.6f + viewHolder?.itemView?.alpha = ALPHA_DEACTIVATED } } @@ -1256,5 +1256,7 @@ class PlayerFragment : companion object { private const val PERCENTAGE_OF_SCREEN_FOR_SWIPE = 5 + private const val ALPHA_ACTIVATED = 1f + private const val ALPHA_DEACTIVATED = 0.4f } }