[Shape] Moved utility functions for MaterialShapes to MaterialShapes.

PiperOrigin-RevId: 663482774

Author: pekingme

lib/java/com/google/android/material/loadingindicator/LoadingIndicatorDrawingDelegate.java

@@ -31,7 +31,6 @@
 import androidx.graphics.shapes.RoundedPolygon;
 import androidx.graphics.shapes.Shapes_androidKt;
 import com.google.android.material.color.MaterialColors;
-import com.google.android.material.shape.MaterialShapeUtils;
 import com.google.android.material.shape.MaterialShapes;
 
 class LoadingIndicatorDrawingDelegate {
@@ -128,13 +127,13 @@ void drawIndicator(
 
   private static final RoundedPolygon[] INDETERMINATE_SHAPES =
       new RoundedPolygon[] {
-        MaterialShapeUtils.normalize(MaterialShapes.SOFT_BURST, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.COOKIE_9, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.PENTAGON, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.PILL, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.SUNNY, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.COOKIE_4, true, new RectF(-1, -1, 1, 1)),
-        MaterialShapeUtils.normalize(MaterialShapes.OVAL, true, new RectF(-1, -1, 1, 1))
+        MaterialShapes.normalize(MaterialShapes.SOFT_BURST, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.COOKIE_9, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.PENTAGON, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.PILL, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.SUNNY, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.COOKIE_4, true, new RectF(-1, -1, 1, 1)),
+        MaterialShapes.normalize(MaterialShapes.OVAL, true, new RectF(-1, -1, 1, 1))
       };
 
   private static final Morph[] INDETERMINATE_MORPH_SEQUENCE =

lib/java/com/google/android/material/shape/MaterialShapeUtils.java

@@ -16,19 +16,9 @@
 
 package com.google.android.material.shape;
 
-import static java.lang.Math.min;
-
-import android.graphics.Matrix;
-import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.PathShape;
 import android.view.View;
 import androidx.annotation.NonNull;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.RestrictTo.Scope;
-import androidx.graphics.shapes.RoundedPolygon;
-import androidx.graphics.shapes.Shapes_androidKt;
 import com.google.android.material.internal.ViewUtils;
 
 /** Utility methods for {@link MaterialShapeDrawable} and related classes. */
@@ -94,127 +84,4 @@ public static void setParentAbsoluteElevation(
       materialShapeDrawable.setParentAbsoluteElevation(ViewUtils.getParentAbsoluteElevation(view));
     }
   }
-
-  /**
-   * Returns a {@link ShapeDrawable} with the shape's path.
-   *
-   * <p>The shape is always assumed to fit in (0, 0) to (1, 1) square.
-   *
-   * @param shape A {@link RoundedPolygon} object to be used in the drawable.
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  public static ShapeDrawable createShapeDrawable(@NonNull RoundedPolygon shape) {
-    PathShape pathShape = new PathShape(Shapes_androidKt.toPath(shape), 1, 1);
-    return new ShapeDrawable(pathShape);
-  }
-
-  /**
-   * Creates a new {@link RoundedPolygon}, moving and resizing this one, so it's completely inside
-   * the destination bounds.
-   *
-   * <p>If {@code radial} is true, the shape will be scaled to fit in the biggest circle centered in
-   * the destination bounds. This is useful when the shape is animated to rotate around its center.
-   * Otherwise, the shape will be scaled to fit in the destination bounds. With either option, the
-   * shape's original center will be aligned with the destination bounds center.
-   *
-   * @param shape The original {@link RoundedPolygon}.
-   * @param radial Whether to transform the shape to fit in the biggest circle centered in the
-   *     destination bounds.
-   * @param dstBounds The destination bounds to fit.
-   * @return A new {@link RoundedPolygon} that fits in the destination bounds.
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  public static RoundedPolygon normalize(
-      @NonNull RoundedPolygon shape, boolean radial, @NonNull RectF dstBounds) {
-    float[] srcBoundsArray = new float[4];
-    if (radial) {
-      // This calculates the axis-aligned bounds of the shape and returns that rectangle. It
-      // determines the max dimension of the shape (by calculating the distance from its center to
-      // the start and midpoint of each curve) and returns a square which can be used to hold the
-      // object in any rotation.
-      shape.calculateMaxBounds(srcBoundsArray);
-    } else {
-      // This calculates the bounds of the shape without rotating the shape.
-      shape.calculateBounds(srcBoundsArray);
-    }
-    RectF srcBounds =
-        new RectF(srcBoundsArray[0], srcBoundsArray[1], srcBoundsArray[2], srcBoundsArray[3]);
-    float scale =
-        min(dstBounds.width() / srcBounds.width(), dstBounds.height() / srcBounds.height());
-    // Scales the shape with pivot point at its original center then moves it to align its original
-    // center with the destination bounds center.
-    Matrix transform = createScaleMatrix(scale, scale);
-    transform.preTranslate(-srcBounds.centerX(), -srcBounds.centerY());
-    transform.postTranslate(dstBounds.centerX(), dstBounds.centerY());
-    return Shapes_androidKt.transformed(shape, transform);
-  }
-
-  /**
-   * Creates a new {@link RoundedPolygon}, moving and resizing this one, so it's completely inside
-   * (0, 0) - (1, 1) square.
-   *
-   * <p>If {@code radial} is true, the shape will be scaled to fit in the circle centered at (0.5,
-   * 0.5) with a radius of 0.5. This is useful when the shape is animated to rotate around its
-   * center. Otherwise, the shape will be scaled to fit in the (0, 0) - (1, 1) square. With either
-   * option, the shape center will be (0.5, 0.5).
-   *
-   * @param shape The original {@link RoundedPolygon}.
-   * @param radial Whether to transform the shape to fit in the circle centered at (0.5, 0.5) with a
-   *     radius of 0.5.
-   * @return A new {@link RoundedPolygon} that fits in (0, 0) - (1, 1) square.
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  public static RoundedPolygon normalize(@NonNull RoundedPolygon shape, boolean radial) {
-    return normalize(shape, radial, new RectF(0, 0, 1, 1));
-  }
-
-  /**
-   * Returns a {@link Matrix} with the input scales.
-   *
-   * @param scaleX Scale in X axis.
-   * @param scaleY Scale in Y axis
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  static Matrix createScaleMatrix(float scaleX, float scaleY) {
-    Matrix matrix = new Matrix();
-    matrix.setScale(scaleX, scaleY);
-    return matrix;
-  }
-
-  /**
-   * Returns a {@link Matrix} with the input rotation in degrees.
-   *
-   * @param degrees The rotation in degrees.
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  static Matrix createRotationMatrix(float degrees) {
-    Matrix matrix = new Matrix();
-    matrix.setRotate(degrees);
-    return matrix;
-  }
-
-  /**
-   * Returns a {@link Matrix} with the input skews.
-   *
-   * @param kx The skew in X axis.
-   * @param ky The skew in Y axis.
-   * @hide
-   */
-  @NonNull
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  static Matrix createSkewMatrix(float kx, float ky) {
-    Matrix matrix = new Matrix();
-    matrix.setSkew(kx, ky);
-    return matrix;
-  }
 }