tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #237 from bgaesslein/bugfix/crash-animation

Browse source 
Fix crash when animator has already started
This commit is contained in:
dkanada 2023-06-11 19:38:15 +09:00 • committed by GitHub
commit 5f9f96e586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/dkanada/gramophone/fragments/player/AbsPlayerFragment.java
View file

@ -1,5 +1,6 @@
package com.dkanada.gramophone.fragments.player; package com.dkanada.gramophone.fragments.player;
import android.animation.AnimatorSet;
import android.content.Context; import android.content.Context;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -26,6 +27,8 @@ import com.dkanada.gramophone.util.NavigationUtil;
public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder { public abstract class AbsPlayerFragment extends AbsMusicServiceFragment implements Toolbar.OnMenuItemClickListener, PaletteColorHolder {
private static boolean isToolbarShown = true; private static boolean isToolbarShown = true;
protected static AnimatorSet currentAnimatorSet = null;
private Callbacks callbacks; private Callbacks callbacks;
@Override @Override

16
app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java
View file

@ -17,6 +17,7 @@ import android.widget.ImageView;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -436,8 +437,11 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
@Override @Override
public void animateColorChange(int newColor) { public void animateColorChange(int newColor) {
if (!fragment.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) return;
if (currentAnimatorSet!=null) currentAnimatorSet.cancel();
binding.playerSlidingLayout.setBackgroundColor(fragment.lastColor); binding.playerSlidingLayout.setBackgroundColor(fragment.lastColor);
createDefaultColorChangeAnimatorSet(newColor).start(); currentAnimatorSet = createDefaultColorChangeAnimatorSet(newColor);
currentAnimatorSet.start();
} }
} }
@ -467,13 +471,13 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
@Override @Override
public void animateColorChange(int newColor) { public void animateColorChange(int newColor) {
if (!fragment.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) return;
if (currentAnimatorSet!=null) currentAnimatorSet.cancel();
binding.playerSlidingLayout.setBackgroundColor(fragment.lastColor); binding.playerSlidingLayout.setBackgroundColor(fragment.lastColor);
currentAnimatorSet = createDefaultColorChangeAnimatorSet(newColor);
AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(newColor); currentAnimatorSet.play(ViewUtil.createBackgroundColorTransition(binding.playerToolbar, fragment.lastColor, newColor))
animatorSet.play(ViewUtil.createBackgroundColorTransition(binding.playerToolbar, fragment.lastColor, newColor))
.with(ViewUtil.createBackgroundColorTransition(fragment.getView().findViewById(R.id.status_bar), ThemeUtil.getColorDark(fragment.lastColor), ThemeUtil.getColorDark(newColor))); .with(ViewUtil.createBackgroundColorTransition(fragment.getView().findViewById(R.id.status_bar), ThemeUtil.getColorDark(fragment.lastColor), ThemeUtil.getColorDark(newColor)));
currentAnimatorSet.start();
animatorSet.start();
} }
} }
} }

14
app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java
View file

@ -15,6 +15,7 @@ import android.widget.ImageView;
import androidx.annotation.ColorInt; import androidx.annotation.ColorInt;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@ -423,7 +424,10 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
@Override @Override
public void animateColorChange(int newColor) { public void animateColorChange(int newColor) {
createDefaultColorChangeAnimatorSet(newColor).start(); if (!fragment.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) return;
if (currentAnimatorSet!=null) currentAnimatorSet.cancel();
currentAnimatorSet = createDefaultColorChangeAnimatorSet(newColor);
currentAnimatorSet.start();
} }
} }
@ -450,9 +454,11 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
@Override @Override
public void animateColorChange(int newColor) { public void animateColorChange(int newColor) {
AnimatorSet animatorSet = createDefaultColorChangeAnimatorSet(newColor); if (!fragment.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) return;
animatorSet.play(ViewUtil.createBackgroundColorTransition(binding.playerToolbar, fragment.lastColor, newColor)); if (currentAnimatorSet!=null) currentAnimatorSet.cancel();
animatorSet.start(); currentAnimatorSet = createDefaultColorChangeAnimatorSet(newColor);
currentAnimatorSet.play(ViewUtil.createBackgroundColorTransition(binding.playerToolbar, fragment.lastColor, newColor));
currentAnimatorSet.start();
} }
} }
} }