Skip to content

Commit 3a29699

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[Slider] Added Expressive styles.
PiperOrigin-RevId: 750463306
1 parent 8e33421 commit 3a29699

File tree

3 files changed

+80
-0
lines changed

3 files changed

+80
-0
lines changed

‎lib/java/com/google/android/material/slider/res/values/styles.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,41 @@
1616
-->
1717
<resources>
1818

19+
<!-- Styles of M3 Expressive Slider. -->
20+
21+
<style name="Widget.Material3Expressive.Slider.Xsmall" parent="Widget.Material3.Slider">
22+
<item name="trackHeight">@dimen/m3_comp_slider_xsmall_active_track_height</item>
23+
<item name="thumbHeight">@dimen/m3_comp_slider_xsmall_active_handle_height</item>
24+
<item name="trackCornerSize">@dimen/m3_comp_slider_xsmall_active_track_shape_leading</item>
25+
</style>
26+
27+
<style name="Widget.Material3Expressive.Slider.Small" parent="Widget.Material3.Slider">
28+
<item name="trackHeight">@dimen/m3_comp_slider_small_active_track_height</item>
29+
<item name="thumbHeight">@dimen/m3_comp_slider_small_active_handle_height</item>
30+
<item name="trackCornerSize">@dimen/m3_comp_slider_small_active_track_shape_leading</item>
31+
</style>
32+
33+
<style name="Widget.Material3Expressive.Slider.Medium" parent="Widget.Material3.Slider">
34+
<item name="trackHeight">@dimen/m3_comp_slider_medium_active_track_height</item>
35+
<item name="thumbHeight">@dimen/m3_comp_slider_medium_active_handle_height</item>
36+
<item name="trackCornerSize">@dimen/m3_comp_slider_medium_active_track_shape_leading</item>
37+
<item name="trackIconSize">@dimen/m3_comp_slider_medium_icon_size</item>
38+
</style>
39+
40+
<style name="Widget.Material3Expressive.Slider.Large" parent="Widget.Material3.Slider">
41+
<item name="trackHeight">@dimen/m3_comp_slider_large_active_track_height</item>
42+
<item name="thumbHeight">@dimen/m3_comp_slider_large_active_handle_height</item>
43+
<item name="trackCornerSize">@dimen/m3_comp_slider_large_active_track_shape_leading</item>
44+
<item name="trackIconSize">@dimen/m3_comp_slider_large_icon_size</item>
45+
</style>
46+
47+
<style name="Widget.Material3Expressive.Slider.Xlarge" parent="Widget.Material3.Slider">
48+
<item name="trackHeight">@dimen/m3_comp_slider_xlarge_active_track_height</item>
49+
<item name="thumbHeight">@dimen/m3_comp_slider_xlarge_active_handle_height</item>
50+
<item name="trackCornerSize">@dimen/m3_comp_slider_xlarge_active_track_shape_leading</item>
51+
<item name="trackIconSize">@dimen/m3_comp_slider_xlarge_icon_size</item>
52+
</style>
53+
1954
<!-- Styles of M3 Slider. -->
2055

2156
<style name="Widget.Material3.Slider" parent="Widget.MaterialComponents.Slider">

‎lib/java/com/google/android/material/slider/res/values/tokens.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,45 @@
5252
<macro name="m3_comp_slider_value_indicator_label_label_text_color">?attr/colorOnSurfaceInverse</macro>
5353
<dimen name="m3_comp_slider_value_indicator_active_bottom_space">12dp</dimen>
5454

55+
<!-- Generated from token set (md.comp.slider.xsmall) in context (platform=android, audience=3p). -->
56+
<!-- Group: Active track -->
57+
<dimen name="m3_comp_slider_xsmall_active_track_height">16dp</dimen>
58+
<dimen name="m3_comp_slider_xsmall_active_track_shape_leading">8dp</dimen>
59+
<!-- Group: Handle -->
60+
<dimen name="m3_comp_slider_xsmall_active_handle_height">44dp</dimen>
61+
62+
<!-- Generated from token set (md.comp.slider.small) in context (platform=android, audience=3p). -->
63+
<!-- Group: Active track -->
64+
<dimen name="m3_comp_slider_small_active_track_height">24dp</dimen>
65+
<dimen name="m3_comp_slider_small_active_track_shape_leading">8dp</dimen>
66+
<!-- Group: Handle -->
67+
<dimen name="m3_comp_slider_small_active_handle_height">44dp</dimen>
68+
69+
<!-- Generated from token set (md.comp.slider.medium) in context (platform=android, audience=3p). -->
70+
<!-- Group: Active track -->
71+
<dimen name="m3_comp_slider_medium_active_track_height">40dp</dimen>
72+
<dimen name="m3_comp_slider_medium_active_track_shape_leading">12dp</dimen>
73+
<!-- Group: Handle -->
74+
<dimen name="m3_comp_slider_medium_active_handle_height">44dp</dimen>
75+
<!-- Group: Icon -->
76+
<dimen name="m3_comp_slider_medium_icon_size">24dp</dimen>
77+
78+
<!-- Generated from token set (md.comp.slider.large) in context (platform=android, audience=3p). -->
79+
<!-- Group: Active track -->
80+
<dimen name="m3_comp_slider_large_active_track_height">56dp</dimen>
81+
<dimen name="m3_comp_slider_large_active_track_shape_leading">16dp</dimen>
82+
<!-- Group: Handle -->
83+
<dimen name="m3_comp_slider_large_active_handle_height">68dp</dimen>
84+
<!-- Group: Icon -->
85+
<dimen name="m3_comp_slider_large_icon_size">24dp</dimen>
86+
87+
<!-- Generated from token set (md.comp.slider.xlarge) in context (platform=android, audience=3p). -->
88+
<!-- Group: Active track -->
89+
<dimen name="m3_comp_slider_xlarge_active_track_height">96dp</dimen>
90+
<dimen name="m3_comp_slider_xlarge_active_track_shape_leading">28dp</dimen>
91+
<!-- Group: Handle -->
92+
<dimen name="m3_comp_slider_xlarge_active_handle_height">108dp</dimen>
93+
<!-- Group: Icon -->
94+
<dimen name="m3_comp_slider_xlarge_icon_size">32dp</dimen>
95+
5596
</resources>

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
<item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
7575
<item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
7676

77+
<item name="sliderStyle">@style/Widget.Material3Expressive.Slider.Xsmall</item>
78+
7779
<!-- Top App Bars. -->
7880
<item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
7981
<item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
@@ -132,6 +134,8 @@
132134
<item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
133135
<item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
134136

137+
<item name="sliderStyle">@style/Widget.Material3Expressive.Slider.Xsmall</item>
138+
135139
<!-- Top App Bars. -->
136140
<item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
137141
<item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>

0 commit comments

Comments
 (0)