From 3aae86d20c1eef5f0bc9a833a5ee5cfddd82b6e6 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Thu, 30 Mar 2017 18:18:04 -0700
Subject: [PATCH] Update registration activity style

// FREEBIE
---
 res/drawable-hdpi/ic_info_white_18dp.png      | Bin 0 -> 295 bytes
 res/drawable-mdpi/ic_info_white_18dp.png      | Bin 0 -> 214 bytes
 res/drawable-xhdpi/ic_info_white_18dp.png     | Bin 0 -> 340 bytes
 res/drawable-xxhdpi/ic_info_white_18dp.png    | Bin 0 -> 504 bytes
 res/drawable-xxxhdpi/ic_info_white_18dp.png   | Bin 0 -> 616 bytes
 res/drawable/pill_button.xml                  |  20 +++++
 res/layout/registration_activity.xml          |  73 ++++++++++++------
 res/values/strings.xml                        |  12 ++-
 .../securesms/RegistrationActivity.java       |  57 +++++++-------
 9 files changed, 111 insertions(+), 51 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_info_white_18dp.png
 create mode 100644 res/drawable-mdpi/ic_info_white_18dp.png
 create mode 100644 res/drawable-xhdpi/ic_info_white_18dp.png
 create mode 100644 res/drawable-xxhdpi/ic_info_white_18dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_info_white_18dp.png
 create mode 100644 res/drawable/pill_button.xml

diff --git a/res/drawable-hdpi/ic_info_white_18dp.png b/res/drawable-hdpi/ic_info_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bc6eb1c5f6c4ff59e229e3ff2002952d8966e88
GIT binary patch
literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq000{R000{Z1ONa4C*3^W0002)Nkl<ZILpP;
zy$ZrG6o%o<{w!+mN$4ObI#&?9nqbA%izuD-UYxZ~t(*Ef2qtY#Vx9cP6P}(Vr%~$9
zq0fSpoFh3K=JdXkh#fcTsn{|Kp$S*y6vRHX=7~QKR&u8hdc$T%B4>LACyGYx!m!SE
z&bJe#NSta~zw%p4R?#(VA>N(4Nr0JQDea>T%Z24V345WQ8Fmzw<+H&d+|9?VZkr#N
zb+-8rY-(7KswFGw*aP3TWLnu_<cwAt_nATSXO4Lg&YiLJbXGxlXX$&WF&7Uyi=94j
tNb1~biFVE;&@MAH83!^nQ|qbxDK7z4BHb}#=B)q#002ovPDHLkV1hgdfsg<I

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_info_white_18dp.png b/res/drawable-mdpi/ic_info_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d692dcc1088e9977ea5cdbd297cf426024d82c2
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|m=6bp~hG?9hI_aQbvx0!@Tg8m3
z6Eoy=oZ8LyXs)&BOU}P2(%3$|*>D5L%qRD!)o%X7KRfk*mrU=$1%ZVRPMtZXc-lo!
zseE2bl;+bZ#!MR~SZ92b(p?+gd+yz|mN(W+v+}dbPINe1a{iJC3GCd}9V_nil}|HA
zXj4pIP4K155ALl@=vAxkuwRnWsj&SsThBc6(-Us7xH|j0|K0d|cbsEf8S}x`H%oyI
OW$<+Mb6Mw<&;$U3Xjl^f

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_info_white_18dp.png b/res/drawable-xhdpi/ic_info_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f53edce0e5c5ba3b36ecee05fc6ec8c172cdc2
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003SNkl<ZNXO-s
zL5jjK7=?q5vlE$XDY|e`n7fDsPhhcvM;L^;gPYQuNSk_rcJs|@2GS<KNnlpKZOhl>
z{qOx%>h;7s8wx56Jw1ks6KiI1kPi+#aH&PJ2*rG2kW`aBhfKK;qJpW6`6g6X0Tp<f
zU!DEl#42-7%5CutjppXDeLO)9p08@9ltO!+?#J<aB!SvNMA>+Kkgf)>vOxu@%56}U
z3@UAqNxoWRgL?0avf0r66UZcknozT!fd*!ul0iosv`z*shZSj)K!&$r+jJ6WH*Wue
zIy#Vd=B|yDMb~5N+mUhA&86jk4aR&ik^dv-u+xZ`Kd)*La`$@UnBd-%E5pt?DFHTP
mMNUaWM@K`+k>x0Uub?07ICz#IlqDzt0000<MNUMnLSTY5E0m=G

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_info_white_18dp.png b/res/drawable-xxhdpi/ic_info_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5062dd031d39ac268a5af53f27acf5383b7f55f
GIT binary patch
literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0005MNkl<ZcmeI$
zK}*|U7{KutjHl{Ff*(Vv22uP565Ir#5D;ZMmVSWtuFNkp$iaKBih^?<Md=jJy)->E
z;lIn+p-J{6Z=QF9(f@M|{Gfdr`o3n-{~fCYMD!RiphrZ&3a0v0eQ=vg?#P%g<CZUM
zX<^HJ<`Jm}&hVOI$Bd}j3rF_YI#<*!#<#)tdB>(V_UdAXOtCE?tb-kr(xe$-RcxOr
zO-tCVg01t8Mz8oXc7;~4gdHO_X83EyNPYMdw#*2r;qRx1NIm0~W1m13gVS>CQ62kM
zhHZm72Ajp$C4lOJ09+Jfcev=L2wNq?MJcU37T~IO9*e-qcLtq2)&nQo2;Dq3aEA5&
zD)x^*#z++t79>!`gw<amQ^bTHwc*wYb}hV!Rk8D8Y|9C@QH&YBt7G?=GVDwpJ1NIJ
zUR1FsmdY{1k?LDNl>Vf~X!R8%VLoqYG-6H040|LrZNg5~BU8wXCe1jga~KRsux*l~
z1kA9@D>nUL$L0X<6I*QHn*G(pN1mzL6JgU!7mrgOkh<rDC9UhEO)j`0WxkYa&e^cI
uP7<d@n+{$2^y$)}P0RkGOn(-b{`>^?97-A;H4wo70000<MNUMnLSTa52<fK)

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_info_white_18dp.png b/res/drawable-xxxhdpi/ic_info_white_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0db142917e26af77cab7301a495cda515dd51f4b
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006nNkl<ZcmeI&
z!AcuJ7{Kwl7^`VKWsUeKHAJyhk3w_sDHQag<RMz9h4!R|R%maE9tsMp216*Jj}USX
zA$V&x;=kt}c4v2X=Gz?hKj(!X%q|)7jmpc*o7O0@MS~_C`V0vO7}BRhlLnj2qs*4c
zLlq8a5fIgw2liQX4_f1zXW};DikdsnI**vtV%0uqnV+QToF$u}9iB+rh`JrnEMKwJ
zF@?0C1$=CF!|OC4k3ZP1i)RX2&~pq)B@@srKCZf@kR0>{mwieK+QD`2lYo|a!gV7m
z@j*Y3=v!RSI*I!4*<{t?fgZ&`_i;dLAO?b}9&{}Vy3~OxJd1)Rc+sE(5Cy?rG^mAi
zcTu1s0n+_tE*!K)7Hx!s8f4K?IH*Y$orZ%tWKlaD)Ccj;9(v)RVJ4tKI4H;jG@d%p
z^lsVoztkOZkmj>*W&%3V|8&TL4#Pp4nSkDfgXRf@L7L--;z1nbqoP3j;-FpKA%7wY
z3MfZ|6j!343zQC269v7|gA^?>kdKN3S``Aluo4fXI7gy0R9w&!BV0Gciw{!Naou*(
zKRrL=vX7{wpaM6z>K8M~L5dPxT=biw`Dmf*fKyI0d?|5jd9#XX$5RE4vDF7=><sYg
zj7Zy%ZJQ&`3g0pBg)=<+L*N?snB-G+Hzu!g$%MECT(IK)B7w&qcZ@Yhcb{F#Rxc80
z)*KrgaY~yW1ICOQ(4)->hrH#Lz*P&Qm4k9n4*Casy3f0@)!)(p0000<MNUMnLSTY~
C9uye>

literal 0
HcmV?d00001

diff --git a/res/drawable/pill_button.xml b/res/drawable/pill_button.xml
new file mode 100644
index 0000000000..163c49aeda
--- /dev/null
+++ b/res/drawable/pill_button.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle" >
+
+    <corners
+            android:bottomLeftRadius="30dp"
+            android:bottomRightRadius="30dp"
+            android:radius="60dp"
+            android:topLeftRadius="30dp"
+            android:topRightRadius="30dp" />
+
+    <solid android:color="#ffffff" />
+
+    <padding
+            android:bottom="0dp"
+            android:left="0dp"
+            android:right="0dp"
+            android:top="0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index d2fc488781..316e28dcef 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -8,28 +8,17 @@
 
     <LinearLayout android:padding="16dp"
                   android:paddingBottom="0dp"
+                  android:layout_marginTop="20dp"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-                  android:gravity="center_vertical"
+                  android:animateLayoutChanges="true"
                   android:orientation="vertical">
 
-        <TextView style="@style/Registration.Label"
-                  android:layout_width="fill_parent"
-                  android:gravity="start"
-                  android:textAllCaps="true"
-                  android:text="@string/registration_activity__your_country" />
-
         <Spinner android:id="@+id/country_spinner"
                  android:layout_width="fill_parent"
                  android:layout_height="wrap_content"
                  android:layout_marginBottom="16dip" />
 
-        <TextView style="@style/Registration.Label"
-                  android:layout_width="fill_parent"
-                  android:gravity="start"
-                  android:textAllCaps="true"
-                  android:text="@string/registration_activity__your_country_code_and_phone_number" />
-
         <LinearLayout android:orientation="horizontal"
                       android:layoutDirection="ltr"
                       android:layout_width="fill_parent"
@@ -69,11 +58,37 @@
                   android:text="@string/registration_activity__verify_your_number_to_connect_with_signal"/>
 
         <TextView style="@style/Registration.Description"
+                  android:id="@+id/registration_information"
                   android:layout_width="fill_parent"
-                  android:layout_marginBottom="16dip"
                   android:gravity="start"
+                  android:visibility="gone"
+                  android:layout_marginBottom="16dp"
                   android:text="@string/registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy"/>
 
+        <LinearLayout android:id="@+id/information_link_container"
+                      android:clickable="true"
+                      android:orientation="horizontal"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginBottom="16dip">
+
+            <ImageView android:layout_width="wrap_content"
+                       android:layout_height="wrap_content"
+                       android:clickable="false"
+                       android:src="@drawable/ic_info_white_18dp"
+                       android:tint="#73B7F0"/>
+
+            <TextView style="@style/Registration.Description"
+                      android:id="@+id/information_label"
+                      android:clickable="false"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="3dp"
+                      android:layout_gravity="center_vertical"
+                      android:textColor="#73B7F0"
+                      android:text="@string/RegistrationActivity_more_information"/>
+        </LinearLayout>
+
         <LinearLayout android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginTop="16dip"
@@ -81,21 +96,35 @@
                       android:layout_gravity="right"
                       android:orientation="horizontal">
 
-            <Button android:id="@+id/skipButton"
-                    android:visibility="gone"
+            <TextView android:id="@+id/skipButton"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="15dp"
+                    android:paddingBottom="15dp"
                     android:text="@android:string/cancel"
+                    android:textColor="@color/white"
+                    android:background="@drawable/pill_button"
+                    android:backgroundTint="@color/grey_400"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:layout_marginRight="5dip"
-                    android:layout_weight="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+                    android:layout_height="wrap_content"/>
 
-            <Button android:id="@+id/registerButton"
+            <TextView android:id="@+id/registerButton"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"
+                    android:paddingTop="15dp"
+                    android:paddingBottom="15dp"
                     android:text="@string/registration_activity__register"
+                    android:textColor="@color/white"
+                    android:background="@drawable/pill_button"
+                    android:backgroundTint="@color/signal_primary"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
+                    android:layout_height="wrap_content"/>
+
         </LinearLayout>
 
         <ImageView android:id="@+id/twilio_shoutout"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index af19638885..f898fbbc56 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -251,6 +251,9 @@
     <string name="DeviceListItem_last_active_s">Last active %s</string>
     <string name="DeviceListItem_today">Today</string>
 
+    <!-- DocumentView -->
+    <string name="DocumentView_unknown_file">unknown file</string>
+
     <!-- DozeReminder -->
     <string name="DozeReminder_optimize_for_missing_play_services">Optimize for missing Play Services</string>
     <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">This device does not support Play Services. Tap to disable system battery optimizations that prevent Signal from retrieving messages while inactive.</string>
@@ -526,6 +529,8 @@
     <string name="RegistrationActivity_i_understand">I understand</string>
     <string name="RegistrationActivity_play_services_error">Play Services Error</string>
     <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services is updating or temporarily unavailable. Please try again.</string>
+    <string name="RegistrationActivity_more_information">More information</string>
+    <string name="RegistrationActivity_less_information">Less information</string>
 
     <!-- RegistrationProblemsActivity -->
     <string name="RegistrationProblemsActivity_possible_problems">Possible problems</string>
@@ -676,6 +681,9 @@
     <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Quick response unavailable when Signal is locked!</string>
     <string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
 
+    <!-- SaveAttachmentTask -->
+    <string name="SaveAttachmentTask_open_directory">Open Directory</string>
+
     <!-- SingleRecipientNotificationBuilder -->
     <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
     <string name="SingleRecipientNotificationBuilder_new_message">New message</string>
@@ -931,7 +939,7 @@
     </string>
     <string name="registration_activity__phone_number">PHONE NUMBER</string>
     <string name="registration_activity__register">Register</string>
-    <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registration transmits some contact information to the server. It is not stored.</string>
+    <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal makes it easy to communicate by using your existing phone number and address book. Friends and contacts who already know how to contact you by phone will be able to easily get in touch by Signal.\n\nRegistration transmits some contact information to the server. It is not stored.</string>
     <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
 
     <!-- registration_problems -->
@@ -1344,8 +1352,6 @@
 
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
-    <string name="SaveAttachmentTask_open_directory">Open Directory</string>
-    <string name="DocumentView_unknown_file">unknown file</string>
 
     <!-- EOF -->
 
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 7b835a68ba..ef252f8436 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -1,11 +1,10 @@
 package org.thoughtcrime.securesms;
 
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -15,14 +14,12 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.i18n.phonenumbers.AsYouTypeFormatter;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -58,8 +55,11 @@ public class RegistrationActivity extends BaseActionBarActivity {
   private Spinner              countrySpinner;
   private TextView             countryCode;
   private TextView             number;
-  private Button               createButton;
-  private Button               skipButton;
+  private TextView             createButton;
+  private TextView             skipButton;
+  private TextView             informationView;
+  private View                 informationToggle;
+  private TextView             informationToggleText;
 
   private MasterSecret masterSecret;
 
@@ -86,37 +86,29 @@ public class RegistrationActivity extends BaseActionBarActivity {
 
   private void initializeResources() {
     this.masterSecret   = getIntent().getParcelableExtra("master_secret");
-    this.countrySpinner = (Spinner)findViewById(R.id.country_spinner);
-    this.countryCode    = (TextView)findViewById(R.id.country_code);
-    this.number         = (TextView)findViewById(R.id.number);
-    this.createButton   = (Button)findViewById(R.id.registerButton);
-    this.skipButton     = (Button)findViewById(R.id.skipButton);
+    this.countrySpinner        = (Spinner) findViewById(R.id.country_spinner);
+    this.countryCode           = (TextView) findViewById(R.id.country_code);
+    this.number                = (TextView) findViewById(R.id.number);
+    this.createButton          = (TextView) findViewById(R.id.registerButton);
+    this.skipButton            = (TextView) findViewById(R.id.skipButton);
+    this.informationView       = (TextView) findViewById(R.id.registration_information);
+    this.informationToggle     =            findViewById(R.id.information_link_container);
+    this.informationToggleText = (TextView) findViewById(R.id.information_label);
+
+    DrawableCompat.setTint(this.createButton.getBackground(), getResources().getColor(R.color.signal_primary));
+    DrawableCompat.setTint(this.skipButton.getBackground(), getResources().getColor(R.color.grey_400));
 
     this.countryCode.addTextChangedListener(new CountryCodeChangedListener());
     this.number.addTextChangedListener(new NumberChangedListener());
     this.createButton.setOnClickListener(new CreateButtonListener());
     this.skipButton.setOnClickListener(new CancelButtonListener());
+    this.informationToggle.setOnClickListener(new InformationToggleListener());
 
     if (getIntent().getBooleanExtra("cancel_button", false)) {
       this.skipButton.setVisibility(View.VISIBLE);
     } else {
       this.skipButton.setVisibility(View.INVISIBLE);
     }
-
-    findViewById(R.id.twilio_shoutout).setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        Intent intent = new Intent();
-        intent.setAction(Intent.ACTION_VIEW);
-        intent.addCategory(Intent.CATEGORY_BROWSABLE);
-        intent.setData(Uri.parse("https://twilio.com"));
-        try {
-          startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-          Log.w(TAG,e);
-        }
-      }
-    });
   }
 
   private void initializeSpinner() {
@@ -374,4 +366,17 @@ public class RegistrationActivity extends BaseActionBarActivity {
       finish();
     }
   }
+
+  private class InformationToggleListener implements View.OnClickListener {
+    @Override
+    public void onClick(View v) {
+      if (informationView.getVisibility() == View.VISIBLE) {
+        informationView.setVisibility(View.GONE);
+        informationToggleText.setText(R.string.RegistrationActivity_more_information);
+      } else {
+        informationView.setVisibility(View.VISIBLE);
+        informationToggleText.setText(R.string.RegistrationActivity_less_information);
+      }
+    }
+  }
 }