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][Typography] Update Font catalog demo to use new typescale.

Browse Source 
PiperOrigin-RevId: 391820169
This commit is contained in:
hunterstich 2021-08-19 12:39:02 -07:00 committed by pekingme
parent 293457c6f8
commit 7bcb917862
3 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,11 +119,11 @@ public class FontMainDemoFragment extends DemoFragment {
TypedValue value = new TypedValue();
for (int i = 0; i < stylesArray.length(); i++) {
// 1. Get the attribute from the array: ?attr/textAppearanceHeadline1
// 1. Get the attribute from the array: ?attr/textAppearanceBodyLarge
stylesArray.getValue(i, value);
int attribute = value.data;
// 2. Get the style from the attribute: @style/TextAppearance.MaterialComponents.Headline1
// 2. Get the style from the attribute: @style/TextAppearance.MaterialComponents.BodyLarge
TypedArray a = context.obtainStyledAttributes(new int[] {attribute});
int style = a.getResourceId(0, 0);
a.recycle();

3
catalog/java/io/material/catalog/font/res/layout/cat_font_styles_item.xml
View File

@ -32,8 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textAppearance="?attr/textAppearanceCaption"
app:textAllCaps="true"/>
android:textAppearance="?attr/textAppearanceLabelSmall" />
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"

56
catalog/java/io/material/catalog/font/res/values/arrays.xml
View File

@ -17,35 +17,39 @@
<resources>
<string-array name="cat_font_styles_array">
<item>?attr/textAppearanceHeadline1</item>
<item>?attr/textAppearanceHeadline2</item>
<item>?attr/textAppearanceHeadline3</item>
<item>?attr/textAppearanceHeadline4</item>
<item>?attr/textAppearanceHeadline5</item>
<item>?attr/textAppearanceHeadline6</item>
<item>?attr/textAppearanceSubtitle1</item>
<item>?attr/textAppearanceSubtitle2</item>
<item>?attr/textAppearanceBody1</item>
<item>?attr/textAppearanceBody2</item>
<item>?attr/textAppearanceCaption</item>
<item>?attr/textAppearanceButton</item>
<item>?attr/textAppearanceOverline</item>
<item>?attr/textAppearanceDisplayLarge</item>
<item>?attr/textAppearanceDisplayMedium</item>
<item>?attr/textAppearanceDisplaySmall</item>
<item>?attr/textAppearanceHeadlineLarge</item>
<item>?attr/textAppearanceHeadlineMedium</item>
<item>?attr/textAppearanceHeadlineSmall</item>
<item>?attr/textAppearanceTitleLarge</item>
<item>?attr/textAppearanceTitleMedium</item>
<item>?attr/textAppearanceTitleSmall</item>
<item>?attr/textAppearanceBodyLarge</item>
<item>?attr/textAppearanceBodyMedium</item>
<item>?attr/textAppearanceBodySmall</item>
<item>?attr/textAppearanceLabelLarge</item>
<item>?attr/textAppearanceLabelMedium</item>
<item>?attr/textAppearanceLabelSmall</item>
</string-array>
<string-array name="cat_font_style_names_array">
<item>Headline 1</item>
<item>Headline 2</item>
<item>Headline 3</item>
<item>Headline 4</item>
<item>Headline 5</item>
<item>Headline 6</item>
<item>Subtitle 1</item>
<item>Subtitle 2</item>
<item>Body 1</item>
<item>Body 2</item>
<item>Caption</item>
<item>Button</item>
<item>Overline</item>
<item>Display Large</item>
<item>Display Medium</item>
<item>Display Small</item>
<item>Headline Large</item>
<item>Headline Medium</item>
<item>Headline Small</item>
<item>Title Large</item>
<item>Title Medium</item>
<item>Title Small</item>
<item>Body Large</item>
<item>Body Medium</item>
<item>Body Small</item>
<item>Label Large</item>
<item>Label Medium</item>
<item>Label Small</item>
</string-array>
</resources>