Skip to content

feat: add emphasized text styles with material shape overlays #75

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

Merged
merged 3 commits into from
Aug 31, 2025
Merged

feat: add emphasized text styles with material shape overlays #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a446a7
feat: add emphasized text and shape styles
MihaiCristianCondrea Aug 31, 2025
a32e37e
feat: add clover shape token style
MihaiCristianCondrea Aug 31, 2025
14384cd
fix: add base ShapeTokens style
MihaiCristianCondrea Aug 31, 2025
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
6 changes: 4 additions & 2 deletions app/src/main/res/layout/activity_alert_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/show_dialog"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover" />

<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/floating_button_show_syntax"
Expand All @@ -28,4 +30,4 @@
app:icon="@drawable/ic_code"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
22 changes: 13 additions & 9 deletions app/src/main/res/layout/activity_android_start_project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/menu_share"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
app:title="@string/android_start_project" />

<me.zhanghai.android.fastscroll.FastScrollScrollView
Expand All @@ -30,11 +31,11 @@

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_first_step"
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/step1"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -45,6 +46,7 @@
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/summary_first_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_first_step" />

Expand All @@ -54,10 +56,10 @@
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_first_step_summary">
app:layout_constraintTop_toBottomOf="@id/text_view_first_step_summary"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
Expand All @@ -77,11 +79,11 @@

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_second_step"
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/step2"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ad_view" />
Expand All @@ -92,6 +94,7 @@
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/summary_second_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_second_step" />

Expand All @@ -101,10 +104,10 @@
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_second_step_summary">
app:layout_constraintTop_toBottomOf="@id/text_view_second_step_summary"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
Expand All @@ -115,11 +118,11 @@

<com.google.android.material.textview.MaterialTextView
android:id="@+id/text_view_third_step"
style="@style/TextAppearance.Material3.HeadlineLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/step3"
android:textAppearance="@style/TextAppearance.TitleLargeEmphasized"
android:textColor="?attr/colorSecondary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_view_second_step" />
Expand All @@ -130,6 +133,7 @@
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:text="@string/summary_third_step"
android:textAppearance="@style/TextAppearance.BodyLargeEmphasized"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_third_step" />

Expand All @@ -139,10 +143,10 @@
android:layout_width="match_parent"
android:layout_height="256dp"
android:layout_margin="24dp"
app:cardCornerRadius="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_view_third_step_summary">
app:layout_constraintTop_toBottomOf="@id/text_view_third_step_summary"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover">

<androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:navigationIcon="@drawable/ic_menu"
app:shapeAppearanceOverlay="@style/ShapeTokens.Clover"
app:title="@string/app_name" />
</com.google.android.material.appbar.AppBarLayout>

Expand Down
12 changes: 12 additions & 0 deletions app/src/main/res/values/shape_tokens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<resources>
<!-- Base style required for Material 3 shape tokens -->
<style name="ShapeTokens" />

<style name="ShapeTokens.Clover" parent="ShapeTokens">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopLeft">24dp</item>
<item name="cornerSizeTopRight">24dp</item>
<item name="cornerSizeBottomLeft">8dp</item>
<item name="cornerSizeBottomRight">8dp</item>
</style>
</resources>
31 changes: 30 additions & 1 deletion app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,35 @@
<item name="dialogCornerRadius">28dp</item>
<item name="alertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
<item name="switchPreferenceCompatStyle">@style/switchPreferenceCompatStyle</item>
<!-- Apply emphasized text appearances -->
<item name="textAppearanceTitleLarge">@style/TextAppearance.TitleLargeEmphasized</item>
<item name="textAppearanceBodyLarge">@style/TextAppearance.BodyLargeEmphasized</item>
<!-- Map custom widget styles using Material 3 shape tokens -->
<item name="toolbarStyle">@style/Widget.App.Toolbar.Clover</item>
<item name="materialCardViewStyle">@style/Widget.App.CardView.Clover</item>
<item name="materialButtonStyle">@style/Widget.App.Button.Clover</item>
</style>

<!-- Emphasized text appearances -->
<style name="TextAppearance.TitleLargeEmphasized" parent="TextAppearance.Material3.TitleLarge">
<item name="android:textStyle">bold</item>
</style>

<style name="TextAppearance.BodyLargeEmphasized" parent="TextAppearance.Material3.BodyLarge">
<item name="android:textStyle">bold</item>
</style>

<!-- Widget styles using Material 3 shape tokens -->
<style name="Widget.App.Toolbar.Clover" parent="@style/Widget.Material3.Toolbar">
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
</style>

<style name="Widget.App.CardView.Clover" parent="@style/Widget.Material3.CardView.Outlined">
<item name="shapeAppearanceOverlay">@style/ShapeTokens.Clover</item>
</style>

<style name="Widget.App.Button.Clover" parent="@style/Widget.Material3.Button">
<item name="shapeAppearance">@style/ShapeTokens.Clover</item>
</style>

<style name="ShapeAppearanceOverlay.CardView" parent="">
Expand Down Expand Up @@ -61,4 +90,4 @@
<style name="switchPreferenceCompatStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/preference_switch_widget_layout</item>
</style>
</resources>
</resources>