patch 1

Author: pubiqq

lib/java/com/google/android/material/slider/BaseSlider.java

@@ -59,8 +59,6 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-
-import androidx.annotation.RestrictTo;
 import androidx.appcompat.content.res.AppCompatResources;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -297,8 +295,8 @@ private interface TooltipDrawableFactory {
   // The index of the currently focused thumb.
   private int focusedThumbIdx = -1;
   private float stepSize = 0.0f;
+  private boolean areTicksDrawn = false;
   private float[] ticksCoordinates;
-  private boolean tickVisible = false;
   private int tickVisibilityMode;
   private int trackWidth;
   private boolean forceDrawCompatHalo;
@@ -479,9 +477,8 @@ private void processAttributes(Context context, AttributeSet attrs, int defStyle
             ? haloColor
             : AppCompatResources.getColorStateList(context, R.color.material_slider_halo_color));
 
-    int tickVisibilityMode = a.getInt(R.styleable.Slider_tickVisibilityMode, -1);
-    if (tickVisibilityMode != -1) {
-      this.tickVisibilityMode = tickVisibilityMode;
+    if (a.hasValue(R.styleable.Slider_tickVisibilityMode)) {
+      this.tickVisibilityMode = a.getInt(R.styleable.Slider_tickVisibilityMode, -1);
     } else {
       this.tickVisibilityMode = a.getBoolean(R.styleable.Slider_tickVisible, true)
           ? TICK_VISIBILITY_AUTO_LIMIT
@@ -1489,10 +1486,30 @@ public void setTickInactiveTintList(@NonNull ColorStateList tickColor) {
   }
 
   /**
-   * Returns whether the tick marks are visible.
+   * Returns whether the tick marks are visible. Only used when the slider is in discrete mode.
+   *
+   * @attr ref com.google.android.material.R.styleable#Slider_tickVisible
+   * @deprecated Use {@link BaseSlider#getTickVisibilityMode()} to get the current
+   *     tick visibility mode or {@link BaseSlider#areTicksDrawn()} to get whether the ticks
+   *     are currently drawn.
    */
+  @Deprecated
   public boolean isTickVisible() {
-    return tickVisible;
+    switch (tickVisibilityMode) {
+      case TICK_VISIBILITY_AUTO_LIMIT:
+        return true;
+      case TICK_VISIBILITY_HIDDEN:
+        return false;
+      default:
+        return areTicksDrawn();
+    }
+  }
+
+  /**
+   * Returns whether the tick marks are drawn.
+   */
+  public boolean areTicksDrawn() {
+    return areTicksDrawn;
   }
 
   /**
@@ -1702,28 +1719,39 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
   }
 
   private void updateTicksCoordinates() {
-    if (stepSize <= 0.0f || tickVisibilityMode == TICK_VISIBILITY_HIDDEN) {
-      updateTicksCoordinates(0);
+    if (stepSize <= 0.0f) {
+      updateTicksCoordinates(/* tickCount= */ 0);
       return;
     }
 
-    final int tickCount = (int) ((valueTo - valueFrom) / stepSize + 1);
-    if (tickVisibilityMode == TICK_VISIBILITY_VISIBLE_ALL) {
-      updateTicksCoordinates(tickCount);
-      return;
-    }
-
-    final int maxTickCount = trackWidth / (trackHeight * 2) + 1;
+    final int tickCount;
     switch (tickVisibilityMode) {
+      case TICK_VISIBILITY_VISIBLE_ALL:
+        tickCount = getDesiredTickCount();
+        break;
       case TICK_VISIBILITY_AUTO_LIMIT:
-        updateTicksCoordinates(min(tickCount, maxTickCount));
-        return;
+        tickCount = min(getDesiredTickCount(), getMaxTickCount());
+        break;
       case TICK_VISIBILITY_AUTO_HIDE:
-        updateTicksCoordinates(tickCount <= maxTickCount ? tickCount : 0);
-        return;
+        int desiredTickCount = getDesiredTickCount();
+        tickCount = desiredTickCount <= getMaxTickCount() ? desiredTickCount : 0;
+        break;
+      case TICK_VISIBILITY_HIDDEN:
+        tickCount = 0;
+        break;
       default:
         throw new IllegalArgumentException("Invalid tick visibility mode: " + tickVisibilityMode);
     }
+
+    updateTicksCoordinates(tickCount);
+  }
+
+  private int getDesiredTickCount() {
+    return (int) ((valueTo - valueFrom) / stepSize + 1);
+  }
+
+  private int getMaxTickCount() {
+    return trackWidth / (trackHeight * 2) + 1;
   }
 
   private void updateTicksCoordinates(int tickCount) {
@@ -1791,7 +1819,7 @@ protected void onDraw(@NonNull Canvas canvas) {
       drawActiveTrack(canvas, trackWidth, yCenter);
     }
 
-    tickVisible = maybeDrawTicks(canvas);
+    areTicksDrawn = maybeDrawTicks(canvas);
 
     if ((thumbIsPressed || isFocused() || shouldAlwaysShowLabel()) && isEnabled()) {
       maybeDrawHalo(canvas, trackWidth, yCenter);