From 93d6ce40c3e713783615366257474439a5c059b1 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 25 Sep 2020 12:13:14 -0300
Subject: [PATCH] GV2 learn more copy update.

---
 app/src/main/res/layout/group_manage_fragment.xml         | 2 +-
 .../main/res/layout/groups_learn_more_bottom_sheet.xml    | 4 ++--
 app/src/main/res/values/strings.xml                       | 8 ++++----
 app/src/main/res/values/text_styles.xml                   | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/group_manage_fragment.xml b/app/src/main/res/layout/group_manage_fragment.xml
index e02eef8a0c..5028f579bb 100644
--- a/app/src/main/res/layout/group_manage_fragment.xml
+++ b/app/src/main/res/layout/group_manage_fragment.xml
@@ -66,7 +66,7 @@
                     android:paddingTop="10dp"
                     android:paddingEnd="12dp"
                     android:paddingBottom="10dp"
-                    android:textAppearance="@style/TextAppearance.Signal.Caption"
+                    android:textAppearance="@style/TextAppearance.Signal.Subtitle"
                     android:textColor="?title_text_color_secondary"
                     android:visibility="gone"
                     tools:text="@string/ManageGroupActivity_legacy_group_learn_more"
diff --git a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
index 47d0953fac..4c99016e10 100644
--- a/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
+++ b/app/src/main/res/layout/groups_learn_more_bottom_sheet.xml
@@ -61,7 +61,7 @@
         android:layout_marginStart="20dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
-        android:text="@string/GroupsLearnMore_how_do_i_use_new_groups"
+        android:text="@string/GroupsLearnMore_can_i_upgrade_a_legacy_group"
         android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
         android:textColor="?title_text_color_primary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_2_a"
@@ -94,7 +94,7 @@
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:text="@string/GroupsLearnMore_paragraph_3"
-        android:textAppearance="@style/TextAppearance.Signal.Body2.Bold"
+        android:textAppearance="@style/TextAppearance.Signal.Body2"
         android:textColor="?title_text_color_secondary"
         app:layout_constraintBottom_toTopOf="@+id/lbs_paragraph_1"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19e01e97a7..532d813581 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -622,7 +622,7 @@
 
     <string name="ManageGroupActivity_edit_name_and_picture">Edit name and picture</string>
     <string name="ManageGroupActivity_legacy_group">Legacy Group</string>
-    <string name="ManageGroupActivity_legacy_group_learn_more">This is a Legacy Group. To access features like group admins, create a New Group.</string>
+    <string name="ManageGroupActivity_legacy_group_learn_more">This is a Legacy Group. Features like group admins are only available for New Groups.</string>
     <string name="ManageGroupActivity_this_is_an_insecure_mms_group">This is an insecure MMS Group. To chat privately and access features like group names, invite your contacts to Signal.</string>
     <string name="ManageGroupActivity_invite_now">Invite now</string>
 
@@ -2659,9 +2659,9 @@
     <string name="GroupsLearnMore_legacy_vs_new_groups">Legacy vs. New Groups</string>
     <string name="GroupsLearnMore_what_are_legacy_groups">What are Legacy Groups?</string>
     <string name="GroupsLearnMore_paragraph_1">Legacy Groups are groups that are not compatible with New Group features like admins and more descriptive group updates.</string>
-    <string name="GroupsLearnMore_how_do_i_use_new_groups">How do I use New Groups?</string>
-    <string name="GroupsLearnMore_paragraph_2">Legacy Groups can’t be converted into New Groups, but you can create a New Group with the same members.</string>
-    <string name="GroupsLearnMore_paragraph_3">To create a New Group, all members should update to the latest version of Signal.</string>
+    <string name="GroupsLearnMore_can_i_upgrade_a_legacy_group">Can I upgrade a Legacy Group?</string>
+    <string name="GroupsLearnMore_paragraph_2">Legacy Groups can\'t yet be upgraded to New Groups, but you can create a New Group with the same members if they\'re on the latest version of Signal.</string>
+    <string name="GroupsLearnMore_paragraph_3">Signal will offer a way to upgrade Legacy Groups in the future.</string>
 
     <!-- GroupLinkBottomSheetDialogFragment -->
     <string name="GroupLinkBottomSheet_share_via_signal">Share via Signal</string>
diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml
index f5acab0d89..951421cbe4 100644
--- a/app/src/main/res/values/text_styles.xml
+++ b/app/src/main/res/values/text_styles.xml
@@ -118,6 +118,10 @@
     <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.Subtitle2" parent="@style/TextAppearance.MaterialComponents.Subtitle2">
     </style>