[FAB] Improved readability.

pekingme · paulfthomas · commit 949b05742ff8 · 2025-03-11T18:00:04.000Z
PiperOrigin-RevId: 735467033
diff --git a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButton.java
@@ -1046,34 +1046,34 @@ public void setInternalAutoHideListener(OnVisibilityChangedListener listener) {
 
     // dereference of possibly-null reference lp
     @SuppressWarnings("nullness:dereference.of.nullable")
-    private boolean shouldUpdateVisibility(
+    private boolean ignoreUpdateVisibility(
         @NonNull View dependency, @NonNull FloatingActionButton child) {
       final CoordinatorLayout.LayoutParams lp =
           (CoordinatorLayout.LayoutParams) child.getLayoutParams();
       if (!autoHideEnabled) {
-        return false;
+        return true;
       }
 
       if (lp.getAnchorId() != dependency.getId()) {
         // The anchor ID doesn't match the dependency, so we won't automatically
         // show/hide the FAB
-        return false;
+        return true;
       }
 
       //noinspection RedundantIfStatement
       if (child.getUserSetVisibility() != VISIBLE) {
         // The view isn't set to be visible so skip changing its visibility
-        return false;
+        return true;
       }
 
-      return true;
+      return false;
     }
 
     private boolean updateFabVisibilityForAppBarLayout(
         CoordinatorLayout parent,
         @NonNull AppBarLayout appBarLayout,
         @NonNull FloatingActionButton child) {
-      if (!shouldUpdateVisibility(appBarLayout, child)) {
+      if (ignoreUpdateVisibility(appBarLayout, child)) {
         return false;
       }
 
@@ -1099,7 +1099,7 @@ private boolean updateFabVisibilityForAppBarLayout(
     @SuppressWarnings("nullness:dereference.of.nullable")
     private boolean updateFabVisibilityForBottomSheet(
         @NonNull View bottomSheet, @NonNull FloatingActionButton child) {
-      if (!shouldUpdateVisibility(bottomSheet, child)) {
+      if (ignoreUpdateVisibility(bottomSheet, child)) {
         return false;
       }
       CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) child.getLayoutParams();
@@ -1164,7 +1164,7 @@ private void offsetIfNeeded(
         @NonNull CoordinatorLayout parent, @NonNull FloatingActionButton fab) {
       final Rect padding = fab.shadowPadding;
 
-      if (padding != null && padding.centerX() > 0 && padding.centerY() > 0) {
+      if (padding.centerX() > 0 && padding.centerY() > 0) {
         final CoordinatorLayout.LayoutParams lp =
             (CoordinatorLayout.LayoutParams) fab.getLayoutParams();
 
diff --git a/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java b/lib/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java
@@ -31,7 +31,6 @@
 import android.animation.TimeInterpolator;
 import android.animation.TypeEvaluator;
 import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Matrix;
@@ -675,20 +674,16 @@ private AnimatorSet createDefaultAnimator(
     final float startImageMatrixScale = imageMatrixScale;
     final Matrix matrix = new Matrix(tmpMatrix);
     animator.addUpdateListener(
-        new AnimatorUpdateListener() {
-          @Override
-          public void onAnimationUpdate(ValueAnimator animation) {
-            float progress = (float) animation.getAnimatedValue();
-            // Animate the opacity over the first 20% of the animation
-            view.setAlpha(AnimationUtils.lerp(startAlpha, targetOpacity, 0F, 0.2F, progress));
-            view.setScaleX(AnimationUtils.lerp(startScaleX, targetScale, progress));
-            view.setScaleY(AnimationUtils.lerp(startScaleY, targetScale, progress));
-            imageMatrixScale =
-                AnimationUtils.lerp(startImageMatrixScale, targetIconScale, progress);
-            calculateImageMatrixFromScale(
-                AnimationUtils.lerp(startImageMatrixScale, targetIconScale, progress), matrix);
-            view.setImageMatrix(matrix);
-          }
+        animation -> {
+          float progress = (float) animation.getAnimatedValue();
+          // Animate the opacity over the first 20% of the animation
+          view.setAlpha(AnimationUtils.lerp(startAlpha, targetOpacity, 0F, 0.2F, progress));
+          view.setScaleX(AnimationUtils.lerp(startScaleX, targetScale, progress));
+          view.setScaleY(AnimationUtils.lerp(startScaleY, targetScale, progress));
+          imageMatrixScale = AnimationUtils.lerp(startImageMatrixScale, targetIconScale, progress);
+          calculateImageMatrixFromScale(
+              AnimationUtils.lerp(startImageMatrixScale, targetIconScale, progress), matrix);
+          view.setImageMatrix(matrix);
         });
     animators.add(animator);
     AnimatorSetCompat.playTogether(set, animators);
@@ -876,37 +871,6 @@ private Animator createElevationAnimator(float elevation, float translationZ) {
     return set;
   }
 
-  private abstract class ShadowAnimatorImpl extends AnimatorListenerAdapter
-      implements ValueAnimator.AnimatorUpdateListener {
-
-    private boolean validValues;
-    private float shadowSizeStart;
-    private float shadowSizeEnd;
-
-    @Override
-    public void onAnimationUpdate(@NonNull ValueAnimator animator) {
-      if (!validValues) {
-        shadowSizeStart = shapeDrawable == null ? 0 : shapeDrawable.getElevation();
-        shadowSizeEnd = getTargetShadowSize();
-        validValues = true;
-      }
-
-      updateShapeElevation(
-          (int)
-              (shadowSizeStart
-                  + ((shadowSizeEnd - shadowSizeStart) * animator.getAnimatedFraction())));
-    }
-
-    @Override
-    public void onAnimationEnd(Animator animator) {
-      updateShapeElevation((int) shadowSizeEnd);
-      validValues = false;
-    }
-
-    /** Returns the shadow size we want to animate to. */
-    protected abstract float getTargetShadowSize();
-  }
-
   private boolean shouldAnimateVisibilityChange() {
     return view.isLaidOut() && !view.isInEditMode();
   }
diff --git a/lib/java/com/google/android/material/transformation/FabTransformationBehavior.java b/lib/java/com/google/android/material/transformation/FabTransformationBehavior.java
@@ -374,7 +374,7 @@ private void createExpansionAnimation(
 
     float revealCenterX = calculateRevealCenterX(dependency, child, spec.positioning);
     float revealCenterY = calculateRevealCenterY(dependency, child, spec.positioning);
-    ((FloatingActionButton) dependency).getContentRect(tmpRect);
+    ((FloatingActionButton) dependency).getMeasuredContentRect(tmpRect);
     float dependencyRadius = tmpRect.width() / 2f;
 
     Animator animator;
diff --git a/tests/javatests/com/google/android/material/appbar/AppBarWithDodgingTest.java b/tests/javatests/com/google/android/material/appbar/AppBarWithDodgingTest.java
@@ -43,8 +43,8 @@ public void testLeftDodge() throws Throwable {
 
     final Rect fabRect = new Rect();
     final Rect fab2Rect = new Rect();
-    fab.getContentRect(fabRect);
-    fab2.getContentRect(fab2Rect);
+    fab.getMeasuredContentRect(fabRect);
+    fab2.getMeasuredContentRect(fab2Rect);
 
     // Our second FAB is configured to "dodge" the first one - to be displayed to the
     // right of it
@@ -72,8 +72,8 @@ public void testRightDodge() throws Throwable {
 
     final Rect fabRect = new Rect();
     final Rect fab2Rect = new Rect();
-    fab.getContentRect(fabRect);
-    fab2.getContentRect(fab2Rect);
+    fab.getMeasuredContentRect(fabRect);
+    fab2.getMeasuredContentRect(fab2Rect);
 
     // Our second FAB is configured to "dodge" the first one - to be displayed to the
     // left of it
diff --git a/tests/javatests/com/google/android/material/floatingactionbutton/FloatingActionButtonTest.java b/tests/javatests/com/google/android/material/floatingactionbutton/FloatingActionButtonTest.java
@@ -236,7 +236,7 @@ public void testClickableTouchAndDragOffView() {
                   final int[] xy = new int[2];
                   fab.getLocationOnScreen(xy);
                   final Rect rect = new Rect();
-                  fab.getContentRect(rect);
+                  fab.getMeasuredContentRect(rect);
 
                   return new float[] {xy[0] + rect.centerX(), xy[1] + rect.centerY()};
                 },
diff --git a/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java b/tests/javatests/com/google/android/material/testutils/TestUtilsMatchers.java
@@ -330,7 +330,7 @@ public boolean matchesSafely(final View view) {
         // Since the FAB background is round, and may contain the shadow, we'll look at
         // just the center half rect of the content area
         final Rect area = new Rect();
-        fab.getContentRect(area);
+        fab.getMeasuredContentRect(area);
 
         final int rectHeightQuarter = area.height() / 4;
         final int rectWidthQuarter = area.width() / 4;
@@ -404,7 +404,7 @@ public boolean matchesSafely(final View view) {
 
         final FloatingActionButton fab = (FloatingActionButton) view;
         final Rect area = new Rect();
-        fab.getContentRect(area);
+        fab.getMeasuredContentRect(area);
 
         if (area.height() != size) {
           failedCheckDescription =
@@ -439,7 +439,7 @@ public boolean matchesSafely(final View view) {
         final ViewGroup parent = (ViewGroup) view.getParent();
 
         final Rect area = new Rect();
-        fab.getContentRect(area);
+        fab.getMeasuredContentRect(area);
 
         final int absGravity =
             GravityCompat.getAbsoluteGravity(gravity, ViewCompat.getLayoutDirection(view));
