Skip to content

Commit de1f5e1

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[ProgressIndicator] Reorganized styles.
PiperOrigin-RevId: 749841349
1 parent 72d011d commit de1f5e1

File tree

1 file changed

+49
-44
lines changed
  • lib/java/com/google/android/material/progressindicator/res/values

1 file changed

+49
-44
lines changed

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

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,43 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Widget.MaterialComponents.ProgressIndicator" parent="android:Widget">
19-
<item name="indicatorColor">?attr/colorPrimary</item>
20-
<item name="trackThickness">@dimen/mtrl_progress_track_thickness</item>
21-
<item name="android:indeterminateOnly">false</item>
22-
</style>
2318

24-
<!-- LinearProgressIndicator style -->
25-
<style name="Widget.MaterialComponents.LinearProgressIndicator" parent="Widget.MaterialComponents.ProgressIndicator">
26-
<item name="indeterminateAnimationType">disjoint</item>
27-
<item name="indicatorDirectionLinear">startToEnd</item>
19+
<!-- Styles for M3 ProgressIndicator. -->
20+
21+
<!-- M3 LinearProgressIndicator style -->
22+
<style name="Widget.Material3.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
23+
<item name="trackThickness">@dimen/m3_comp_progress_indicator_linear_track_thickness</item>
24+
<item name="trackColor">@macro/m3_comp_progress_indicator_track_color</item>
25+
<item name="indicatorColor">@macro/m3_comp_progress_indicator_active_indicator_color</item>
26+
<item name="trackCornerRadius">50%</item>
27+
<item name="indicatorTrackGapSize">@dimen/m3_comp_progress_indicator_linear_track_active_indicator_space</item>
28+
<item name="trackStopIndicatorSize">@dimen/m3_comp_progress_indicator_linear_stop_indicator_size</item>
2829
</style>
2930

30-
<!-- CircularProgressIndicator styles -->
31-
<style name="Widget.MaterialComponents.CircularProgressIndicator" parent="Widget.MaterialComponents.ProgressIndicator">
32-
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_medium</item>
33-
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_medium</item>
34-
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_medium</item>
35-
<item name="trackColor">@android:color/transparent</item>
36-
<item name="indicatorDirectionCircular">clockwise</item>
37-
<item name="indeterminateTrackVisible">true</item>
31+
<!-- M3 CircularProgressIndicator style -->
32+
<style name="Widget.Material3.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator">
33+
<item name="trackThickness">@dimen/m3_comp_progress_indicator_circular_track_thickness</item>
34+
<item name="indicatorSize">@dimen/m3_comp_progress_indicator_circular_size</item>
35+
<item name="indicatorColor">@macro/m3_comp_progress_indicator_active_indicator_color</item>
36+
<item name="trackColor">@macro/m3_comp_progress_indicator_track_color</item>
37+
<item name="trackCornerRadius">50%</item>
38+
<item name="indicatorTrackGapSize">@dimen/m3_comp_progress_indicator_circular_track_active_indicator_space</item>
39+
<item name="indeterminateTrackVisible">false</item>
3840
</style>
39-
<style name="Widget.MaterialComponents.CircularProgressIndicator.Medium"/>
40-
<style name="Widget.MaterialComponents.CircularProgressIndicator.Small">
41+
<style name="Widget.Material3.CircularProgressIndicator.Medium"/>
42+
<style name="Widget.Material3.CircularProgressIndicator.Small">
4143
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_small</item>
4244
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_small</item>
4345
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_small</item>
46+
<item name="trackCornerRadius">50%</item>
47+
<item name="indicatorTrackGapSize">3dp</item>
4448
</style>
45-
<style name="Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall">
49+
<style name="Widget.Material3.CircularProgressIndicator.ExtraSmall">
4650
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_extra_small</item>
4751
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_extra_small</item>
4852
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_extra_small</item>
53+
<item name="trackCornerRadius">50%</item>
54+
<item name="indicatorTrackGapSize">2dp</item>
4955
</style>
5056

5157
<!-- M3 LinearProgressIndicator Legacy style -->
@@ -79,40 +85,39 @@
7985
<item name="indicatorTrackGapSize">0dp</item>
8086
</style>
8187

82-
<!-- M3 LinearProgressIndicator style -->
83-
<style name="Widget.Material3.LinearProgressIndicator" parent="Widget.MaterialComponents.LinearProgressIndicator">
84-
<item name="trackThickness">@dimen/m3_comp_progress_indicator_linear_track_thickness</item>
85-
<item name="trackColor">@macro/m3_comp_progress_indicator_track_color</item>
86-
<item name="indicatorColor">@macro/m3_comp_progress_indicator_active_indicator_color</item>
87-
<item name="trackCornerRadius">50%</item>
88-
<item name="indicatorTrackGapSize">@dimen/m3_comp_progress_indicator_linear_track_active_indicator_space</item>
89-
<item name="trackStopIndicatorSize">@dimen/m3_comp_progress_indicator_linear_stop_indicator_size</item>
88+
<!-- Styles for M2 ProgressIndicator. -->
89+
90+
<style name="Widget.MaterialComponents.ProgressIndicator" parent="android:Widget">
91+
<item name="indicatorColor">?attr/colorPrimary</item>
92+
<item name="trackThickness">@dimen/mtrl_progress_track_thickness</item>
93+
<item name="android:indeterminateOnly">false</item>
9094
</style>
9195

92-
<!-- M3 CircularProgressIndicator style -->
93-
<style name="Widget.Material3.CircularProgressIndicator" parent="Widget.MaterialComponents.CircularProgressIndicator">
94-
<item name="trackThickness">@dimen/m3_comp_progress_indicator_circular_track_thickness</item>
95-
<item name="indicatorSize">@dimen/m3_comp_progress_indicator_circular_size</item>
96-
<item name="indicatorColor">@macro/m3_comp_progress_indicator_active_indicator_color</item>
97-
<item name="trackColor">@macro/m3_comp_progress_indicator_track_color</item>
98-
<item name="trackCornerRadius">50%</item>
99-
<item name="indicatorTrackGapSize">@dimen/m3_comp_progress_indicator_circular_track_active_indicator_space</item>
100-
<item name="indeterminateTrackVisible">false</item>
96+
<!-- LinearProgressIndicator style -->
97+
<style name="Widget.MaterialComponents.LinearProgressIndicator" parent="Widget.MaterialComponents.ProgressIndicator">
98+
<item name="indeterminateAnimationType">disjoint</item>
99+
<item name="indicatorDirectionLinear">startToEnd</item>
101100
</style>
102-
<style name="Widget.Material3.CircularProgressIndicator.Medium"/>
103-
<style name="Widget.Material3.CircularProgressIndicator.Small">
101+
102+
<!-- CircularProgressIndicator styles -->
103+
<style name="Widget.MaterialComponents.CircularProgressIndicator" parent="Widget.MaterialComponents.ProgressIndicator">
104+
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_medium</item>
105+
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_medium</item>
106+
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_medium</item>
107+
<item name="trackColor">@android:color/transparent</item>
108+
<item name="indicatorDirectionCircular">clockwise</item>
109+
<item name="indeterminateTrackVisible">true</item>
110+
</style>
111+
<style name="Widget.MaterialComponents.CircularProgressIndicator.Medium"/>
112+
<style name="Widget.MaterialComponents.CircularProgressIndicator.Small">
104113
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_small</item>
105114
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_small</item>
106115
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_small</item>
107-
<item name="trackCornerRadius">50%</item>
108-
<item name="indicatorTrackGapSize">3dp</item>
109116
</style>
110-
<style name="Widget.Material3.CircularProgressIndicator.ExtraSmall">
117+
<style name="Widget.MaterialComponents.CircularProgressIndicator.ExtraSmall">
111118
<item name="trackThickness">@dimen/mtrl_progress_circular_track_thickness_extra_small</item>
112119
<item name="indicatorSize">@dimen/mtrl_progress_circular_size_extra_small</item>
113120
<item name="indicatorInset">@dimen/mtrl_progress_circular_inset_extra_small</item>
114-
<item name="trackCornerRadius">50%</item>
115-
<item name="indicatorTrackGapSize">2dp</item>
116121
</style>
117122

118123
</resources>

0 commit comments

Comments
 (0)