diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt index a83f27e10..bdf5eaf23 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt @@ -186,23 +186,6 @@ fun BottomSheetBehavior<*>.peekHeightAnimate(value: Int): Animator { } } -fun MaterialCardView.animateRadius(cornerRadius: Float, pause: Boolean = true) { - ValueAnimator.ofFloat(radius, cornerRadius).apply { - addUpdateListener { radius = animatedValue as Float } - start() - } - ValueAnimator.ofInt(measuredWidth, if (pause) (height * 1.5).toInt() else height).apply { - addUpdateListener { - updateLayoutParams { width = animatedValue as Int } - } - start() - } -} - -fun MaterialCardView.animateToCircle() { - animateRadius(measuredHeight / 2F, pause = false) -} - fun View.focusAndShowKeyboard() { /** * This is to be called when the window already has focus. diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt index 491d80f06..b10260b1f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt @@ -160,10 +160,8 @@ class MD3PlaybackControlsFragment : private fun updatePlayPauseDrawableState() { if (MusicPlayerRemote.isPlaying) { binding.playPauseButton.setImageResource(R.drawable.ic_pause_outline_small) - binding.playPauseCard.animateRadius(40F) } else { binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_outline_small) - binding.playPauseCard.animateToCircle() } } diff --git a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml index 99fd4e8d8..ffd170e04 100644 --- a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml @@ -28,8 +28,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:maxHeight="2dp" - style="@style/Widget.Retro.Slider" + android:background="@android:color/transparent" + style="@style/Widget.Retro.MD3.Custom.Slider" app:layout_constraintEnd_toStartOf="@id/songTotalTime" app:layout_constraintStart_toEndOf="@id/songCurrentProgress" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9cfed1a10..356fc0641 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -256,9 +256,20 @@ 50% - + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 993eb9320..aab11403c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ materialIntro = "2.0.0" mediarouter = "1.6.0" nanohttpd = "2.3.1" navigation_version = "2.7.6" -mdc_version = "1.9.0" +mdc_version = "1.12.0" glide_version = "4.15.1" orgEclipseEgitGithubCore = "2.1.5" playServicesCastFramework = "21.3.0"