From d7f9582bc4c0b2910cd0b90eb7747902db0f5f50 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Thu, 8 Sep 2022 13:54:40 -0400
Subject: [PATCH] Update Megaphone text styling to match Material Design 3.

---
 app/src/main/res/layout/basic_megaphone_view.xml | 9 ++++++---
 app/src/main/res/values-night/dark_colors.xml    | 2 +-
 app/src/main/res/values/light_colors.xml         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/basic_megaphone_view.xml b/app/src/main/res/layout/basic_megaphone_view.xml
index 5053086d60..c28af6902c 100644
--- a/app/src/main/res/layout/basic_megaphone_view.xml
+++ b/app/src/main/res/layout/basic_megaphone_view.xml
@@ -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"
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index 095f7853d9..64cbcc6742 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -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>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 7990158668..4638749988 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -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>