From 94cda61f3250724d835cf38950d884bed4905690 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 1 Mar 2020 10:08:36 +0530 Subject: [PATCH] Fix slider sliding problem --- app/build.gradle | 2 +- app/src/main/assets/retro-changelog.html | 2 +- .../monkey/retromusic/fragments/VolumeFragment.kt | 4 ++-- .../adaptive/AdaptivePlaybackControlsFragment.kt | 7 ++----- .../player/blur/BlurPlaybackControlsFragment.kt | 7 ++----- .../cardblur/CardBlurPlaybackControlsFragment.kt | 7 ++----- .../fragments/player/circle/CirclePlayerFragment.kt | 7 ++----- .../player/color/ColorPlaybackControlsFragment.kt | 7 ++----- .../player/flat/FlatPlaybackControlsFragment.kt | 6 ++---- .../player/full/FullPlaybackControlsFragment.kt | 7 ++----- .../player/material/MaterialControlsFragment.kt | 6 ++---- .../player/normal/PlayerPlaybackControlsFragment.kt | 7 ++----- .../player/peak/PeakPlayerControlFragment.kt | 6 ++---- .../player/plain/PlainPlaybackControlsFragment.kt | 6 ++---- .../helper/MusicProgressViewUpdateHelper.kt | 13 ++++++------- .../fragment_adaptive_player_playback_controls.xml | 2 +- 16 files changed, 33 insertions(+), 63 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c1c507b35..dc5b3a0cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 413 + versionCode 414 versionName '3.4.970' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 8717202f0..0727abdd6 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.4.970

v3.4.900

v3.4.850

v3.4.800

v3.4.700

v3.4.600

v3.4.500

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.4.970

v3.4.900

v3.4.850

v3.4.800

v3.4.700

v3.4.600

v3.4.500

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index ca890310d..7b2dc8079 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -18,11 +18,11 @@ import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.volume.AudioVolumeObserver import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener import com.google.android.material.slider.Slider -import com.google.android.material.slider.Slider.OnChangeListener + import kotlinx.android.synthetic.main.fragment_volume.* class VolumeFragment : Fragment(), OnAudioVolumeChangedListener, - View.OnClickListener, OnChangeListener { + View.OnClickListener, Slider.OnChangeListener { private var audioVolumeObserver: AudioVolumeObserver? = null diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt index 90bf493c1..b3f374e4b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt @@ -13,7 +13,6 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.extensions.ripAlpha -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -219,10 +218,8 @@ class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index 085e60ec6..56d65a59c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt @@ -14,7 +14,6 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -253,10 +252,8 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index a64639649..23f37a75f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -12,7 +12,6 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -211,10 +210,8 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } 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 750538119..830639420 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 @@ -29,7 +29,6 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -229,10 +228,8 @@ class CirclePlayerFragment : AbsPlayerFragment(), Callback, OnAudioVolumeChanged } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt index a7c2bc8a1..faffd1f2e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt @@ -11,7 +11,6 @@ import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -213,10 +212,8 @@ class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt index c538794c4..e02089b8e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt @@ -172,10 +172,8 @@ class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index c1ab60aad..3b63a5415 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -20,7 +20,6 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.extensions.ripAlpha -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -204,10 +203,8 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt index 228444411..ec68c0eed 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt @@ -210,10 +210,8 @@ class MaterialControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } 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 4e3d56214..eeb004e7a 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 @@ -16,7 +16,6 @@ import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.extensions.ripAlpha -import code.name.monkey.retromusic.extensions.setRange import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -237,10 +236,8 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } 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 b77017f31..56efcfb8b 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 @@ -143,10 +143,8 @@ class PeakPlayerControlFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt index db9602f90..e7d9ca30a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt @@ -264,10 +264,8 @@ class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() { } override fun onUpdateProgressViews(progress: Int, total: Int) { - if (total <= 0) { - return - } - progressSlider.setRange(progress.toFloat(), total.toFloat()) + progressSlider.valueTo = total.toFloat() + progressSlider.value = progress.toFloat() songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong()) songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt index 7ff6e4e2c..bbc46cbe6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt @@ -53,8 +53,8 @@ class MusicProgressViewUpdateHelper : Handler { private fun refreshProgressViews(): Int { val progressMillis = MusicPlayerRemote.songProgressMillis val totalMillis = MusicPlayerRemote.songDurationMillis - println("$progressMillis $totalMillis") - callback?.onUpdateProgressViews(progressMillis, totalMillis) + if (totalMillis > 0) + callback?.onUpdateProgressViews(progressMillis, totalMillis) if (!MusicPlayerRemote.isPlaying) { return intervalPaused @@ -76,10 +76,9 @@ class MusicProgressViewUpdateHelper : Handler { } companion object { - private val CMD_REFRESH_PROGRESS_VIEWS = 1 - - private val MIN_INTERVAL = 20 - private val UPDATE_INTERVAL_PLAYING = 1000 - private val UPDATE_INTERVAL_PAUSED = 500 + private const val CMD_REFRESH_PROGRESS_VIEWS = 1 + private const val MIN_INTERVAL = 20 + private const val UPDATE_INTERVAL_PLAYING = 1000 + private const val UPDATE_INTERVAL_PAUSED = 500 } } diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml index 6ca797599..b3b94a3b4 100644 --- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:value="1.0f" - android:valueFrom="0.0f" + android:valueFrom="-0.1f" android:valueTo="1.0f" app:labelBehavior="gone" app:layout_constraintEnd_toStartOf="@id/songTotalTime"