[Carousel] Renamed Maskable.getMaskRect to Maskable.getMaskRectF

PiperOrigin-RevId: 508626230
material-components · Feb 10, 2023 · 4b1a890 · 4b1a890
1 parent fc0f53a
commit 4b1a890
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/java/com/google/android/material/carousel/Maskable.java b/lib/java/com/google/android/material/carousel/Maskable.java
@@ -43,7 +43,7 @@ interface Maskable {
 
   /** Gets a {@link RectF} that this {@link View} is masking itself by. */
   @NonNull
-  RectF getMaskRect();
+  RectF getMaskRectF();
 
   /** Adds an {@link OnMaskChangedListener}. */
   void addOnMaskChangedListener(@NonNull OnMaskChangedListener listener);

diff --git a/lib/java/com/google/android/material/carousel/MaskableFrameLayout.java b/lib/java/com/google/android/material/carousel/MaskableFrameLayout.java
@@ -100,7 +100,7 @@ public float getMaskXPercentage() {
   /** Gets a {@link RectF} that this {@link View} is masking itself by. */
   @NonNull
   @Override
-  public RectF getMaskRect() {
+  public RectF getMaskRectF() {
     return maskRect;
   }
 
@@ -178,7 +178,7 @@ private static void initMaskOutlineProvider(MaskableFrameLayout maskableFrameLay
           new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
-              RectF maskRect = ((MaskableFrameLayout) view).getMaskRect();
+              RectF maskRect = ((MaskableFrameLayout) view).getMaskRectF();
               float cornerSize = ((MaskableFrameLayout) view).getCornerRadiusFromShapeAppearance();
               if (!maskRect.isEmpty()) {
                 outline.setRoundRect(

diff --git a/lib/javatests/com/google/android/material/carousel/CarouselLayoutManagerTest.java b/lib/javatests/com/google/android/material/carousel/CarouselLayoutManagerTest.java
@@ -117,7 +117,7 @@ protected KeylineState onFirstChildMeasuredWithMargins(
     setAdapterItems(recyclerView, layoutManager, adapter, createDataSetWithSize(1));
 
     MaskableFrameLayout child = (MaskableFrameLayout) recyclerView.getChildAt(0);
-    assertThat(child.getMaskRect().width()).isEqualTo(450F * .2F);
+    assertThat(child.getMaskRectF().width()).isEqualTo(450F * .2F);
   }
 
   @Test
@@ -134,10 +134,10 @@ protected KeylineState onFirstChildMeasuredWithMargins(
     setAdapterItems(recyclerView, layoutManager, adapter, createDataSetWithSize(10));
 
     MaskableFrameLayout firstChild = (MaskableFrameLayout) recyclerView.getChildAt(0);
-    int maskLeft = (int) firstChild.getMaskRect().left;
+    int maskLeft = (int) firstChild.getMaskRectF().left;
     MaskableFrameLayout lastChild =
         (MaskableFrameLayout) recyclerView.getChildAt(recyclerView.getChildCount() - 1);
-    int maskRight = (int) (lastChild.getWidth() - lastChild.getMaskRect().right);
+    int maskRight = (int) (lastChild.getWidth() - lastChild.getMaskRectF().right);
 
     assertThat(firstChild.getLeft() + maskLeft).isEqualTo(0);
     assertThat(lastChild.getRight() - maskRight).isEqualTo(DEFAULT_RECYCLER_VIEW_WIDTH);