From 3094d3aa7545369ef6796d2afc37bcfd36f228ea Mon Sep 17 00:00:00 2001
From: Wagner Maciel <wagnermaciel@google.com>
Date: Wed, 16 Nov 2022 16:38:33 -0500
Subject: [PATCH] test(material/slider): improve slider demo

---
 src/dev-app/slider/BUILD.bazel      |  1 +
 src/dev-app/slider/slider-demo.html | 34 +++++++++++------------------
 src/dev-app/slider/slider-demo.scss |  1 +
 src/dev-app/slider/slider-demo.ts   | 28 ++++++++++++++----------
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/dev-app/slider/BUILD.bazel b/src/dev-app/slider/BUILD.bazel
index 175651724a29..07cca109687a 100644
--- a/src/dev-app/slider/BUILD.bazel
+++ b/src/dev-app/slider/BUILD.bazel
@@ -11,6 +11,7 @@ ng_module(
     ],
     deps = [
         "//src/material/button-toggle",
+        "//src/material/checkbox",
         "//src/material/slider",
         "//src/material/tabs",
         "@npm//@angular/forms",
diff --git a/src/dev-app/slider/slider-demo.html b/src/dev-app/slider/slider-demo.html
index c9ca6981d0c8..120e4df53c07 100644
--- a/src/dev-app/slider/slider-demo.html
+++ b/src/dev-app/slider/slider-demo.html
@@ -1,13 +1,14 @@
-<h1>Color Picker</h1>
+<mat-checkbox [color]="colorModel" [(ngModel)]="discrete">Discrete</mat-checkbox>
+<br>
+<mat-checkbox [color]="colorModel" [(ngModel)]="showTickMarks">Show tick marks</mat-checkbox>
+<br>
 <mat-button-toggle-group [(ngModel)]="colorModel" aria-label="Slider color options">
   <mat-button-toggle value="primary">Primary</mat-button-toggle>
   <mat-button-toggle value="accent">Accent</mat-button-toggle>
   <mat-button-toggle value="warn">Warn</mat-button-toggle>
 </mat-button-toggle-group>
 
-<br><br><br>
-
-<mat-tab-group color="{{colorModel}}">
+<mat-tab-group [color]="colorModel">
   <mat-tab label="Reactive form controls">
     <table class="demo-data-table">
       <tr>
@@ -34,12 +35,10 @@ <h1>Color Picker</h1>
     </table>
     
     <input class="demo-native-slider" type="range" [formControl]="control" #nativeSlider1 />
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
       <input matSliderThumb [formControl]="control" #ngThumb1 />
     </mat-slider>
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
       <input matSliderStartThumb [formControl]="control" #ngStartThumb1 />
       <input matSliderEndThumb #ngEndThumb1 />
     </mat-slider>
@@ -91,15 +90,11 @@ <h1>Color Picker</h1>
       </tr>
     </table>
     
-    <br>
-    
     <input class="demo-native-slider" type="range" #nativeSlider2 [(ngModel)]="valueModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel" />
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
       <input matSliderThumb #ngThumb2 [(ngModel)]="valueModel" />
     </mat-slider>
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="minModel" [max]="maxModel" [step]="stepModel" [disabled]="disabledModel">
       <input matSliderStartThumb #ngStartThumb2 [(ngModel)]="valueModel" />
       <input matSliderEndThumb #ngEndThumb2 />
     </mat-slider>
@@ -152,12 +147,10 @@ <h1>Color Picker</h1>
     </table>
 
     <input class="demo-native-slider" type="range" #nativeSlider3 [value]="value" [min]="min" [max]="max" [step]="step" [disabled]="disabled" />
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
       <input matSliderThumb #ngThumb3 [value]="value" />
     </mat-slider>
-    <br>
-    <mat-slider discrete showTickMarks color="{{colorModel}}" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
+    <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel" [min]="min" [max]="max" [step]="step" [disabled]="disabled">
       <input matSliderStartThumb #ngStartThumb3 [value]="value" />
       <input matSliderEndThumb #ngEndThumb3 />
     </mat-slider>
@@ -179,11 +172,10 @@ <h1>Color Picker</h1>
       </tr>
     </table>
     
-      <mat-slider discrete showTickMarks color="{{colorModel}}">
+      <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
         <input matSliderThumb #ngThumb4 [(value)]="twoWayValue" />
       </mat-slider>
-      <br>
-      <mat-slider discrete showTickMarks color="{{colorModel}}">
+      <mat-slider [discrete]="discrete" [showTickMarks]="showTickMarks" [color]="colorModel">
         <input matSliderStartThumb #ngStartThumb4 [(value)]="twoWayValue" />
         <input matSliderEndThumb #ngEndThumb4 />
       </mat-slider>
diff --git a/src/dev-app/slider/slider-demo.scss b/src/dev-app/slider/slider-demo.scss
index e983f7e68d7e..fcb87f1c6efa 100644
--- a/src/dev-app/slider/slider-demo.scss
+++ b/src/dev-app/slider/slider-demo.scss
@@ -44,4 +44,5 @@
   border: 1px solid;
   border-radius: 5px;
   min-width: 300px;
+  margin-top: 30px;
 }
diff --git a/src/dev-app/slider/slider-demo.ts b/src/dev-app/slider/slider-demo.ts
index 1c9c65d6977d..ba70cbbde41f 100644
--- a/src/dev-app/slider/slider-demo.ts
+++ b/src/dev-app/slider/slider-demo.ts
@@ -11,6 +11,7 @@ import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {MatSliderModule} from '@angular/material/slider';
 import {MatTabsModule} from '@angular/material/tabs';
 import {MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatCheckboxModule} from '@angular/material/checkbox';
 
 @Component({
   selector: 'slider-demo',
@@ -18,6 +19,7 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
   standalone: true,
   imports: [
     FormsModule,
+    MatCheckboxModule,
     MatButtonToggleModule,
     MatSliderModule,
     MatTabsModule,
@@ -26,22 +28,24 @@ import {MatButtonToggleModule} from '@angular/material/button-toggle';
   styleUrls: ['slider-demo.css'],
 })
 export class SliderDemo {
-  colorModel: string = 'primary';
+  discrete = true;
+  showTickMarks = true;
+  colorModel = 'primary';
 
   noop = () => {};
-  min: string = '0';
-  max: string = '100';
-  step: string = '0';
-  value: string = '0';
-  disabled: boolean = false;
+  min = '0';
+  max = '100';
+  step = '0';
+  value = '0';
+  disabled = false;
 
-  twoWayValue: number = 0;
+  twoWayValue = 0;
 
-  minModel: number = 0;
-  maxModel: number = 100;
-  valueModel: number = 0;
-  stepModel: number = 0;
-  disabledModel: boolean = false;
+  minModel = 0;
+  maxModel = 100;
+  valueModel = 0;
+  stepModel = 0;
+  disabledModel = false;
 
   control = new FormControl('0');