From 458a275dcd9d7e951c24f4242a299205545eb5f6 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 5 Jul 2015 20:55:10 +0800 Subject: [PATCH] Use default AnimatorListener --- .../animation/SimpleAnimatorListener.java | 8 ------- .../java/com/hippo/effect/ViewTransition.java | 24 +++---------------- .../ehviewer/ui/scene/GalleryDetailScene.java | 3 +++ .../ehviewer/ui/scene/GalleryListScene.java | 6 ++--- .../java/com/hippo/scene/RippleCurtain.java | 3 +-- .../java/com/hippo/scene/SimpleCurtain.java | 6 ++--- .../java/com/hippo/widget/CheckTextView.java | 11 +-------- 7 files changed, 12 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/com/hippo/animation/SimpleAnimatorListener.java b/app/src/main/java/com/hippo/animation/SimpleAnimatorListener.java index 04b654621..53f6be68f 100644 --- a/app/src/main/java/com/hippo/animation/SimpleAnimatorListener.java +++ b/app/src/main/java/com/hippo/animation/SimpleAnimatorListener.java @@ -20,24 +20,16 @@ import android.animation.Animator; public abstract class SimpleAnimatorListener implements Animator.AnimatorListener { - private boolean mCanceled; - @Override public void onAnimationStart(Animator animation) { - mCanceled = false; } @Override public void onAnimationEnd(Animator animation) { - onAnimationEnd(animation, mCanceled); - } - - public void onAnimationEnd(Animator animation, boolean canceled) { } @Override public void onAnimationCancel(Animator animation) { - mCanceled = true; } @Override diff --git a/app/src/main/java/com/hippo/effect/ViewTransition.java b/app/src/main/java/com/hippo/effect/ViewTransition.java index f4cbd2afc..b0e1cb791 100644 --- a/app/src/main/java/com/hippo/effect/ViewTransition.java +++ b/app/src/main/java/com/hippo/effect/ViewTransition.java @@ -109,19 +109,10 @@ public class ViewTransition { oa1.setDuration(ANIMATE_TIME); oa1.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); + public void onAnimationEnd(Animator animation) { + ViewUtils.setVisibility(hiddenView, View.GONE); mAnimator1 = null; } - - @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); - if (!canceled) { - ViewUtils.setVisibility(hiddenView, View.GONE); - mAnimator1 = null; - } - } }); oa1.start(); mAnimator1 = oa1; @@ -131,18 +122,9 @@ public class ViewTransition { oa2.setDuration(ANIMATE_TIME); oa2.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); + public void onAnimationEnd(Animator animation) { mAnimator2 = null; } - - @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); - if (!canceled) { - mAnimator2 = null; - } - } }); oa2.start(); mAnimator2 = oa2; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index d7e9f3bce..6a5ba792f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -66,6 +66,7 @@ import java.util.List; import static com.hippo.ehviewer.R.id.no_tags; +// TODO Use RecyclerView instead of ScrollView. It will improve swipe horizontally and animation public class GalleryDetailScene extends Scene implements View.OnClickListener, AccurateClick.OnAccurateClickListener { @@ -420,6 +421,8 @@ public class GalleryDetailScene extends Scene implements View.OnClickListener, } } + public static boolean AAA = false; + private class EhDetailListener extends EhClient.OnGetGalleryDetailListener { @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 389934cb3..97fa08020 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -614,8 +614,7 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper, va.setDuration(ANIMATE_TIME); va.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); + public void onAnimationEnd(Animator animation) { mSearchBarMoveAnimator = null; } }); @@ -676,8 +675,7 @@ public final class GalleryListScene extends Scene implements SearchBar.Helper, va.setDuration(ANIMATE_TIME); va.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); + public void onAnimationEnd(Animator animation) { mSearchBarMoveAnimator = null; } }); diff --git a/app/src/main/java/com/hippo/scene/RippleCurtain.java b/app/src/main/java/com/hippo/scene/RippleCurtain.java index 0121c53e8..7dd4cbecf 100644 --- a/app/src/main/java/com/hippo/scene/RippleCurtain.java +++ b/app/src/main/java/com/hippo/scene/RippleCurtain.java @@ -127,8 +127,7 @@ public class RippleCurtain extends Curtain { mAnimatorSet.playTogether(animatorCollection); mAnimatorSet.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); + public void onAnimationEnd(Animator animation) { dispatchCloseFinished(enter, exit); mAnimatorSet = null; diff --git a/app/src/main/java/com/hippo/scene/SimpleCurtain.java b/app/src/main/java/com/hippo/scene/SimpleCurtain.java index 728b6b03e..24f2e96d3 100644 --- a/app/src/main/java/com/hippo/scene/SimpleCurtain.java +++ b/app/src/main/java/com/hippo/scene/SimpleCurtain.java @@ -89,8 +89,7 @@ public class SimpleCurtain extends Curtain { } @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); + public void onAnimationEnd(Animator animation) { dispatchOpenFinished(enter, exit); hideSceneOnOpen(exit); mAnimator = null; @@ -137,8 +136,7 @@ public class SimpleCurtain extends Curtain { animator.setInterpolator(AnimationUtils.SLOW_FAST_INTERPOLATOR); animator.addListener(new SimpleAnimatorListener() { @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); + public void onAnimationEnd(Animator animation) { dispatchCloseFinished(enter, exit); mAnimator = null; } diff --git a/app/src/main/java/com/hippo/widget/CheckTextView.java b/app/src/main/java/com/hippo/widget/CheckTextView.java index 1911c3224..5aae55aea 100644 --- a/app/src/main/java/com/hippo/widget/CheckTextView.java +++ b/app/src/main/java/com/hippo/widget/CheckTextView.java @@ -113,18 +113,9 @@ public class CheckTextView extends TextView implements OnClickListener, Hotspota private Animator.AnimatorListener mAnimatorListener = new SimpleAnimatorListener() { @Override - public void onAnimationCancel(Animator animation) { - super.onAnimationCancel(animation); + public void onAnimationEnd(Animator animation) { mAnimator = null; } - - @Override - public void onAnimationEnd(Animator animation, boolean canceled) { - super.onAnimationEnd(animation, canceled); - if (!canceled) { - mAnimator = null; - } - } }; public void prepareAnimations() {