Skip to content

Commit e776908

Browse files
dsn5ftleticiarossi
authored andcommitted
[M3][Catalog] Updated some demo references to Material3 styles
PiperOrigin-RevId: 394005182
1 parent f80b866 commit e776908

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

catalog/java/io/material/catalog/font/FontMainDemoFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public FontStyleAdapter(Context context) {
123123
stylesArray.getValue(i, value);
124124
int attribute = value.data;
125125

126-
// 2. Get the style from the attribute: @style/TextAppearance.MaterialComponents.BodyLarge
126+
// 2. Get the style from the attribute: @style/TextAppearance.Material3.BodyLarge
127127
TypedArray a = context.obtainStyledAttributes(new int[] {attribute});
128128
int style = a.getResourceId(0, 0);
129129
a.recycle();

catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<com.google.android.material.button.MaterialButton
3636
android:id="@+id/cat_progress_indicator_button"
37-
style="@style/Widget.MaterialComponents.Button.OutlinedButton.Icon"
37+
style="@style/Widget.Material3.Button.OutlinedButton.Icon"
3838
android:layout_width="wrap_content"
3939
android:layout_height="wrap_content"
4040
android:ellipsize="end"

catalog/java/io/material/catalog/shapetheming/res/values/styles.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@
4242
<item name="textInputStyle">@style/Widget.Shrine.TextInputLayout</item>
4343
</style>
4444

45-
<style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
45+
<style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
4646
<item name="cornerFamily">cut</item>
4747
<item name="cornerSize">4dp</item>
4848
</style>
4949

50-
<style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
50+
<style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
5151
<item name="cornerFamily">cut</item>
5252
<item name="cornerSize">8dp</item>
5353
</style>
5454

55-
<style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
55+
<style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
5656
<item name="cornerFamily">cut</item>
5757
<item name="cornerSize">24dp</item>
5858
</style>
5959

60-
<style name="Widget.Shrine.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
60+
<style name="Widget.Shrine.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
6161
<item name="shapeAppearanceOverlay">@null</item>
6262
</style>
6363

@@ -114,22 +114,22 @@
114114
<item name="textInputStyle">@style/Widget.Fortnightly.TextInputLayout</item>
115115
</style>
116116

117-
<style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
117+
<style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
118118
<item name="cornerFamily">cut</item>
119119
<item name="cornerSize">0dp</item>
120120
</style>
121121

122-
<style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
122+
<style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
123123
<item name="cornerFamily">cut</item>
124124
<item name="cornerSize">0dp</item>
125125
</style>
126126

127-
<style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
127+
<style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
128128
<item name="cornerFamily">cut</item>
129129
<item name="cornerSize">0dp</item>
130130
</style>
131131

132-
<style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
132+
<style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
133133
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Fortnightly.FloatingActionButton</item>
134134
</style>
135135

@@ -186,17 +186,17 @@
186186
<item name="textInputStyle">@style/Widget.Crane.TextInputLayout</item>
187187
</style>
188188

189-
<style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
189+
<style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
190190
<item name="cornerFamily">rounded</item>
191191
<item name="cornerSize">4dp</item>
192192
</style>
193193

194-
<style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
194+
<style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
195195
<item name="cornerFamily">rounded</item>
196196
<item name="cornerSize">16dp</item>
197197
</style>
198198

199-
<style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
199+
<style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
200200
<item name="cornerFamily">rounded</item>
201201
<item name="cornerSize">20dp</item>
202202
</style>

0 commit comments

Comments
 (0)