mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-26 03:40:56 +01:00
Implement new Material3 spec.
This commit is contained in:
committed by
Greyson Parrelli
parent
556e480b06
commit
1b471e163d
@@ -3,4 +3,71 @@
|
||||
<style name="Signal.Text.Title.SettingsBio">
|
||||
<item name="android:letterSpacing">0.013</item>
|
||||
</style>
|
||||
|
||||
<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: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>
|
||||
@@ -6,13 +6,13 @@
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
|
||||
<item name="android:statusBarColor">@color/core_grey_95</item>
|
||||
<item name="android:navigationBarColor">@color/core_grey_95</item>
|
||||
<item name="android:statusBarColor">@color/signal_colorBackground</item>
|
||||
<item name="android:navigationBarColor">@color/signal_colorBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
|
||||
<item name="android:statusBarColor">@color/core_grey_95</item>
|
||||
<item name="android:navigationBarColor">@color/core_grey_95</item>
|
||||
<item name="android:statusBarColor">@color/signal_colorBackground</item>
|
||||
<item name="android:navigationBarColor">@color/signal_colorBackground</item>
|
||||
<item name="android:colorControlActivated">@color/core_ultramarine_light</item>
|
||||
</style>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
|
||||
<item name="android:statusBarColor">@color/core_grey_95</item>
|
||||
<item name="android:statusBarColor">@color/signal_colorBackground</item>
|
||||
<item name="android:navigationBarColor">@color/core_black</item>
|
||||
</style>
|
||||
|
||||
@@ -46,6 +46,14 @@
|
||||
<item name="android:navigationBarColor">@color/media_preview_bar_background</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Signal.Light.BottomSheetDialog" parent="Theme.Material3.Light.BottomSheetDialog">
|
||||
<item name="android:navigationBarColor">@color/signal_colorSurface1</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Signal.BottomSheetDialog" parent="Theme.Material3.Dark.BottomSheetDialog">
|
||||
<item name="android:navigationBarColor">@color/signal_colorSurface1</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Signal.Light.BottomSheetDialog.Fixed">
|
||||
<item name="android:windowIsFloating">false</item>
|
||||
<item name="android:statusBarColor">@color/transparent</item>
|
||||
@@ -53,7 +61,7 @@
|
||||
|
||||
<style name="Theme.Signal.BottomSheetDialog.Fixed">
|
||||
<item name="android:windowIsFloating">false</item>
|
||||
<item name="android:statusBarColor">@color/core_grey_95</item>
|
||||
<item name="android:statusBarColor">@color/signal_colorBackground</item>
|
||||
<item name="android:navigationBarColor">@color/transparent</item>
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user