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

Changed some animation times

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.AccelerateInterpolator; import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.OvershootInterpolator;
import android.widget.ImageView; import android.widget.ImageView;
import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.R;
@ -148,12 +147,12 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv
return bitmap; return bitmap;
} }
}) })
.displayer(new FadeInBitmapDisplayer(ViewUtil.DEFAULT_COLOR_ANIMATION_DURATION)) .displayer(new FadeInBitmapDisplayer(ViewUtil.PHONOGRAPH_ANIM_TIME))
.build(), .build(),
new SimpleImageLoadingListener() { new SimpleImageLoadingListener() {
@Override @Override
public void onLoadingFailed(String imageUri, View view, @Nullable FailReason failReason) { 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)); 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.setPivotY(favoriteIcon.getHeight() / 2);
favoriteIcon.animate() favoriteIcon.animate()
.setDuration(500) .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME / 2)
.setInterpolator(new DecelerateInterpolator()) .setInterpolator(new DecelerateInterpolator())
.scaleX(1f) .scaleX(1f)
.scaleY(1f) .scaleY(1f)
@ -195,7 +194,7 @@ public class PlayerAlbumCoverFragment extends Fragment implements MusicServiceEv
@Override @Override
public void run() { public void run() {
favoriteIcon.animate() favoriteIcon.animate()
.setDuration(500) .setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME / 2)
.setInterpolator(new AccelerateInterpolator()) .setInterpolator(new AccelerateInterpolator())
.scaleX(0f) .scaleX(0f)
.scaleY(0f) .scaleY(0f)

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

@ -239,7 +239,7 @@ public class PlayerFragment extends AbsPlayerFragment implements PlayerAlbumCove
AnimatorSet animatorSet = new AnimatorSet(); AnimatorSet animatorSet = new AnimatorSet();
animatorSet.playTogether(backgroundAnimator, subHeaderAnimator); animatorSet.playTogether(backgroundAnimator, subHeaderAnimator);
animatorSet.setDuration(1000).start(); animatorSet.setDuration(ViewUtil.PHONOGRAPH_ANIM_TIME).start();
lastColor = newColor; lastColor = newColor;
} }

4
app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
View file

@ -46,7 +46,7 @@ public class ViewUtil {
return createColorAnimator(v, "textColor", startColor, endColor); 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) { private static Animator createColorAnimator(Object target, String propertyName, int startColor, int endColor) {
ObjectAnimator animator; ObjectAnimator animator;
@ -60,7 +60,7 @@ public class ViewUtil {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
animator.setInterpolator(new PathInterpolator(0.4f, 0f, 1f, 1f)); animator.setInterpolator(new PathInterpolator(0.4f, 0f, 1f, 1f));
} }
animator.setDuration(DEFAULT_COLOR_ANIMATION_DURATION); animator.setDuration(PHONOGRAPH_ANIM_TIME);
return animator; return animator;
} }