[Catalog][Slider] continuous slider demo should use a single switch

PiperOrigin-RevId: 439382639

Author: veganafro

catalog/java/io/material/catalog/slider/SliderContinuousDemoFragment.java

@@ -19,14 +19,13 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import com.google.android.material.slider.Slider;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import io.material.catalog.feature.DemoFragment;
 
 /**
@@ -40,27 +39,28 @@ public View onCreateDemoView(
       LayoutInflater inflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) {
     View view = inflater.inflate(R.layout.cat_slider_demo_continuous, viewGroup, false);
 
-    setUpSlider(view, R.id.switch_button_1, R.id.slider_1, R.id.value_1, "%.0f");
-    setUpSlider(view, R.id.switch_button_2, R.id.slider_2, R.id.value_2, "%.0f");
-    setUpSlider(view, R.id.switch_button_3, R.id.slider_3, R.id.value_3, "%.2f");
+    Slider sliderOne = view.findViewById(R.id.slider_1);
+    Slider sliderTwo = view.findViewById(R.id.slider_2);
+    Slider sliderThree = view.findViewById(R.id.slider_3);
+
+    SwitchMaterial switchButton = view.findViewById(R.id.switch_button);
+
+    switchButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
+      sliderOne.setEnabled(isChecked);
+      sliderTwo.setEnabled(isChecked);
+      sliderThree.setEnabled(isChecked);
+    });
+
+    setUpSlider(sliderOne, view.findViewById(R.id.value_1), "%.0f");
+    setUpSlider(sliderTwo, view.findViewById(R.id.value_2), "%.0f");
+    setUpSlider(sliderThree, view.findViewById(R.id.value_3), "%.2f");
 
     return view;
   }
 
-  private void setUpSlider(
-      View view,
-      @IdRes int switchId,
-      @IdRes int sliderId,
-      @IdRes int valueId,
-      final String valueFormat) {
-    final TextView sliderValue = view.findViewById(valueId);
-    final Slider slider = view.findViewById(sliderId);
-    slider.addOnChangeListener(
-        (slider1, value, fromUser) -> sliderValue.setText(String.format(valueFormat, value)));
+  private void setUpSlider(Slider slider, TextView textView, final String valueFormat) {
+    slider.addOnChangeListener((slider1, value, fromUser) -> textView
+        .setText(String.format(valueFormat, value)));
     slider.setValue(slider.getValueFrom());
-    SwitchCompat switchButton = view.findViewById(switchId);
-    switchButton.setOnCheckedChangeListener(
-        (buttonView, isChecked) -> slider.setEnabled(isChecked));
-    switchButton.setChecked(true);
   }
 }

catalog/java/io/material/catalog/slider/SliderDiscreteDemoFragment.java

@@ -19,13 +19,13 @@
 import io.material.catalog.R;
 
 import android.os.Bundle;
-import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import com.google.android.material.slider.BasicLabelFormatter;
 import com.google.android.material.slider.Slider;
+import com.google.android.material.switchmaterial.SwitchMaterial;
 import io.material.catalog.feature.DemoFragment;
 import java.util.Arrays;
 import java.util.List;
@@ -53,8 +53,7 @@ public View onCreateDemoView(
         view.findViewById(R.id.slider_5),
         view.findViewById(R.id.slider_6)
     );
-    sliders.get(3).setLabelFormatter(new BasicLabelFormatter());
-    SwitchCompat switchButton = view.findViewById(R.id.switch_button);
+    SwitchMaterial switchButton = view.findViewById(R.id.switch_button);
 
     switchButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
       for (Slider slider : sliders) {

catalog/java/io/material/catalog/slider/res/layout/cat_slider_demo_continuous.xml

@@ -37,11 +37,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
 
-      <com.google.android.material.switchmaterial.SwitchMaterial
-          android:id="@+id/switch_button_1"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
-
       <com.google.android.material.slider.Slider
           android:id="@+id/slider_1"
           android:layout_width="0dp"
@@ -69,11 +64,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
 
-      <com.google.android.material.switchmaterial.SwitchMaterial
-          android:id="@+id/switch_button_2"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
-
       <com.google.android.material.slider.Slider
           android:id="@+id/slider_2"
           android:layout_width="0dp"
@@ -101,11 +91,6 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical">
 
-      <com.google.android.material.switchmaterial.SwitchMaterial
-          android:id="@+id/switch_button_3"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content" />
-
       <com.google.android.material.slider.Slider
           android:id="@+id/slider_3"
           android:layout_width="0dp"
@@ -121,5 +106,13 @@
           android:layout_width="@dimen/cat_slider_value_width"
           android:layout_height="wrap_content" />
     </LinearLayout>
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+      android:id="@+id/switch_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:checked="true"
+      android:text="@string/cat_slider_enabled"/>
   </LinearLayout>
 </ScrollView>