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

Updated heart animation

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-20 17:11:33 +01:00
commit 3e9868cd34
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java
View file

@ -11,6 +11,7 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.OvershootInterpolator; import android.view.animation.OvershootInterpolator;
import android.widget.ImageView; import android.widget.ImageView;
@ -168,7 +169,7 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv
); );
} }
public void showHeart() { public void showHeartAnimation() {
favoriteIcon.clearAnimation(); favoriteIcon.clearAnimation();
favoriteIcon.setAlpha(0f); favoriteIcon.setAlpha(0f);
@ -179,8 +180,8 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv
favoriteIcon.setPivotY(favoriteIcon.getHeight() / 2); favoriteIcon.setPivotY(favoriteIcon.getHeight() / 2);
favoriteIcon.animate() favoriteIcon.animate()
.setDuration(600) .setDuration(500)
.setInterpolator(new OvershootInterpolator()) .setInterpolator(new DecelerateInterpolator())
.scaleX(1f) .scaleX(1f)
.scaleY(1f) .scaleY(1f)
.alpha(1f) .alpha(1f)
@ -194,8 +195,10 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv
@Override @Override
public void run() { public void run() {
favoriteIcon.animate() favoriteIcon.animate()
.setDuration(300) .setDuration(500)
.setInterpolator(new DecelerateInterpolator()) .setInterpolator(new AccelerateInterpolator())
.scaleX(0f)
.scaleY(0f)
.alpha(0f) .alpha(0f)
.start(); .start();
} }

2
app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java
View file

@ -317,7 +317,7 @@ public class PlayerFragment extends Fragment implements MusicServiceEventListene
case R.id.action_toggle_favorite: case R.id.action_toggle_favorite:
MusicUtil.toggleFavorite(activity, song); MusicUtil.toggleFavorite(activity, song);
if (MusicUtil.isFavorite(activity, song)) { if (MusicUtil.isFavorite(activity, song)) {
playerAlbumCoverFragment.showHeart(); playerAlbumCoverFragment.showHeartAnimation();
} }
updatePlayerMenu(); updatePlayerMenu();
return true; return true;