Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update m3 typography in the demo app. #2215

Merged
merged 9 commits into from
Oct 18, 2023
Merged

Update m3 typography in the demo app. #2215

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85cc80c
Update material3 theme.
Sep 27, 2023
52dd960
Support m3 night mode.
Sep 27, 2023
d7173ce
Merge branch 'master' into sp/issue-2188-m3-theme
santosh-pingle Sep 27, 2023
1f807ad
Address review comments.
Sep 27, 2023
aa7081d
Address review comments.
Sep 28, 2023
a3fe332
Update m3 typography.
Sep 29, 2023
296b792
Merge branch 'master' into sp/issue-2188-m3-typography
santosh-pingle Oct 9, 2023
5ce2356
Merge branch 'master' into sp/issue-2188-m3-typography
Oct 18, 2023
5158fc1
Merge branch 'master' into sp/issue-2188-m3-typography
jingtang10 Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions demo/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

</style>

<style name="AppCard" parent="Widget.MaterialComponents.CardView">
<style name="AppCard" parent="Widget.Material3.CardView.Outlined">
<item name="cardElevation">8dp</item>
</style>

Expand All @@ -79,16 +79,21 @@
</style>

<style name="AppTheme.PatientDetails.headline">
<item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
<item name="android:textSize">24sp</item>
<item
name="android:textAppearance"
>?attr/textAppearanceHeadlineSmall</item>
<item name="android:textStyle">normal</item>
</style>

<style name="AppTheme.PatientDetails.Subtitle2">
<item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
<item
name="android:textAppearance"
>?attr/textAppearanceTitleSmall</item>
</style>

<style name="AppTheme.PatientDetails.body2">
<item name="android:textAppearance">?attr/textAppearanceBody2</item>
<item
name="android:textAppearance"
>?attr/textAppearanceBodyMedium</item>
</style>
</resources>