Changed some animation times

This commit is contained in:
Karim Abou Zeid 2015-12-22 17:00:55 +01:00
commit aba7ded001
3 changed files with 7 additions and 8 deletions

View file

@ -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)

View file

@ -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;
}

View file

@ -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;
}