new feature keepProgressBarEnabledSize will stop the fab from jumping…

… position when using coordinator anchors
martipello · Sep 12, 2019 · 22583bf · 22583bf
1 parent 4e7de21
commit 22583bf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/library/src/main/java/com/github/sealstudios/fab/FloatingActionButton.java b/library/src/main/java/com/github/sealstudios/fab/FloatingActionButton.java
@@ -71,6 +71,7 @@ public class    FloatingActionButton extends ImageButton {
 
     // Progress
     private boolean mProgressBarEnabled;
+    private boolean keepProgressBarEnabledSize;
     private int mProgressWidth = Util.dpToPx(getContext(), 6f);
     private int mProgressColor;
     private int mProgressBackgroundColor;
@@ -137,6 +138,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr) {
         mProgressBackgroundColor = attr.getColor(R.styleable.FloatingActionButton_fab_progress_backgroundColor, 0x4D000000);
         mProgressMax = attr.getInt(R.styleable.FloatingActionButton_fab_progress_max, mProgressMax);
         mShowProgressBackground = attr.getBoolean(R.styleable.FloatingActionButton_fab_progress_showBackground, true);
+        keepProgressBarEnabledSize = attr.getBoolean(R.styleable.FloatingActionButton_fab_keep_progress_size, false);
 
         if (attr.hasValue(R.styleable.FloatingActionButton_fab_progress)) {
             mProgress = attr.getInt(R.styleable.FloatingActionButton_fab_progress, 0);
@@ -186,15 +188,15 @@ private int getCircleSize() {
 
     private int calculateMeasuredWidth() {
         int width = getCircleSize() + calculateShadowWidth();
-        if (mProgressBarEnabled) {
+        if (mProgressBarEnabled  | keepProgressBarEnabledSize) {
             width += mProgressWidth * 2;
         }
         return width;
     }
 
     private int calculateMeasuredHeight() {
         int height = getCircleSize() + calculateShadowHeight();
-        if (mProgressBarEnabled) {
+        if (mProgressBarEnabled | keepProgressBarEnabledSize) {
             height += mProgressWidth * 2;
         }
         return height;
@@ -235,13 +237,15 @@ protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
         if (mProgressBarEnabled) {
+
             if (mShowProgressBackground) {
                 canvas.drawArc(mProgressCircleBounds, 360, 360, false, mBackgroundPaint);
             }
 
             boolean shouldInvalidate = false;
 
             if (mProgressIndeterminate) {
+
                 shouldInvalidate = true;
 
                 long deltaTime = SystemClock.uptimeMillis() - mLastTimeAnimated;
@@ -264,6 +268,7 @@ protected void onDraw(Canvas canvas) {
                 }
 
                 canvas.drawArc(mProgressCircleBounds, from, to, false, mProgressPaint);
+
             } else {
                 if (mCurrentProgress != mTargetProgress) {
                     shouldInvalidate = true;
@@ -314,6 +319,7 @@ private void updateProgressLength(long deltaTimeInMillis) {
 
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+
         saveButtonOriginalPosition();
 
         if (mShouldProgressIndeterminate) {
@@ -368,7 +374,7 @@ void updateBackground() {
         int circleInsetHorizontal = hasShadow() ? mShadowRadius + Math.abs(mShadowXOffset) : 0;
         int circleInsetVertical = hasShadow() ? mShadowRadius + Math.abs(mShadowYOffset) : 0;
 
-        if (mProgressBarEnabled) {
+        if (mProgressBarEnabled | keepProgressBarEnabledSize) {
             circleInsetHorizontal += mProgressWidth;
             circleInsetVertical += mProgressWidth;
         }
@@ -614,6 +620,7 @@ public Parcelable onSaveInstanceState() {
         ss.mProgress = this.mProgress;
         ss.mAnimateProgress = this.mAnimateProgress;
         ss.mShowProgressBackground = this.mShowProgressBackground;
+        ss.keepProgressEnabledSize = this.keepProgressBarEnabledSize;
 
         return ss;
     }
@@ -635,6 +642,7 @@ public void onRestoreInstanceState(Parcelable state) {
         this.mProgressColor = ss.mProgressColor;
         this.mProgressBackgroundColor = ss.mProgressBackgroundColor;
         this.mShouldProgressIndeterminate = ss.mShouldProgressIndeterminate;
+        this.keepProgressBarEnabledSize = ss.keepProgressEnabledSize;
         this.mShouldSetProgress = ss.mShouldSetProgress;
         this.mProgress = ss.mProgress;
         this.mAnimateProgress = ss.mAnimateProgress;
@@ -656,7 +664,7 @@ private CircleDrawable(Shape s) {
             circleInsetHorizontal = hasShadow() ? mShadowRadius + Math.abs(mShadowXOffset) : 0;
             circleInsetVertical = hasShadow() ? mShadowRadius + Math.abs(mShadowYOffset) : 0;
 
-            if (mProgressBarEnabled) {
+            if (mProgressBarEnabled | keepProgressBarEnabledSize) {
                 circleInsetHorizontal += mProgressWidth;
                 circleInsetVertical += mProgressWidth;
             }
@@ -736,6 +744,7 @@ static class ProgressSavedState extends BaseSavedState {
         boolean mShouldSetProgress;
         boolean mAnimateProgress;
         boolean mShowProgressBackground;
+        boolean keepProgressEnabledSize;
 
         ProgressSavedState(Parcelable superState) {
             super(superState);
@@ -757,6 +766,7 @@ private ProgressSavedState(Parcel in) {
             this.mShouldSetProgress = in.readInt() != 0;
             this.mAnimateProgress = in.readInt() != 0;
             this.mShowProgressBackground = in.readInt() != 0;
+            this.keepProgressEnabledSize = in.readInt() != 0;
         }
 
         @Override
@@ -776,6 +786,7 @@ public void writeToParcel(Parcel out, int flags) {
             out.writeInt(this.mShouldSetProgress ? 1 : 0);
             out.writeInt(this.mAnimateProgress ? 1 : 0);
             out.writeInt(this.mShowProgressBackground ? 1 : 0);
+            out.writeInt(this.keepProgressEnabledSize ? 1 : 0);
         }
 
         public static final Parcelable.Creator<ProgressSavedState> CREATOR =
@@ -1173,6 +1184,7 @@ public synchronized void setIndeterminate(boolean indeterminate) {
         }
 
         mProgressBarEnabled = indeterminate;
+
         mShouldUpdateButtonPosition = true;
         mProgressIndeterminate = indeterminate;
         mLastTimeAnimated = SystemClock.uptimeMillis();

diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
@@ -25,6 +25,7 @@
         <attr name="fab_progress_max" format="integer" />
         <attr name="fab_progress" format="integer" />
         <attr name="fab_progress_showBackground" format="boolean" />
+        <attr name="fab_keep_progress_size" format="boolean" />
     </declare-styleable>
 
     <declare-styleable name="FloatingActionMenu">

diff --git a/sample/src/main/res/layout/progress_fragment.xml b/sample/src/main/res/layout/progress_fragment.xml
@@ -23,9 +23,11 @@
         android:layout_height="wrap_content"
         fab:layout_anchor="@id/stage"
         fab:layout_anchorGravity="top|end"
-      android:layout_margin="16dp"
+        android:layout_marginEnd="16dp"
         android:src="@drawable/ic_progress"
+      fab:fab_keep_progress_size="true"
         fab:fab_showAnimation="@anim/show_from_bottom"
-        fab:fab_hideAnimation="@anim/hide_to_bottom"/>
+        fab:fab_hideAnimation="@anim/hide_to_bottom"
+      android:layout_marginRight="16dp"/>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>