empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update Megaphone text styling to match Material Design 3.

Browse source
This commit is contained in:
Nicholas Tinsley 2022-09-08 13:54:40 -04:00 • committed by Greyson Parrelli
parent 176a705079
commit d7f9582bc4
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/basic_megaphone_view.xml
View file

@ -16,7 +16,7 @@
app:strokeWidth="1dp"
app:cardBackgroundColor="@color/signal_colorBackground"
app:cardCornerRadius="12dp"
app:cardElevation="2dp"
app:cardElevation="0dp"
app:cardPreventCornerOverlap="false"
app:cardUseCompatPadding="true"
app:contentPadding="0dp">
@ -47,7 +47,8 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/basic_megaphone_title"
style="@style/Signal.Text.Body"
style="@style/Signal.Text.BodyLarge"
android:textColor="@color/signal_colorOnSurface"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
@ -60,7 +61,7 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/basic_megaphone_body"
style="@style/Signal.Text.Preview"
style="@style/Signal.Text.BodyMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -84,6 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAllCaps="false"
android:textColor="@color/signal_colorPrimary"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/basic_megaphone_secondary"
@ -101,6 +103,7 @@
android:layout_marginTop="4dp"
android:text="@string/Megaphones_remind_me_later"
android:textAllCaps="false"
android:textColor="@color/signal_colorPrimary"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@id/basic_megaphone_action"
app:layout_constraintHorizontal_bias="1.0"

2
app/src/main/res/values-night/dark_colors.xml
View file

@ -150,7 +150,7 @@
<color name="media_keyboard_button_color">@color/core_grey_25</color>
<color name="megaphone_background_color">@color/core_grey_85</color>
<color name="megaphone_body_text_color">@color/core_grey_25</color>
<color name="megaphone_body_text_color">@color/signal_colorOnSurfaceVariant</color>
<color name="megaphone_reactions_shade">@color/core_grey_70</color>
<color name="megaphone_reactions_close_tint">@color/core_grey_15</color>

2
app/src/main/res/values/light_colors.xml
View file

@ -155,7 +155,7 @@
<color name="media_keyboard_button_color">@color/core_grey_60</color>
<color name="megaphone_background_color">@color/core_white</color>
<color name="megaphone_body_text_color">@color/core_grey_65</color>
<color name="megaphone_body_text_color">@color/signal_colorOnSurfaceVariant</color>
<color name="megaphone_reactions_shade">@color/core_grey_02</color>
<color name="megaphone_reactions_close_tint">@color/core_black</color>