Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 12:44:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move text styles to core UI.

Browse Source
This commit is contained in:
Alex Hart
2026-02-04 13:13:49 -04:00
committed by GitHub
parent c274805eb0
commit a74651d915
22 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
core/ui/src/main/res/values-v21/text_styles.xml Normal file
View File

@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Signal.Text.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
<item name="android:lineSpacingExtra">8sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0.0107</item>
</style>
<style name="Signal.Text.BodySmall" parent="TextAppearance.Material3.BodySmall">
<item name="android:textSize">13sp</item>
<item name="android:lineSpacingExtra">3sp</item>
<item name="android:letterSpacing">0.0192</item>
</style>
<style name="Signal.Text.MaterialCaption" parent="Signal.Text.BodySmall">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:letterSpacing">0.025</item>
</style>
<style name="Signal.Text.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:letterSpacing">0.0107</item>
</style>
<style name="Signal.Text.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
<item name="android:textSize">13sp</item>
<item name="android:lineSpacingExtra">3sp</item>
<item name="android:letterSpacing">0.0192</item>
</style>
<style name="Signal.Text.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:letterSpacing">0.025</item>
</style>
</resources>

71
core/ui/src/main/res/values-v28/text_styles.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Signal.Text.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
<item name="android:lineHeight">40sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="android:lineHeight">36sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
<item name="android:lineHeight">28sp</item>
<item name="android:letterSpacing">0</item>
</style>
<style name="Signal.Text.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
<item name="android:lineHeight">24sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
<item name="android:textSize">16sp</item>
<item name="android:lineHeight">22sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:lineHeight">22sp</item>
<item name="android:letterSpacing">0.0125</item>
</style>
<style name="Signal.Text.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
<item name="android:lineHeight">20sp</item>
<item name="android:letterSpacing">0.0107</item>
</style>
<style name="Signal.Text.BodySmall" parent="TextAppearance.Material3.BodySmall">
<item name="android:textSize">13sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:letterSpacing">0.0192</item>
</style>
<style name="Signal.Text.MaterialCaption" parent="Signal.Text.BodySmall">
<item name="android:textSize">12sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:letterSpacing">0.025</item>
</style>
<style name="Signal.Text.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
<item name="android:lineHeight">20sp</item>
<item name="android:letterSpacing">0.0107</item>
</style>
<style name="Signal.Text.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
<item name="android:textSize">13sp</item>
<item name="android:lineHeight">16sp</item>
<item name="android:letterSpacing">0.0192</item>
</style>
<style name="Signal.Text.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
<item name="android:lineHeight">16sp</item>
<item name="android:letterSpacing">0.025</item>
</style>
</resources>

203
core/ui/src/main/res/values/text_styles.xml Normal file
View File

@@ -0,0 +1,203 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="Signal.Text.Zero" parent="">
<item name="android:textSize">0sp</item>
</style>
<!-- region Material3 Styles -->
<style name="Signal.Text.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
<item name="android:lineSpacingExtra">8sp</item>
</style>
<style name="Signal.Text.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
</style>
<style name="Signal.Text.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">18sp</item>
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.BodySmall" parent="TextAppearance.Material3.BodySmall">
<item name="android:textSize">13sp</item>
<item name="android:lineSpacingExtra">3sp</item>
</style>
<style name="Signal.Text.MaterialCaption" parent="Signal.Text.BodySmall">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">4sp</item>
</style>
<style name="Signal.Text.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
<item name="android:lineSpacingExtra">6sp</item>
</style>
<style name="Signal.Text.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
<item name="android:textSize">13sp</item>
<item name="android:lineSpacingExtra">3sp</item>
</style>
<style name="Signal.Text.LabelSmall" parent="TextAppearance.Material3.LabelSmall">
<item name="android:lineSpacingExtra">4sp</item>
</style>
<!-- endregion -->
<!-- region Material2 and Older -->
<style name="Signal.Text.Headline" parent="Base.TextAppearance.AppCompat.Headline">
<item name="android:textSize">28sp</item>
<item name="android:lineSpacingExtra">3sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:letterSpacing" tools:ignore="NewApi">0</item>
</style>
<style name="Signal.Text.Headline.Medium">
<item name="android:lineSpacingExtra">5sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="Signal.Text.Body" parent="Base.TextAppearance.AppCompat.Body1">
<item name="android:textSize">16sp</item>
<item name="android:lineSpacingExtra">2sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:letterSpacing" tools:ignore="NewApi">0.01</item>
</style>
<style name="Signal.Text.Preview" parent="Base.TextAppearance.AppCompat.Body2">
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">3sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:letterSpacing" tools:ignore="NewApi">0.01</item>
</style>
<style name="Signal.Text.Preview.Secondary">
<item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
</style>
<style name="Signal.Text.Caption" parent="Base.TextAppearance.AppCompat.Caption">
<item name="android:textSize">12sp</item>
<item name="android:lineSpacingExtra">2sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:letterSpacing" tools:ignore="NewApi">0.03</item>
</style>
<style name="Signal.Text.Caption.MessageSent">
<item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
<item name="android:shadowRadius">0</item>
</style>
<style name="Signal.Text.Giant" parent="@style/TextAppearance.AppCompat.Display1">
<item name="android:textSize">48sp</item>
<item name="android:textColor">@color/signal_colorOnSurface</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="TextAppearance.Signal.Title1" parent="@style/TextAppearance.AppCompat.Title">
<item name="android:textStyle">bold</item>
<item name="android:textSize">28sp</item>
<item name="android:color">@color/signal_colorOnSurface</item>
</style>
<style name="TextAppearance.Signal.Title2" parent="@style/TextAppearance.AppCompat.Title" />
<style name="TextAppearance.Signal.Title2.Bold">
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Signal.Title2.MaterialDialog">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="TextAppearance.Signal.Title.InfoCard" parent="">
<item name="android:textStyle">bold</item>
<item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.Signal.Body1" parent="@style/TextAppearance.AppCompat.Body1">
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.Signal.Body2" parent="@style/TextAppearance.AppCompat.Body2">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">normal</item>
<item name="fontFamily">sans-serif</item>
</style>
<style name="TextAppearance.Signal.Body2.Bold">
<item name="fontFamily">sans-serif-medium</item>
</style>
<style name="TextAppearance.Signal.Body1.Bold">
<item name="fontFamily">sans-serif-medium</item>
</style>
<style name="TextAppearance.Signal.Mono" parent="@style/TextAppearance.AppCompat.Caption">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">monospace</item>
</style>
<style name="TextAppearance.Signal.Caption" parent="@style/TextAppearance.AppCompat.Caption">
</style>
<style name="TextAppearance.Signal.Subtitle" parent="TextAppearance.Signal.Caption">
<item name="android:textSize">13sp</item>
</style>
<style name="TextAppearance.Signal.Subtitle.Bold">
<item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.Signal.Subtitle2" parent="@style/TextAppearance.MaterialComponents.Subtitle2">
</style>
<style name="Signal.Text.MessageRequest.Title" parent="Base.TextAppearance.AppCompat.Title">
<item name="android:textSize">20sp</item>
<item name="android:textColor">@color/signal_colorOnSurface</item>
</style>
<style name="Signal.Text.MessageRequest.Subtitle" parent="Base.TextAppearance.AppCompat.Caption">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
</style>
<style name="Signal.Text.MessageRequest.Description" parent="Base.TextAppearance.AppCompat.Subhead">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/signal_colorOnSurfaceVariant</item>
</style>
<style name="Signal.Text.Title" parent="Base.TextAppearance.AppCompat.Title">
</style>
<style name="Signal.Text.Title.Large">
<item name="android:textSize">22sp</item>
<item name="android:fontFamily">sans-serif</item>
</style>
<!-- endregion -->
</resources>