Skip to content

Commit 72d011d

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[Slider] Reorganized styles.
PiperOrigin-RevId: 749840827
1 parent 8dd8706 commit 72d011d

File tree

1 file changed

+39
-35
lines changed
  • lib/java/com/google/android/material/slider/res/values

1 file changed

+39
-35
lines changed

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

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

19+
<!-- Styles of M3 Slider. -->
20+
21+
<style name="Widget.Material3.Slider" parent="Widget.MaterialComponents.Slider">
22+
<item name="haloColor">#00FFFFFF</item>
23+
<item name="labelStyle">@style/Widget.Material3.Slider.Label</item>
24+
<item name="thumbColor">@color/m3_slider_thumb_color</item>
25+
<item name="tickColorActive">@color/m3_slider_active_tick_marks_color</item>
26+
<item name="tickColorInactive">@color/m3_slider_inactive_tick_marks_color</item>
27+
<item name="tickRadiusActive">@null</item>
28+
<item name="tickRadiusInactive">@null</item>
29+
<item name="trackColorActive">@color/m3_slider_active_track_color</item>
30+
<item name="trackColorInactive">@color/m3_slider_inactive_track_color</item>
31+
<item name="trackHeight">@dimen/m3_comp_slider_inactive_track_height</item>
32+
<item name="thumbElevation">0dp</item>
33+
<item name="trackInsideCornerSize">2dp</item>
34+
<item name="thumbWidth">@dimen/m3_comp_slider_active_handle_width</item>
35+
<item name="thumbHeight">@dimen/m3_comp_slider_active_handle_height</item>
36+
<item name="thumbTrackGapSize">@dimen/m3_comp_slider_active_handle_leading_space</item>
37+
<item name="trackStopIndicatorSize">@dimen/m3_comp_slider_stop_indicator_size</item>
38+
</style>
39+
40+
<style name="Widget.Material3.Slider.Label" parent="Widget.Material3.Tooltip">
41+
<item name="android:textColor">@macro/m3_comp_slider_value_indicator_label_label_text_color</item>
42+
<item name="backgroundTint">@macro/m3_comp_slider_value_indicator_container_color</item>
43+
<item name="showMarker">false</item>
44+
<item name="android:paddingStart">10dp</item>
45+
<item name="android:paddingEnd">10dp</item>
46+
<item name="android:paddingTop">@dimen/m3_comp_slider_value_indicator_active_bottom_space</item>
47+
<item name="android:paddingBottom">@dimen/m3_comp_slider_value_indicator_active_bottom_space</item>
48+
<item name="android:minHeight">32dp</item>
49+
</style>
50+
51+
<style name="Widget.Material3.Slider.Legacy.Label" parent="Widget.Material3.Tooltip">
52+
<item name="android:textColor">?attr/colorOnPrimary</item>
53+
<item name="backgroundTint">?attr/colorPrimary</item>
54+
</style>
55+
56+
<!-- Styles of M2 Slider. -->
57+
1958
<style name="Base.Widget.MaterialComponents.Slider" parent="android:Widget">
2059
<item name="haloColor">@color/material_slider_halo_color</item>
2160
<item name="haloRadius">@dimen/mtrl_slider_halo_radius</item>
@@ -54,39 +93,4 @@
5493
<item name="trackStopIndicatorSize">0dp</item>
5594
</style>
5695

57-
<style name="Widget.Material3.Slider.Legacy.Label" parent="Widget.Material3.Tooltip">
58-
<item name="android:textColor">?attr/colorOnPrimary</item>
59-
<item name="backgroundTint">?attr/colorPrimary</item>
60-
</style>
61-
62-
<style name="Widget.Material3.Slider" parent="Widget.MaterialComponents.Slider">
63-
<item name="haloColor">#00FFFFFF</item>
64-
<item name="labelStyle">@style/Widget.Material3.Slider.Label</item>
65-
<item name="thumbColor">@color/m3_slider_thumb_color</item>
66-
<item name="tickColorActive">@color/m3_slider_active_tick_marks_color</item>
67-
<item name="tickColorInactive">@color/m3_slider_inactive_tick_marks_color</item>
68-
<item name="tickRadiusActive">@null</item>
69-
<item name="tickRadiusInactive">@null</item>
70-
<item name="trackColorActive">@color/m3_slider_active_track_color</item>
71-
<item name="trackColorInactive">@color/m3_slider_inactive_track_color</item>
72-
<item name="trackHeight">@dimen/m3_comp_slider_inactive_track_height</item>
73-
<item name="thumbElevation">0dp</item>
74-
<item name="trackInsideCornerSize">2dp</item>
75-
<item name="thumbWidth">@dimen/m3_comp_slider_active_handle_width</item>
76-
<item name="thumbHeight">@dimen/m3_comp_slider_active_handle_height</item>
77-
<item name="thumbTrackGapSize">@dimen/m3_comp_slider_active_handle_leading_space</item>
78-
<item name="trackStopIndicatorSize">@dimen/m3_comp_slider_stop_indicator_size</item>
79-
</style>
80-
81-
<style name="Widget.Material3.Slider.Label" parent="Widget.Material3.Tooltip">
82-
<item name="android:textColor">@macro/m3_comp_slider_value_indicator_label_label_text_color</item>
83-
<item name="backgroundTint">@macro/m3_comp_slider_value_indicator_container_color</item>
84-
<item name="showMarker">false</item>
85-
<item name="android:paddingStart">10dp</item>
86-
<item name="android:paddingEnd">10dp</item>
87-
<item name="android:paddingTop">@dimen/m3_comp_slider_value_indicator_active_bottom_space</item>
88-
<item name="android:paddingBottom">@dimen/m3_comp_slider_value_indicator_active_bottom_space</item>
89-
<item name="android:minHeight">32dp</item>
90-
</style>
91-
9296
</resources>

0 commit comments

Comments
 (0)