From aba7ded0017f5792881b0b1a43fef04f1bcc9971 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 22 Dec 2015 17:00:55 +0100 Subject: [PATCH] Changed some animation times --- .../ui/fragments/player/PlayerAlbumCoverFragment.java | 9 ++++----- .../gramophone/ui/fragments/player/PlayerFragment.java | 2 +- .../java/com/kabouzeid/gramophone/util/ViewUtil.java | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java index 7740e6e4..4f28c55a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; -import android.view.animation.OvershootInterpolator; import android.widget.ImageView; import com.kabouzeid.gramophone.R; @@ -148,12 +147,12 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv return bitmap; } }) - .displayer(new FadeInBitmapDisplayer(ViewUtil.DEFAULT_COLOR_ANIMATION_DURATION)) + .displayer(new FadeInBitmapDisplayer(ViewUtil.PHONOGRAPH_ANIM_TIME)) .build(), new SimpleImageLoadingListener() { @Override public void onLoadingFailed(String imageUri, View view, @Nullable FailReason failReason) { - FadeInBitmapDisplayer.animate(view, ViewUtil.DEFAULT_COLOR_ANIMATION_DURATION); + FadeInBitmapDisplayer.animate(view, ViewUtil.PHONOGRAPH_ANIM_TIME); setColor(ColorUtil.resolveColor(activity, R.attr.default_bar_color)); } @@ -180,7 +179,7 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv favoriteIcon.setPivotY(favoriteIcon.getHeight() / 2); favoriteIcon.animate() - .setDuration(500) + .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME / 2) .setInterpolator(new DecelerateInterpolator()) .scaleX(1f) .scaleY(1f) @@ -195,7 +194,7 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv @Override public void run() { favoriteIcon.animate() - .setDuration(500) + .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME / 2) .setInterpolator(new AccelerateInterpolator()) .scaleX(0f) .scaleY(0f) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java index c92b6363..c3d51fc0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerFragment.java @@ -239,7 +239,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove AnimatorSet animatorSet = new AnimatorSet(); animatorSet.playTogether(backgroundAnimator, subHeaderAnimator); - animatorSet.setDuration(1000).start(); + animatorSet.setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME).start(); lastColor = newColor; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java index ec3d1906..2dee86df 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java @@ -46,7 +46,7 @@ public class ViewUtil { return createColorAnimator(v, "textColor", startColor, endColor); } - public final static int DEFAULT_COLOR_ANIMATION_DURATION = 500; + public final static int PHONOGRAPH_ANIM_TIME = 1000; private static Animator createColorAnimator(Object target, String propertyName, int startColor, int endColor) { ObjectAnimator animator; @@ -60,7 +60,7 @@ public class ViewUtil { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { animator.setInterpolator(new PathInterpolator(0.4f, 0f, 1f, 1f)); } - animator.setDuration(DEFAULT_COLOR_ANIMATION_DURATION); + animator.setDuration(PHONOGRAPH_ANIM_TIME); return animator; }