[ProgressIndicator] Updated class visibility.

PiperOrigin-RevId: 342664697

Author: pekingme

catalog/java/io/material/catalog/progressindicator/ProgressIndicatorStandaloneDemoFragment.java

@@ -25,8 +25,6 @@
 import androidx.annotation.Nullable;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.internal.ViewUtils;
-import com.google.android.material.progressindicator.CircularDrawingDelegate;
-import com.google.android.material.progressindicator.CircularIndeterminateAnimatorDelegate;
 import com.google.android.material.progressindicator.CircularProgressIndicatorSpec;
 import com.google.android.material.progressindicator.IndeterminateDrawable;
 import com.google.android.material.switchmaterial.SwitchMaterial;
@@ -55,11 +53,7 @@ public View onCreateDemoView(
     spec.indicatorInset = 0; // No inset.
     spec.indicatorRadius = (int) ViewUtils.dpToPx(getContext(), 10); // Circular radius is 10 dp.
     IndeterminateDrawable progressIndicatorDrawable =
-        new IndeterminateDrawable(
-            getContext(),
-            /*animatedVisibilityChangeBehavior=*/ spec,
-            new CircularDrawingDelegate(spec),
-            new CircularIndeterminateAnimatorDelegate(spec));
+        IndeterminateDrawable.createCircularDrawable(getContext(), spec);
 
     Chip chip = view.findViewById(R.id.cat_progress_indicator_chip);
     chip.setChipIcon(progressIndicatorDrawable);

lib/java/com/google/android/material/progressindicator/AnimatedVisibilityChangeBehavior.java

@@ -16,7 +16,7 @@
 package com.google.android.material.progressindicator;
 
 /** An interface to show whether show/hide behaviors are needed for a progress indicator. */
-public interface AnimatedVisibilityChangeBehavior {
+interface AnimatedVisibilityChangeBehavior {
 
   /** Returns whether the visibility change should be animated while showing. */
   boolean isShowAnimationEnabled();

lib/java/com/google/android/material/progressindicator/BaseProgressIndicator.java

@@ -75,18 +75,18 @@ public class BaseProgressIndicator extends ProgressBar {
   public static final int HIDE_OUTWARD = 1;
   public static final int HIDE_INWARD = 2;
 
-  protected static final int DEF_STYLE_RES = R.style.Widget_MaterialComponents_ProgressIndicator;
+  static final int DEF_STYLE_RES = R.style.Widget_MaterialComponents_ProgressIndicator;
 
-  protected static final float DEFAULT_OPACITY = 0.2f;
-  protected static final int MAX_ALPHA = 255;
+  static final float DEFAULT_OPACITY = 0.2f;
+  static final int MAX_ALPHA = 255;
   /**
    * The maximum time, in milliseconds, that the requested hide action is allowed to wait once
    * {@link #show()} is called.
    */
   private static final int MAX_HIDE_DELAY = 1000;
 
   /** A place to hold all the attributes. */
-  protected final BaseProgressIndicatorSpec baseSpec;
+  final BaseProgressIndicatorSpec baseSpec;
 
   /** A temp place to hold new progress while switching from indeterminate to determinate mode. */
   private int storedProgress;
@@ -251,8 +251,8 @@ public void hide() {
    * @see #hide()
    */
   private void internalHide() {
-    getCurrentDrawable()
-        .setVisible(/*visible=*/ false, /*restart=*/ false, /*animationDesired=*/ true);
+    ((DrawableWithAnimatedVisibilityChange) getCurrentDrawable())
+        .setVisible(/*visible=*/ false, /*restart=*/ false, /*animate=*/ true);
 
     if (isNoLongerNeedToBeVisible()) {
       setVisibility(INVISIBLE);
@@ -262,27 +262,28 @@ private void internalHide() {
   @Override
   protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
     super.onVisibilityChanged(changedView, visibility);
-    applyNewVisibility(/*animationDesired=*/ visibility == VISIBLE);
+    applyNewVisibility(/*animate=*/ visibility == VISIBLE);
   }
 
   @Override
   protected void onWindowVisibilityChanged(int visibility) {
     super.onWindowVisibilityChanged(visibility);
-    applyNewVisibility(/*animationDesired=*/ false);
+    applyNewVisibility(/*animate=*/ false);
   }
 
   /**
    * If it changes to visible, the start animation will be started if {@code showAnimationBehavior}
    * indicates any. If it changes to invisible, hides the drawable immediately.
    *
-   * @param animationDesired Whether to change the visibility with animation.
+   * @param animate Whether to change the visibility with animation.
    */
-  protected void applyNewVisibility(boolean animationDesired) {
+  protected void applyNewVisibility(boolean animate) {
     if (!isParentDoneInitializing) {
       return;
     }
 
-    getCurrentDrawable().setVisible(visibleToUser(), /*restart=*/ false, animationDesired);
+    ((DrawableWithAnimatedVisibilityChange) getCurrentDrawable())
+        .setVisible(visibleToUser(), /*restart=*/ false, animate);
   }
 
   @Override
@@ -300,7 +301,7 @@ protected void onDetachedFromWindow() {
     // Removes the delayedHide and delayedShow runnables from the queue if it has been scheduled.
     removeCallbacks(delayedHide);
     removeCallbacks(delayedShow);
-    getCurrentDrawable().hideNow();
+    ((DrawableWithAnimatedVisibilityChange) getCurrentDrawable()).hideNow();
     unregisterAnimationCallbacks();
     super.onDetachedFromWindow();
   }
@@ -329,6 +330,9 @@ protected synchronized void onDraw(@NonNull Canvas canvas) {
   protected synchronized void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     DrawingDelegate drawingDelegate = getCurrentDrawingDelegate();
+    if (drawingDelegate == null) {
+      return;
+    }
     int drawableMeasuredWidth = drawingDelegate.getPreferredWidth();
     int drawableMeasuredHeight = drawingDelegate.getPreferredHeight();
     setMeasuredDimension(
@@ -353,13 +357,13 @@ public void invalidate() {
   /** Returns the corresponding drawable based on current indeterminate state. */
   @Override
   @Nullable
-  public DrawableWithAnimatedVisibilityChange getCurrentDrawable() {
+  public Drawable getCurrentDrawable() {
     return isIndeterminate() ? getIndeterminateDrawable() : getProgressDrawable();
   }
 
   /** Returns the drawing delegate associated with the current drawable. */
   @Nullable
-  public DrawingDelegate getCurrentDrawingDelegate() {
+  private DrawingDelegate getCurrentDrawingDelegate() {
     if (isIndeterminate()) {
       return getIndeterminateDrawable() == null
           ? null
@@ -431,7 +435,7 @@ public IndeterminateDrawable getIndeterminateDrawable() {
    * Returns whether or not this view is currently displayed in window, based on whether it is
    * attached to a window and whether it and its ancestors are visible.
    */
-  protected boolean visibleToUser() {
+  boolean visibleToUser() {
     return ViewCompat.isAttachedToWindow(this)
         && getWindowVisibility() == View.VISIBLE
         && isEffectivelyVisible();
@@ -460,7 +464,7 @@ && getWindowVisibility() == View.VISIBLE
    * conclusively prove otherwise (but may result in some false positives, if this view ends up
    * being attached to a non-visible hierarchy after being detached in a visible state).
    */
-  protected boolean isEffectivelyVisible() {
+  boolean isEffectivelyVisible() {
     View current = this;
     do {
       if (current.getVisibility() != VISIBLE) {
@@ -508,14 +512,16 @@ public synchronized void setIndeterminate(boolean indeterminate) {
 
     // Needs to explicitly set visibility of two drawables. ProgressBar.setIndeterminate doesn't
     // handle it properly for pre-lollipop.
-    DrawableWithAnimatedVisibilityChange oldDrawable = getCurrentDrawable();
+    DrawableWithAnimatedVisibilityChange oldDrawable =
+        (DrawableWithAnimatedVisibilityChange) getCurrentDrawable();
     if (oldDrawable != null) {
       oldDrawable.hideNow();
     }
     super.setIndeterminate(indeterminate);
-    DrawableWithAnimatedVisibilityChange newDrawable = getCurrentDrawable();
+    DrawableWithAnimatedVisibilityChange newDrawable =
+        (DrawableWithAnimatedVisibilityChange) getCurrentDrawable();
     if (newDrawable != null) {
-      newDrawable.setVisible(visibleToUser(), /*restart=*/ false, /*animationDesired=*/ false);
+      newDrawable.setVisible(visibleToUser(), /*restart=*/ false, /*animate=*/ false);
     }
 
     // Indeterminate mode change finished.
@@ -691,7 +697,7 @@ public void setHideAnimationBehavior(@HideAnimationBehavior int hideAnimationBeh
    *
    * @param progress The new progress value.
    * @see ProgressBar#setProgress(int)
-   * @see #setProgress(int, boolean)
+   * @see #setProgressCompat(int, boolean)
    */
   @Override
   public synchronized void setProgress(int progress) {

lib/java/com/google/android/material/progressindicator/CircularDrawingDelegate.java

@@ -26,7 +26,7 @@
 import com.google.android.material.color.MaterialColors;
 
 /** A delegate class to help draw the graphics for {@link CircularProgressIndicator}. */
-public final class CircularDrawingDelegate extends DrawingDelegate {
+final class CircularDrawingDelegate extends DrawingDelegate {
 
   private final CircularProgressIndicatorSpec spec;
   private final BaseProgressIndicatorSpec baseSpec;
@@ -68,6 +68,8 @@ public int getPreferredHeight() {
   public void adjustCanvas(
       @NonNull Canvas canvas,
       @FloatRange(from = 0.0, to = 1.0) float indicatorSizeFraction) {
+    spec.validateSpec();
+
     int outerRadiusWithInset =
         spec.indicatorRadius + baseSpec.indicatorSize / 2 + spec.indicatorInset;
     canvas.translate(outerRadiusWithInset, outerRadiusWithInset);

lib/java/com/google/android/material/progressindicator/CircularIndeterminateAnimatorDelegate.java

@@ -32,7 +32,7 @@
  * This is the implementation class for drawing progress indicator in the circular indeterminate
  * mode.
  */
-public final class CircularIndeterminateAnimatorDelegate
+final class CircularIndeterminateAnimatorDelegate
     extends IndeterminateAnimatorDelegate<AnimatorSet> {
 
   // Constants for animation values.

lib/java/com/google/android/material/progressindicator/CircularProgressIndicator.java

@@ -48,14 +48,14 @@
  *   <li>{@code indicatorDirectionCircular}: the rotation direction of the spinner or indicator.
  * </ul>
  */
-public class CircularProgressIndicator extends BaseProgressIndicator {
+public final class CircularProgressIndicator extends BaseProgressIndicator {
   public static final int DEF_STYLE_RES =
       R.style.Widget_MaterialComponents_CircularProgressIndicator;
 
   public static final int INDICATOR_DIRECTION_CLOCKWISE = 0;
   public static final int INDICATOR_DIRECTION_COUNTERCLOCKWISE = 1;
 
-  protected final CircularProgressIndicatorSpec spec;
+  final CircularProgressIndicatorSpec spec;
 
   // **************** Constructors ****************
 
@@ -83,16 +83,8 @@ public CircularProgressIndicator(
   // ******************** Initialization **********************
 
   private void initializeDrawables() {
-    AnimatedVisibilityChangeBehavior behavior = spec;
-    setIndeterminateDrawable(
-        new IndeterminateDrawable(
-            getContext(),
-            behavior,
-            new CircularDrawingDelegate(spec),
-            new CircularIndeterminateAnimatorDelegate(spec)));
-    setProgressDrawable(
-        new DeterminateDrawable(
-            getContext(), baseSpec, behavior, new CircularDrawingDelegate(spec)));
+    setIndeterminateDrawable(IndeterminateDrawable.createCircularDrawable(getContext(), spec));
+    setProgressDrawable(DeterminateDrawable.createCircularDrawable(getContext(), spec));
   }
 
   // **************** Getters and setters ****************
@@ -145,15 +137,15 @@ public void setIndicatorInset(@Px int indicatorInset) {
    *     com.google.android.material.progressindicator.R.stylable#CircularProgressIndicator_indicatorRadius
    */
   @Px
-  public int getIndicatorrRadius() {
+  public int getIndicatorRadius() {
     return spec.indicatorRadius;
   }
 
   /**
    * Sets the radius of this progress indicator.
    *
    * @param indicatorRadius The new radius in pixels.
-   * @see #getIndicatorrRadius()
+   * @see #getIndicatorRadius()
    * @attr ref
    *     com.google.android.material.progressindicator.R.stylable#CircularProgressIndicator_indicatorRadius
    * @throws IllegalArgumentException if new indicator radius is less than half of the indicator

lib/java/com/google/android/material/progressindicator/CircularProgressIndicatorSpec.java

@@ -31,10 +31,10 @@
 
 /**
  * This class contains the parameters for drawing a circular type progress indicator. The parameters
- * reflect the attributes defined in {@link R.styleable.BaseProgressIndicator} and {@link
- * R.styleable.CircularProgressIndicator}.
+ * reflect the attributes defined in {@link R.styleable#BaseProgressIndicator} and {@link
+ * R.styleable#CircularProgressIndicator}.
  */
-public class CircularProgressIndicatorSpec implements AnimatedVisibilityChangeBehavior {
+public final class CircularProgressIndicatorSpec implements AnimatedVisibilityChangeBehavior {
 
   private final BaseProgressIndicatorSpec baseSpec;
 
@@ -111,7 +111,7 @@ private void loadAttributes(@NonNull Context context, @Nullable AttributeSet att
     a.recycle();
   }
 
-  protected void validateSpec() {
+  void validateSpec() {
     if (indicatorRadius < baseSpec.indicatorSize / 2) {
       // Throws an exception if circularRadius is less than half of the indicatorSize, which will
       // result in a part of the inner side of the indicator overshoots the center, and the visual