DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[M3][Catalog] Updated some demo references to Material3 styles

Browse Source 
PiperOrigin-RevId: 394005182
This commit is contained in:
dsn5ft 2021-08-31 11:19:40 -04:00 committed by Leticia Santos
parent f80b866029
commit e776908bd2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catalog/java/io/material/catalog/font/FontMainDemoFragment.java
View File

@ -123,7 +123,7 @@ public class FontMainDemoFragment extends DemoFragment {
stylesArray.getValue(i, value);
int attribute = value.data;
// 2. Get the style from the attribute: @style/TextAppearance.MaterialComponents.BodyLarge
// 2. Get the style from the attribute: @style/TextAppearance.Material3.BodyLarge
TypedArray a = context.obtainStyledAttributes(new int[] {attribute});
int style = a.getResourceId(0, 0);
a.recycle();

2
catalog/java/io/material/catalog/progressindicator/res/layout/cat_progress_indicator_standalone_fragment.xml
View File

@ -34,7 +34,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/cat_progress_indicator_button"
style="@style/Widget.MaterialComponents.Button.OutlinedButton.Icon"
style="@style/Widget.Material3.Button.OutlinedButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"

22
catalog/java/io/material/catalog/shapetheming/res/values/styles.xml
View File

@ -42,22 +42,22 @@
<item name="textInputStyle">@style/Widget.Shrine.TextInputLayout</item>
</style>
<style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<style name="ShapeAppearance.Shrine.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">4dp</item>
</style>
<style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
<style name="ShapeAppearance.Shrine.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">8dp</item>
</style>
<style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
<style name="ShapeAppearance.Shrine.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">24dp</item>
</style>
<style name="Widget.Shrine.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<style name="Widget.Shrine.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
<item name="shapeAppearanceOverlay">@null</item>
</style>
@ -114,22 +114,22 @@
<item name="textInputStyle">@style/Widget.Fortnightly.TextInputLayout</item>
</style>
<style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<style name="ShapeAppearance.Fortnightly.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">0dp</item>
</style>
<style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
<style name="ShapeAppearance.Fortnightly.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">0dp</item>
</style>
<style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
<style name="ShapeAppearance.Fortnightly.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
<item name="cornerFamily">cut</item>
<item name="cornerSize">0dp</item>
</style>
<style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
<style name="Widget.Fortnightly.FloatingActionButton" parent="Widget.Material3.FloatingActionButton.Primary">
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Fortnightly.FloatingActionButton</item>
</style>
@ -186,17 +186,17 @@
<item name="textInputStyle">@style/Widget.Crane.TextInputLayout</item>
</style>
<style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
<style name="ShapeAppearance.Crane.SmallComponent" parent="ShapeAppearance.Material3.SmallComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">4dp</item>
</style>
<style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
<style name="ShapeAppearance.Crane.MediumComponent" parent="ShapeAppearance.Material3.MediumComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">16dp</item>
</style>
<style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
<style name="ShapeAppearance.Crane.LargeComponent" parent="ShapeAppearance.Material3.LargeComponent">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">20dp</item>
</style>