From f02ac86e4529087b4d18aaae4dc656ccf536b859 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 27 Mar 2023 11:07:43 -0400
Subject: [PATCH] Updated strings for username education fragment.

---
 .../main/res/layout/username_education_fragment.xml | 13 ++++++-------
 app/src/main/res/values/strings.xml                 |  6 ++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/username_education_fragment.xml b/app/src/main/res/layout/username_education_fragment.xml
index 4101b28b59..c0dc255d61 100644
--- a/app/src/main/res/layout/username_education_fragment.xml
+++ b/app/src/main/res/layout/username_education_fragment.xml
@@ -67,10 +67,10 @@
             android:layout_marginEnd="32dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             android:textColor="@color/signal_colorOnSurfaceVariant"
+            android:text="@string/UsernameEducationFragment__usernames_are_paired_with_a_set_of_digits"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/username_education_icon_1"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_1"
-            tools:text="Usernames are paired with a set of digits and aren’t shared on your profile" />
+            app:layout_constraintTop_toTopOf="@id/username_education_icon_1" />
 
         <ImageView
             android:id="@+id/username_education_icon_2"
@@ -91,10 +91,10 @@
             android:layout_marginEnd="32dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             android:textColor="@color/signal_colorOnSurfaceVariant"
+            android:text="@string/UsernameEducationFragment__each_username_has_a_unique_qr_code"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/username_education_icon_2"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_2"
-            tools:text="Each username has a unique link you can share with your friends to start a chat with you" />
+            app:layout_constraintTop_toTopOf="@id/username_education_icon_2" />
 
         <ImageView
             android:id="@+id/username_education_icon_3"
@@ -115,11 +115,10 @@
             android:layout_marginEnd="32dp"
             android:textAppearance="@style/Signal.Text.BodyLarge"
             android:textColor="@color/signal_colorOnSurfaceVariant"
+            android:text="@string/UsernameEducationFragment__turn_off_phone_number_discovery"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/username_education_icon_3"
-            app:layout_constraintTop_toTopOf="@id/username_education_icon_3"
-            tools:text="Turn off phone number discovery under Settings > Phone Number > Who can find my number, to use your username as the primary way
-others can contact you." />
+            app:layout_constraintTop_toTopOf="@id/username_education_icon_3" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/username_education_row_3_barrier"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33ad0bb6ed..551d4eea7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5748,6 +5748,12 @@
     <string name="UsernameEducationFragment__continue">Continue</string>
     <!-- Displayed as a title on the username education screen -->
     <string name="UsernameEducationFragment__set_up_your_signal_username">Set up your Signal username</string>
+    <!-- Displayed as body text in the username education screen -->
+    <string name="UsernameEducationFragment__usernames_are_paired_with_a_set_of_digits">Usernames are paired with a set of digits and aren\'t shared on your profile</string>
+    <!-- Displayed as body text in the username education screen -->
+    <string name="UsernameEducationFragment__each_username_has_a_unique_qr_code">Each username has a unique QR code and link you can share with friends to start a chat with you</string>
+    <!-- Displayed as body text in the username education screen. The string references the names of settings, so they should match our translations for those settings. -->
+    <string name="UsernameEducationFragment__turn_off_phone_number_discovery">Turn off phone number discovery under Settings > Privacy > Phone number > Who can find my number, to use your username as the primary way others can contact you</string>
 
     <!-- Username edit dialog -->
     <!-- Option to open username editor displayed as a list item in a dialog -->