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

Fixed the FAB animation getting stuck in the middle on older versions of Android.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-02-28 15:57:21 +01:00
commit b98bfa1480
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlaybackControlsFragment.java
View file

@ -165,11 +165,12 @@ public class PlaybackControlsFragment extends Fragment implements MusicServiceEv
} }
private void setUpPlayPauseFab() { private void setUpPlayPauseFab() {
updatePlayPauseDrawableState(false);
playPauseFab.setImageDrawable(playerFabPlayPauseDrawable);
final int fabColor = Color.WHITE; final int fabColor = Color.WHITE;
TintHelper.setTintAuto(playPauseFab, fabColor, true); TintHelper.setTintAuto(playPauseFab, fabColor, true);
// because of our custom drawable we have to set the tint manually
updatePlayPauseDrawableState(false);
// Note: set the drawable AFTER TintHelper.setTintAuto() is called
playPauseFab.setImageDrawable(playerFabPlayPauseDrawable);
playPauseFab.getDrawable().mutate().setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN); playPauseFab.getDrawable().mutate().setColorFilter(MaterialValueHelper.getPrimaryTextColor(getContext(), ColorUtil.isColorLight(fabColor)), PorterDuff.Mode.SRC_IN);
playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler()); playPauseFab.setOnClickListener(new PlayPauseButtonOnClickHandler());
playPauseFab.post(new Runnable() { playPauseFab.post(new Runnable() {

4
app/src/main/java/com/kabouzeid/gramophone/views/PlayPauseDrawable.java
View file

@ -105,7 +105,7 @@ public class PlayPauseDrawable extends Drawable {
rightPauseBar.lineTo(2 * barWidth + barDist, 0); rightPauseBar.lineTo(2 * barWidth + barDist, 0);
rightPauseBar.close(); rightPauseBar.close();
canvas.save(); final int saveCount = canvas.save();
// Translate the play button a tiny bit to the right so it looks more centered. // Translate the play button a tiny bit to the right so it looks more centered.
canvas.translate(lerp(0, pauseBarHeight / 8f, progress), 0); canvas.translate(lerp(0, pauseBarHeight / 8f, progress), 0);
@ -123,7 +123,7 @@ public class PlayPauseDrawable extends Drawable {
canvas.drawPath(leftPauseBar, paint); canvas.drawPath(leftPauseBar, paint);
canvas.drawPath(rightPauseBar, paint); canvas.drawPath(rightPauseBar, paint);
canvas.restore(); canvas.restoreToCount(saveCount);
} }
@NonNull @NonNull