From 62cb29fdb76b1de2fd1be5c08b187f9ce1f6668c Mon Sep 17 00:00:00 2001
From: Lucio Maciel <lucio@signal.org>
Date: Mon, 23 Aug 2021 18:11:13 -0300
Subject: [PATCH] Update Invite friends screen UI.

---
 .../securesms/InviteActivity.java             | 10 +--
 .../drawable/invite_edit_text_background.xml  |  2 +-
 app/src/main/res/layout/invite_activity.xml   | 67 +++++++++++--------
 app/src/main/res/values/strings.xml           |  3 +-
 4 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
index 41f075a6d..19dd327f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
@@ -14,6 +14,7 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.AnimRes;
@@ -97,7 +98,8 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     slideOutAnimation = loadAnimation(R.anim.slide_to_bottom);
 
     View                 shareButton     = findViewById(R.id.share_button);
-    Button               smsButton       = findViewById(R.id.sms_button);
+    TextView             shareText       = findViewById(R.id.share_text);
+    View                 smsButton       = findViewById(R.id.sms_button);
     Button               smsCancelButton = findViewById(R.id.cancel_sms_button);
     Toolbar              smsToolbar      = findViewById(R.id.sms_send_frame_toolbar);
     ContactFilterView    contactFilter   = findViewById(R.id.contact_filter_edit_text);
@@ -127,9 +129,9 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
       shareButton.setOnClickListener(new ShareClickListener());
       smsButton.setOnClickListener(new SmsClickListener());
     } else {
-      shareButton.setVisibility(View.GONE);
-      smsButton.setOnClickListener(new ShareClickListener());
-      smsButton.setText(R.string.InviteActivity_share);
+      smsButton.setVisibility(View.GONE);
+      shareText.setText(R.string.InviteActivity_share);
+      shareButton.setOnClickListener(new ShareClickListener());
     }
   }
 
diff --git a/app/src/main/res/drawable/invite_edit_text_background.xml b/app/src/main/res/drawable/invite_edit_text_background.xml
index 875745970..19dfc16e4 100644
--- a/app/src/main/res/drawable/invite_edit_text_background.xml
+++ b/app/src/main/res/drawable/invite_edit_text_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:color="@color/core_grey_25" android:width="1dp" />
+    <solid android:color="@color/signal_background_secondary"/>
     <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml
index c7d98ff6d..305f6e525 100644
--- a/app/src/main/res/layout/invite_activity.xml
+++ b/app/src/main/res/layout/invite_activity.xml
@@ -33,16 +33,6 @@
                       android:paddingStart="28dp"
                       android:paddingEnd="28dp">
 
-            <TextView android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="@style/TextAppearance.Signal.Title2.Bold"
-                      android:text="@string/InviteActivity_friends_dont_let_friends_text_unencrypted"
-                      android:textColor="@color/signal_text_primary"
-                      android:gravity="center_horizontal"
-                      android:layout_marginBottom="30dp"
-                      android:layout_marginTop="18dp"
-                      android:paddingStart="10dp"/>
-
             <EditText android:id="@+id/invite_text"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
@@ -59,25 +49,46 @@
                       android:gravity="top"
                       android:inputType="textShortMessage|textMultiLine"/>
 
-            <Button android:id="@+id/sms_button"
-                android:layout_gravity="center_horizontal"
-                android:text="@string/InviteActivity_share_with_contacts"
-                android:layout_marginTop="16dp"
-                android:textColor="@color/signal_text_toolbar_title"
-                android:background="@drawable/cta_button_background"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+            <LinearLayout android:id="@+id/sms_button"
+                          android:layout_width="match_parent"
+                          android:layout_height="48dp"
+                          android:layout_marginTop="16dp"
+                          android:background="?attr/selectableItemBackground">
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/share_button"
-                style="@style/Button.Borderless"
-                app:drawableStartCompat="@drawable/ic_share_24"
-                android:drawablePadding="4dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/InviteActivity_choose_how_to_share"
-                android:layout_width="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_height="wrap_content" />
+                <ImageView android:layout_width="24dp"
+                           android:layout_height="24dp"
+                           android:layout_gravity="center_vertical"
+                           app:srcCompat="@drawable/ic_invite_inverse_28" />
+
+                <TextView style="@style/Signal.Text.Body"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_gravity="center_vertical"
+                          android:layout_marginStart="26dp"
+                          android:text="@string/InviteActivity_share_with_contacts" />
+
+            </LinearLayout>
+
+            <LinearLayout android:id="@+id/share_button"
+                          android:layout_width="match_parent"
+                          android:layout_height="48dp"
+                          android:layout_marginTop="16dp"
+                          android:background="?attr/selectableItemBackground">
+
+                <ImageView android:layout_width="24dp"
+                           android:layout_height="24dp"
+                           android:layout_gravity="center_vertical"
+                           app:srcCompat="@drawable/ic_share_24_tinted" />
+
+                <TextView android:id="@+id/share_text"
+                          style="@style/Signal.Text.Body"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_gravity="center_vertical"
+                          android:layout_marginStart="26dp"
+                          android:text="@string/InviteActivity_share_via" />
+
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2200e919f..3c1b5a946 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -876,7 +876,7 @@
     <!-- InviteActivity -->
     <string name="InviteActivity_share">Share</string>
     <string name="InviteActivity_share_with_contacts">Share with contacts</string>
-    <string name="InviteActivity_choose_how_to_share">Choose how to share</string>
+    <string name="InviteActivity_share_via">Share via…</string>
 
     <string name="InviteActivity_cancel">Cancel</string>
     <string name="InviteActivity_sending">Sending…</string>
@@ -892,7 +892,6 @@
     </plurals>
     <string name="InviteActivity_lets_switch_to_signal">Let\'s switch to Signal: %1$s</string>
     <string name="InviteActivity_no_app_to_share_to">It looks like you don\'t have any apps to share to.</string>
-    <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Friends don\'t let friends chat unencrypted.</string>
 
     <!-- LearnMoreTextView -->
     <string name="LearnMoreTextView_learn_more">Learn more</string>