shrink anim complete

Author: FlodCoding

Loadingbutton/src/main/java/com/flod/loadingbutton/LoadingButton.java

@@ -59,12 +59,11 @@ interface STATE {
     private ValueAnimator mShrinkAnimator;
     private int mShrinkDuration;
     private CircularProgressDrawable mLoadingDrawable;
+    private OnLoadingListener mOnLoadingListener;
     private EndDrawable mEndDrawable;
     private int mLoadingSize;
     private int mLoadingPosition;
 
-    private OnLoadingListener mOnLoadingListener;
-
 
     private boolean isShrinkAnimReverse;
     private boolean isCancel;
@@ -88,7 +87,6 @@ public LoadingButton(Context context, AttributeSet attrs, int defStyleAttr) {
 
     private void init(Context context, AttributeSet attrs) {
 
-
         //getConfig
         TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.LoadingButton);
         enableShrink = array.getBoolean(R.styleable.LoadingButton_enableShrink, false);
@@ -121,9 +119,11 @@ private void init(Context context, AttributeSet attrs) {
 
         //initShrinkAnimator
         setUpShrinkAnimator();
-        if (mLoadingPosition % 2 == 0 || enableShrink)
+        //TODO
+        setEnableTextInCenter(true);
+      /*  if (mLoadingPosition % 2 == 0 || enableShrink)
             setEnableTextInCenter(true);
-
+*/
         if (getRootView().isInEditMode()) {
             mLoadingDrawable.setStartEndTrim(0, 0.8f);
         }
@@ -331,16 +331,22 @@ public void start() {
 
     public void complete() {
         if (mEndDrawable != null) {
-            mEndDrawable.show(true);
+            if (curStatus == STATE.LOADING)
+                mEndDrawable.show(true, true);
+            else
+                mEndDrawable.show(true, false);
         } else {
-            beginShrinkAnim(true, false);
+            if (curStatus == STATE.LOADING)
+                beginShrinkAnim(true, false);
+            else
+                beginShrinkAnim(true, true);
         }
     }
 
     public void fail() {
         isFail = true;
         if (mEndDrawable != null) {
-            mEndDrawable.show(false);
+            mEndDrawable.show(false, true);
         } else {
             beginShrinkAnim(true, false);
         }
@@ -530,7 +536,9 @@ public class EndDrawable {
         private ObjectAnimator mAppearAnimator;
         private long duration;
         private float animValue;
+        int[] offsetTemp = new int[]{0, 0};
         private boolean isShowing;
+        private boolean shrink;
         private Runnable mRunnable;
 
         private EndDrawable(@Nullable Drawable completeDrawable, @Nullable Drawable failDrawable) {
@@ -554,7 +562,7 @@ private void init() {
                 @Override
                 public void run() {
                     setAnimValue(0);
-                    if (enableShrink) {
+                    if (shrink) {
                         beginShrinkAnim(true, false);
                     } else {
                         endCallbackListener();
@@ -586,7 +594,7 @@ public void onAnimationEnd(Animator animation) {
         }
 
 
-        private void show(boolean isSuccess) {
+        private void show(boolean isSuccess, boolean shrink) {
             //end running Shrinking
             if (mShrinkAnimator.isRunning()) {
                 mShrinkAnimator.end();
@@ -604,6 +612,7 @@ private void show(boolean isSuccess) {
             }
             mAppearAnimator.start();
             isShowing = true;
+            this.shrink = shrink;
         }
 
         private void cancel(boolean withAnim) {
@@ -627,7 +636,7 @@ private void hide() {
         }
 
         private int[] calcOffset(Canvas canvas, Rect bounds, @POSITION int pos) {
-            int[] offset = new int[]{0, 0};
+            final int[] offset = offsetTemp;
             offset[0] = canvas.getWidth() / 2;
             offset[1] = canvas.getHeight() / 2;
             switch (pos) {
@@ -640,11 +649,28 @@ private int[] calcOffset(Canvas canvas, Rect bounds, @POSITION int pos) {
                     break;
                 }
                 case POSITION.TOP: {
+                    //TODO Test
+
                     offset[0] -= bounds.width() / 2;
-                    offset[1] -= (int) getTextHeight() / 2 + bounds.height() + getCompoundDrawablePadding();
-                    if (enableShrink && isShrinkAnimReverse) {
-                        offset[1] += bounds.height() / 2;
+
+                    if (enableShrink) {
+                        offset[1] -= bounds.height() / 2;
+                    } else {
+                        offset[1] -= (getTextHeight() + bounds.height() + getCompoundDrawablePadding()) / 2;
+                        if (isEnableTextInCenter()) {
+                            offset[1] -= getCompoundDrawablePadding() / 2;
+                        }
                     }
+
+                   /* offset[1] -= (int) getTextHeight() / 2 + bounds.height() + getCompoundDrawablePadding();
+                    if (enableShrink) {
+                        if (isShrinkAnimReverse)
+                            offset[1] += bounds.height() / 2;
+                    }
+
+                    if (!enableShrink && !isEnableTextInCenter()) {
+                        offset[1] += (bounds.height() + getCompoundDrawablePadding()) >> 1;
+                    }*/
                     break;
                 }
                 case POSITION.END: {

app/src/main/java/com/flod/hardloadingbutton/MainActivity.java

@@ -66,8 +66,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         initView();
-
-
     }
 
 

app/src/main/res/layout/activity_main.xml

@@ -27,10 +27,10 @@
             android:text="Submit"
             android:textColor="@android:color/white"
             android:textSize="14sp"
-            app:enableShrink="false"
+            app:enableShrink="true"
             app:endCompleteDrawable="@drawable/ic_successful"
             app:endFailDrawable="@drawable/ic_fail"
-            app:loadingDrawablePosition="Top"
+            app:loadingDrawablePosition="Start"
             app:enableTextInCenter="false"
             tools:ignore="HardcodedText" />