Skip to content

Commit

Permalink
[Typography] Add emphasized typography styles
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 662904526
  • Loading branch information
@hunterstich @imhappi
hunterstich authored and imhappi committed Aug 16, 2024
1 parent 5378d52 commit 25083f4
Show file tree
Hide file tree
Showing 4 changed files with 254 additions and 0 deletions.
32 changes: 32 additions & 0 deletions lib/java/com/google/android/material/dialog/res/values/themes_base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,22 @@
<item name="textAppearanceLabelMedium">@style/TextAppearance.Material3.LabelMedium</item>
<item name="textAppearanceLabelSmall">@style/TextAppearance.Material3.LabelSmall</item>

<item name="textAppearanceDisplayLargeEmphasized">@style/TextAppearance.Material3.DisplayLarge.Emphasized</item>
<item name="textAppearanceDisplayMediumEmphasized">@style/TextAppearance.Material3.DisplayMedium.Emphasized</item>
<item name="textAppearanceDisplaySmallEmphasized">@style/TextAppearance.Material3.DisplaySmall.Emphasized</item>
<item name="textAppearanceHeadlineLargeEmphasized">@style/TextAppearance.Material3.HeadlineLarge.Emphasized</item>
<item name="textAppearanceHeadlineMediumEmphasized">@style/TextAppearance.Material3.HeadlineMedium.Emphasized</item>
<item name="textAppearanceHeadlineSmallEmphasized">@style/TextAppearance.Material3.HeadlineSmall.Emphasized</item>
<item name="textAppearanceTitleLargeEmphasized">@style/TextAppearance.Material3.TitleLarge.Emphasized</item>
<item name="textAppearanceTitleMediumEmphasized">@style/TextAppearance.Material3.TitleMedium.Emphasized</item>
<item name="textAppearanceTitleSmallEmphasized">@style/TextAppearance.Material3.TitleSmall.Emphasized</item>
<item name="textAppearanceBodyLargeEmphasized">@style/TextAppearance.Material3.BodyLarge.Emphasized</item>
<item name="textAppearanceBodyMediumEmphasized">@style/TextAppearance.Material3.BodyMedium.Emphasized</item>
<item name="textAppearanceBodySmallEmphasized">@style/TextAppearance.Material3.BodySmall.Emphasized</item>
<item name="textAppearanceLabelLargeEmphasized">@style/TextAppearance.Material3.LabelLarge.Emphasized</item>
<item name="textAppearanceLabelMediumEmphasized">@style/TextAppearance.Material3.LabelMedium.Emphasized</item>
<item name="textAppearanceLabelSmallEmphasized">@style/TextAppearance.Material3.LabelSmall.Emphasized</item>

<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
Expand Down Expand Up @@ -470,6 +486,22 @@
<item name="textAppearanceLabelMedium">@style/TextAppearance.Material3.LabelMedium</item>
<item name="textAppearanceLabelSmall">@style/TextAppearance.Material3.LabelSmall</item>

<item name="textAppearanceDisplayLargeEmphasized">@style/TextAppearance.Material3.DisplayLarge.Emphasized</item>
<item name="textAppearanceDisplayMediumEmphasized">@style/TextAppearance.Material3.DisplayMedium.Emphasized</item>
<item name="textAppearanceDisplaySmallEmphasized">@style/TextAppearance.Material3.DisplaySmall.Emphasized</item>
<item name="textAppearanceHeadlineLargeEmphasized">@style/TextAppearance.Material3.HeadlineLarge.Emphasized</item>
<item name="textAppearanceHeadlineMediumEmphasized">@style/TextAppearance.Material3.HeadlineMedium.Emphasized</item>
<item name="textAppearanceHeadlineSmallEmphasized">@style/TextAppearance.Material3.HeadlineSmall.Emphasized</item>
<item name="textAppearanceTitleLargeEmphasized">@style/TextAppearance.Material3.TitleLarge.Emphasized</item>
<item name="textAppearanceTitleMediumEmphasized">@style/TextAppearance.Material3.TitleMedium.Emphasized</item>
<item name="textAppearanceTitleSmallEmphasized">@style/TextAppearance.Material3.TitleSmall.Emphasized</item>
<item name="textAppearanceBodyLargeEmphasized">@style/TextAppearance.Material3.BodyLarge.Emphasized</item>
<item name="textAppearanceBodyMediumEmphasized">@style/TextAppearance.Material3.BodyMedium.Emphasized</item>
<item name="textAppearanceBodySmallEmphasized">@style/TextAppearance.Material3.BodySmall.Emphasized</item>
<item name="textAppearanceLabelLargeEmphasized">@style/TextAppearance.Material3.LabelLarge.Emphasized</item>
<item name="textAppearanceLabelMediumEmphasized">@style/TextAppearance.Material3.LabelMedium.Emphasized</item>
<item name="textAppearanceLabelSmallEmphasized">@style/TextAppearance.Material3.LabelSmall.Emphasized</item>

<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
Expand Down
32 changes: 32 additions & 0 deletions lib/java/com/google/android/material/theme/res/values/themes_base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,22 @@
<item name="textAppearanceLabelMedium">@style/TextAppearance.Material3.LabelMedium</item>
<item name="textAppearanceLabelSmall">@style/TextAppearance.Material3.LabelSmall</item>

<item name="textAppearanceDisplayLargeEmphasized">@style/TextAppearance.Material3.DisplayLarge.Emphasized</item>
<item name="textAppearanceDisplayMediumEmphasized">@style/TextAppearance.Material3.DisplayMedium.Emphasized</item>
<item name="textAppearanceDisplaySmallEmphasized">@style/TextAppearance.Material3.DisplaySmall.Emphasized</item>
<item name="textAppearanceHeadlineLargeEmphasized">@style/TextAppearance.Material3.HeadlineLarge.Emphasized</item>
<item name="textAppearanceHeadlineMediumEmphasized">@style/TextAppearance.Material3.HeadlineMedium.Emphasized</item>
<item name="textAppearanceHeadlineSmallEmphasized">@style/TextAppearance.Material3.HeadlineSmall.Emphasized</item>
<item name="textAppearanceTitleLargeEmphasized">@style/TextAppearance.Material3.TitleLarge.Emphasized</item>
<item name="textAppearanceTitleMediumEmphasized">@style/TextAppearance.Material3.TitleMedium.Emphasized</item>
<item name="textAppearanceTitleSmallEmphasized">@style/TextAppearance.Material3.TitleSmall.Emphasized</item>
<item name="textAppearanceBodyLargeEmphasized">@style/TextAppearance.Material3.BodyLarge.Emphasized</item>
<item name="textAppearanceBodyMediumEmphasized">@style/TextAppearance.Material3.BodyMedium.Emphasized</item>
<item name="textAppearanceBodySmallEmphasized">@style/TextAppearance.Material3.BodySmall.Emphasized</item>
<item name="textAppearanceLabelLargeEmphasized">@style/TextAppearance.Material3.LabelLarge.Emphasized</item>
<item name="textAppearanceLabelMediumEmphasized">@style/TextAppearance.Material3.LabelMedium.Emphasized</item>
<item name="textAppearanceLabelSmallEmphasized">@style/TextAppearance.Material3.LabelSmall.Emphasized</item>

<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
Expand Down Expand Up @@ -489,6 +505,22 @@
<item name="textAppearanceLabelMedium">@style/TextAppearance.Material3.LabelMedium</item>
<item name="textAppearanceLabelSmall">@style/TextAppearance.Material3.LabelSmall</item>

<item name="textAppearanceDisplayLargeEmphasized">@style/TextAppearance.Material3.DisplayLarge.Emphasized</item>
<item name="textAppearanceDisplayMediumEmphasized">@style/TextAppearance.Material3.DisplayMedium.Emphasized</item>
<item name="textAppearanceDisplaySmallEmphasized">@style/TextAppearance.Material3.DisplaySmall.Emphasized</item>
<item name="textAppearanceHeadlineLargeEmphasized">@style/TextAppearance.Material3.HeadlineLarge.Emphasized</item>
<item name="textAppearanceHeadlineMediumEmphasized">@style/TextAppearance.Material3.HeadlineMedium.Emphasized</item>
<item name="textAppearanceHeadlineSmallEmphasized">@style/TextAppearance.Material3.HeadlineSmall.Emphasized</item>
<item name="textAppearanceTitleLargeEmphasized">@style/TextAppearance.Material3.TitleLarge.Emphasized</item>
<item name="textAppearanceTitleMediumEmphasized">@style/TextAppearance.Material3.TitleMedium.Emphasized</item>
<item name="textAppearanceTitleSmallEmphasized">@style/TextAppearance.Material3.TitleSmall.Emphasized</item>
<item name="textAppearanceBodyLargeEmphasized">@style/TextAppearance.Material3.BodyLarge.Emphasized</item>
<item name="textAppearanceBodyMediumEmphasized">@style/TextAppearance.Material3.BodyMedium.Emphasized</item>
<item name="textAppearanceBodySmallEmphasized">@style/TextAppearance.Material3.BodySmall.Emphasized</item>
<item name="textAppearanceLabelLargeEmphasized">@style/TextAppearance.Material3.LabelLarge.Emphasized</item>
<item name="textAppearanceLabelMediumEmphasized">@style/TextAppearance.Material3.LabelMedium.Emphasized</item>
<item name="textAppearanceLabelSmallEmphasized">@style/TextAppearance.Material3.LabelSmall.Emphasized</item>

<!-- Default Framework Text styles. -->
<item name="android:textAppearanceListItem">?attr/textAppearanceTitleMedium</item>
<item name="android:textAppearanceListItemSmall">?attr/textAppearanceTitleMedium</item>
Expand Down
30 changes: 30 additions & 0 deletions lib/java/com/google/android/material/typography/res/values/attrs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,36 @@
<!-- Text appearance for the Label Small style. -->
<attr name="textAppearanceLabelSmall" format="reference"/>

<!-- Text appearance for an emphasized Display Large style. -->
<attr name="textAppearanceDisplayLargeEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Display Medium style. -->
<attr name="textAppearanceDisplayMediumEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Display Small style. -->
<attr name="textAppearanceDisplaySmallEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Headline Large style. -->
<attr name="textAppearanceHeadlineLargeEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Headline Medium style. -->
<attr name="textAppearanceHeadlineMediumEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Headline Small style. -->
<attr name="textAppearanceHeadlineSmallEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Title Large style. -->
<attr name="textAppearanceTitleLargeEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Title Medium style. -->
<attr name="textAppearanceTitleMediumEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Title Small style. -->
<attr name="textAppearanceTitleSmallEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Body Large style. -->
<attr name="textAppearanceBodyLargeEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Body Medium style. -->
<attr name="textAppearanceBodyMediumEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Body Small style. -->
<attr name="textAppearanceBodySmallEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Label Large style. -->
<attr name="textAppearanceLabelLargeEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Label Medium style. -->
<attr name="textAppearanceLabelMediumEmphasized" format="reference"/>
<!-- Text appearance for an emphasized Label Small style. -->
<attr name="textAppearanceLabelSmallEmphasized" format="reference"/>

<!-- Deprecated. -->

Expand Down
Loading

0 comments on commit 25083f4

Please sign in to comment.