Skip to content

Commit a28f0e0

Browse files
pekingmeleticiarossi
pekingme
authored and
leticiarossi
committed
[Dialog] Reorganized styles.
PiperOrigin-RevId: 749086083
1 parent 4b9df08 commit a28f0e0

File tree

1 file changed

+72
-71
lines changed
  • lib/java/com/google/android/material/dialog/res/values

1 file changed

+72
-71
lines changed

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

Lines changed: 72 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,78 @@
1717

1818
<resources xmlns:tools="http://schemas.android.com/tools">
1919

20-
<!-- Styles for MaterialComponents Dialogs. -->
20+
<!-- Styles for M3 Dialogs. -->
21+
22+
<style name="Widget.Material3.CheckedTextView" parent="Widget.MaterialComponents.CheckedTextView">
23+
<item name="android:textAppearance">?attr/textAppearanceBodyLarge</item>
24+
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
25+
</style>
26+
27+
<style name="MaterialAlertDialog.Material3" parent="MaterialAlertDialog.MaterialComponents">
28+
<item name="backgroundTint">@macro/m3_comp_dialog_container_color</item>
29+
<item name="enforceMaterialTheme">true</item>
30+
<item name="android:layout">@layout/m3_alert_dialog</item>
31+
<item name="shapeAppearance">@macro/m3_comp_dialog_container_shape</item>
32+
</style>
33+
34+
<style name="ShapeAppearanceOverlay.MaterialAlertDialog.Material3" parent="">
35+
<item name="cornerSize">@dimen/m3_alert_dialog_corner_size</item>
36+
</style>
37+
38+
<style name="MaterialAlertDialog.Material3.Title.Panel" parent="MaterialAlertDialog.MaterialComponents.Title.Panel"/>
39+
40+
<style name="MaterialAlertDialog.Material3.Title.Panel.CenterStacked">
41+
<item name="android:orientation">vertical</item>
42+
</style>
43+
44+
<style name="MaterialAlertDialog.Material3.Title.Icon" parent="MaterialAlertDialog.MaterialComponents.Title.Icon">
45+
<item name="android:layout_width">@dimen/m3_alert_dialog_icon_size</item>
46+
<item name="android:layout_height">@dimen/m3_alert_dialog_icon_size</item>
47+
<item name="android:layout_marginEnd">@dimen/m3_alert_dialog_icon_margin</item>
48+
<item name="android:layout_marginRight">@dimen/m3_alert_dialog_icon_margin</item>
49+
<item name="android:theme">@style/ThemeOverlay.MaterialAlertDialog.Material3.Title.Icon</item>
50+
</style>
51+
52+
<!-- Theme overlay to override icon colors if it's a vector drawable with default colors. -->
53+
<style name="ThemeOverlay.MaterialAlertDialog.Material3.Title.Icon" parent="">
54+
<item name="colorControlNormal">?attr/colorSecondary</item>
55+
</style>
56+
57+
<style name="MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
58+
<item name="android:layout_marginEnd">0dp</item>
59+
<item name="android:layout_marginRight">0dp</item>
60+
<item name="android:layout_marginBottom">@dimen/m3_alert_dialog_icon_margin</item>
61+
<item name="android:layout_gravity">center</item>
62+
</style>
63+
64+
<style name="MaterialAlertDialog.Material3.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
65+
<item name="android:textAppearance">@macro/m3_comp_dialog_headline_type</item>
66+
<item name="android:textColor">@macro/m3_comp_dialog_headline_color</item>
67+
</style>
68+
69+
<style name="MaterialAlertDialog.Material3.Title.Text.CenterStacked">
70+
<item name="android:layout_gravity">center</item>
71+
<item name="android:gravity">center</item>
72+
<item name="android:textAlignment">gravity</item>
73+
</style>
74+
75+
<style name="MaterialAlertDialog.Material3.Body.Text" parent="">
76+
<item name="android:textAppearance">@macro/m3_comp_dialog_supporting_text_type</item>
77+
<item name="android:textColor">@macro/m3_comp_dialog_supporting_text_color</item>
78+
</style>
79+
80+
<style name="MaterialAlertDialog.Material3.Body.Text.CenterStacked">
81+
<item name="android:layout_gravity">center</item>
82+
<item name="android:gravity">center</item>
83+
<item name="android:textAlignment">gravity</item>
84+
</style>
85+
86+
<style name="MaterialAlertDialog.Material3.Animation">
87+
<item name="android:windowEnterAnimation">@anim/m3_motion_fade_enter</item>
88+
<item name="android:windowExitAnimation">@anim/m3_motion_fade_exit</item>
89+
</style>
90+
91+
<!-- Styles for M2 Dialogs. -->
2192

2293
<style name="Base.Widget.MaterialComponents.CheckedTextView" parent="android:Widget.Material.CheckedTextView"/>
2394

@@ -104,74 +175,4 @@
104175
<item name="android:textAppearance">?attr/textAppearanceBody2</item>
105176
<item name="android:textColor">@color/material_on_surface_emphasis_medium</item>
106177
</style>
107-
108-
<!-- Styles for M3 Dialogs. -->
109-
<style name="Widget.Material3.CheckedTextView" parent="Widget.MaterialComponents.CheckedTextView">
110-
<item name="android:textAppearance">?attr/textAppearanceBodyLarge</item>
111-
<item name="android:textColor">?attr/colorOnSurfaceVariant</item>
112-
</style>
113-
114-
<style name="MaterialAlertDialog.Material3" parent="MaterialAlertDialog.MaterialComponents">
115-
<item name="backgroundTint">@macro/m3_comp_dialog_container_color</item>
116-
<item name="enforceMaterialTheme">true</item>
117-
<item name="android:layout">@layout/m3_alert_dialog</item>
118-
<item name="shapeAppearance">@macro/m3_comp_dialog_container_shape</item>
119-
</style>
120-
121-
<style name="ShapeAppearanceOverlay.MaterialAlertDialog.Material3" parent="">
122-
<item name="cornerSize">@dimen/m3_alert_dialog_corner_size</item>
123-
</style>
124-
125-
<style name="MaterialAlertDialog.Material3.Title.Panel" parent="MaterialAlertDialog.MaterialComponents.Title.Panel"/>
126-
127-
<style name="MaterialAlertDialog.Material3.Title.Panel.CenterStacked">
128-
<item name="android:orientation">vertical</item>
129-
</style>
130-
131-
<style name="MaterialAlertDialog.Material3.Title.Icon" parent="MaterialAlertDialog.MaterialComponents.Title.Icon">
132-
<item name="android:layout_width">@dimen/m3_alert_dialog_icon_size</item>
133-
<item name="android:layout_height">@dimen/m3_alert_dialog_icon_size</item>
134-
<item name="android:layout_marginEnd">@dimen/m3_alert_dialog_icon_margin</item>
135-
<item name="android:layout_marginRight">@dimen/m3_alert_dialog_icon_margin</item>
136-
<item name="android:theme">@style/ThemeOverlay.MaterialAlertDialog.Material3.Title.Icon</item>
137-
</style>
138-
139-
<!-- Theme overlay to override icon colors if it's a vector drawable with default colors. -->
140-
<style name="ThemeOverlay.MaterialAlertDialog.Material3.Title.Icon" parent="">
141-
<item name="colorControlNormal">?attr/colorSecondary</item>
142-
</style>
143-
144-
<style name="MaterialAlertDialog.Material3.Title.Icon.CenterStacked">
145-
<item name="android:layout_marginEnd">0dp</item>
146-
<item name="android:layout_marginRight">0dp</item>
147-
<item name="android:layout_marginBottom">@dimen/m3_alert_dialog_icon_margin</item>
148-
<item name="android:layout_gravity">center</item>
149-
</style>
150-
151-
<style name="MaterialAlertDialog.Material3.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
152-
<item name="android:textAppearance">@macro/m3_comp_dialog_headline_type</item>
153-
<item name="android:textColor">@macro/m3_comp_dialog_headline_color</item>
154-
</style>
155-
156-
<style name="MaterialAlertDialog.Material3.Title.Text.CenterStacked">
157-
<item name="android:layout_gravity">center</item>
158-
<item name="android:gravity">center</item>
159-
<item name="android:textAlignment">gravity</item>
160-
</style>
161-
162-
<style name="MaterialAlertDialog.Material3.Body.Text" parent="">
163-
<item name="android:textAppearance">@macro/m3_comp_dialog_supporting_text_type</item>
164-
<item name="android:textColor">@macro/m3_comp_dialog_supporting_text_color</item>
165-
</style>
166-
167-
<style name="MaterialAlertDialog.Material3.Body.Text.CenterStacked">
168-
<item name="android:layout_gravity">center</item>
169-
<item name="android:gravity">center</item>
170-
<item name="android:textAlignment">gravity</item>
171-
</style>
172-
173-
<style name="MaterialAlertDialog.Material3.Animation">
174-
<item name="android:windowEnterAnimation">@anim/m3_motion_fade_enter</item>
175-
<item name="android:windowExitAnimation">@anim/m3_motion_fade_exit</item>
176-
</style>
177178
</resources>

0 commit comments

Comments
 (0)