Skip to content

Fixed svg animation on pause/play #3276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LagradOst wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −0
Open

Fixed svg animation on pause/play #3276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.pm.ActivityInfo
import android.graphics.drawable.Animatable2
import android.graphics.drawable.AnimatedImageDrawable
import android.graphics.drawable.AnimatedVectorDrawable
import android.graphics.drawable.Drawable
import android.media.metrics.PlaybackErrorEvent
import android.os.Build
import android.os.Handler
Expand Down Expand Up @@ -41,6 +43,7 @@ import androidx.media3.ui.DefaultTimeBar
import androidx.media3.ui.SubtitleView
import androidx.media3.ui.TimeBar
import androidx.preference.PreferenceManager
import androidx.vectordrawable.graphics.drawable.Animatable2Compat
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import com.github.rubensousa.previewseekbar.PreviewBar
import com.github.rubensousa.previewseekbar.media3.PreviewTimeBar
Expand Down Expand Up @@ -541,11 +544,37 @@ class PlayerView @JvmOverloads constructor(
else window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}

// Defined outside updateIsPlaying to prevent redundant object creation.
private val pausePlayAnimatable2CompatCallback = object : Animatable2Compat.AnimationCallback() {
override fun onAnimationEnd(drawable: Drawable?) {
playerPausePlay?.setImageResource(
if (player.getIsPlaying()) R.drawable.netflix_pause else R.drawable.netflix_play
)
super.onAnimationEnd(drawable)
}
}

private val pausePlayAnimatable2Callback = object : Animatable2.AnimationCallback() {
override fun onAnimationEnd(drawable: Drawable?) {
playerPausePlay?.setImageResource(
if (player.getIsPlaying()) R.drawable.netflix_pause else R.drawable.netflix_play
)
super.onAnimationEnd(drawable)
}
}

fun updateIsPlaying(wasPlaying: CSPlayerLoading, isPlaying: CSPlayerLoading) {
val isPlayingRightNow = CSPlayerLoading.IsPlaying == isPlaying
val isBuffering = CSPlayerLoading.IsBuffering == isPlaying
currentPlayerStatus = isPlaying

val currentPlayerDrawable = playerPausePlay?.drawable
if (currentPlayerDrawable is Animatable2Compat) {
currentPlayerDrawable.clearAnimationCallbacks()
} else if (currentPlayerDrawable is Animatable2) {
currentPlayerDrawable.clearAnimationCallbacks()
}

keepScreenOn(isPlayingRightNow || isBuffering)

if (isBuffering) {
Expand Down Expand Up @@ -573,6 +602,14 @@ class PlayerView @JvmOverloads constructor(
playerPausePlay?.setImageResource(
if (isPlayingRightNow) R.drawable.netflix_pause else R.drawable.netflix_play
)
} else {
// Some devices cannot animate SVGs well. They get a pixel-wide gap in the play icon.
// Therefore, we need to manually set a static SVG on animation end
if (drawable is Animatable2Compat) {
drawable.registerAnimationCallback(pausePlayAnimatable2CompatCallback)
} else if (drawable is Animatable2) {
drawable.registerAnimationCallback(pausePlayAnimatable2Callback)
}
}
} else {
playerPausePlay?.setImageResource(
Expand Down
Loading