From 285bd3de0e2000ff6087fef03c64437132eb9e33 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Mon, 26 Oct 2015 12:13:12 -0700
Subject: [PATCH] tweak reminder jedi mind tricks

// FREEBIE
---
 res/drawable-hdpi/ic_close_white_24dp.png     | Bin 0 -> 294 bytes
 res/drawable-mdpi/ic_close_white_24dp.png     | Bin 0 -> 242 bytes
 res/drawable-xhdpi/ic_close_white_24dp.png    | Bin 0 -> 337 bytes
 res/drawable-xxhdpi/ic_close_white_24dp.png   | Bin 0 -> 579 bytes
 res/drawable-xxxhdpi/ic_close_white_24dp.png  | Bin 0 -> 420 bytes
 res/layout/reminder_header.xml                |  26 ++++--------------
 res/values/strings.xml                        |   8 +++---
 .../components/reminder/ReminderView.java     |   2 +-
 8 files changed, 11 insertions(+), 25 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_close_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_close_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_close_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_close_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_close_white_24dp.png

diff --git a/res/drawable-hdpi/ic_close_white_24dp.png b/res/drawable-hdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d42adbaae1e12935eadb9509537764676ea10b54
GIT binary patch
literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002(Nkl<ZcmeH|
zRYJo+7=$Zt<Vwg@kozQ+_(6;F;e)O(&b+KmC%<>{rT7Q46o$Zbl8ePIbL;z@U61c@
z1oZcN17idZ4GfX?fODXGO%!8zVC+~Oq_`s<o2+8w;gv0SjQR)ilU1@tFK*}uk}})|
zNXbEk_^r!sDLL4`h)rvjaa*-u1)NAG407iTfHOH2*K;hn;*2w{sP1oKg;o+;%AQcX
zacz`TWUwoi54#~QXG*wEVF7<zeiD{dAu=jI-S(kUqqAvyw@6{`sh18?=)pYL<dmrg
sHQ3Te?SUBS!~YZij%MMEe|##g0d6*te)}5Br2qf`07*qoM6N<$g8j07@&Et;

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_close_white_24dp.png b/res/drawable-mdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb62b22d4af68a0b13b3b86e9a8cee73ef6f6d91
GIT binary patch
literal 242
zcmV<O01f|%P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002FNkl<Zcmd6m
zg%N{L3_u$OsCze|Q*%-o0Jo7|d#T`h#>YP|p3Ek_5WSjqo5iYM4H#D}c6kWneeJL?
zE20PnPatIf`>FVW2)H9uZE?|`5h{Wx9s?ogCa3lasEFc8_Eobm{vt6;RvC`8iYVw4
zsNlXwQd#2y;IL}I8w6a|Z30;$Q^3Oq685^=iYGwKf+hOaD1zoaOKX;~=Coci94XZ0
sqQHRGcpymCA#*_UHMjTJ0h;o90h~AILsY<jg8%>k07*qoM6N<$f@{}d*#H0l

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_close_white_24dp.png b/res/drawable-xhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..856427baf5ee8bde12f10b69e30ed7f3e3b99cdd
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0003PNkl<ZcmeH}
z1yaR85CzGe5O?=e;b%mXZK%PSiB&y(-;ZaiJNA>ADEa1;lu+raTsULzVVZi%tbzkh
z$H5b)K+S5O!tiTk;AHTbP;mj=kZGL4<JZY#Zh%v&ff5d=$<%=&##=ReBkqTtcC3i;
z4J%{tsZSB&twNv>;5!sOc!9#UZbW#I;sbv98Lv{zFb^KDQebl&UZTLDfK9Uu|Eyq^
zYnrFu6;lo`7R;)TfBoGh%D|dH;r>?7@Y>cD3iq#_Viw3Eg~KmDziGWfgeQ?iiV$z0
zSRunp6r`S4nn2O}LJkze!y%2w_b6%(hPN$ez)g&g70+$UaK#Bw$M`_e0LSB7$KAoL
j<36W9r}@>Vq@?5?Wa+LNCXJ5;00000NkvXXu0mjfMy;7P

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_close_white_24dp.png b/res/drawable-xxhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1690d6f73209c39d96794aaa70e88e9fd85eceea
GIT binary patch
literal 579
zcmV-J0=)f+P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006CNkl<ZcmeI0
zg_7Gq5Jcr8pFy7%h6{gMn9csNFbZC1s&0>zOj;1wE-=Ymv;73KlSD;DMMXtLMX@0}
z^y+dl6K-&qUCCv@U9PGn+1fbAYhcRgw_V08fR~)Hw4`z_@*c>53A<+Ka~Lu+hj*M8
zQ{ooyfSi)gR+3Xz&L>K8;0@QMgm?sGlwgK4A2?E$KyD5ha9@KqVruJy(gV(5&4UGf
z2A(raG%;Wnm>M__tY9(E!+$C%Er8qyjxoza|C(Alx)?aX9SbW+M;ARWI0np*!0Lw!
zXcZh|Ryr&RTm`I8IxGns!y~Yssjviaq^uA9I#FN=;DTbq{GN%h1aLd_>xZR)d&aDG
zSOT~LfTDI-0=S%9hoysC?&lI@HDQo+BX)RB`6DIEspJXUNmruJWWOML_ndxL<&0S!
zi)_g#(dBR5D^BVegO*QfE9dyj{u3~jPi&!e&w-~*4}G(!9h{>Ze8x6AmYD=jhh?|H
za63>xIA7~NVGus!RB$@1-KyrKQE&`?)?m=n!MSdO)eVLOu6|gpf@A2|XEhJbT6gC@
zO9xkNT)ofofYZeImtZ--Nh#6e36NF8a)8T#2U<cmcnjpmPcVGoY@~Nhz2GnK4h)um
z=ox~8cbt=ko@RKKR|ZSFFkW&xT#z<6zk@zFzgFWc-=sVJ_lk;&ii(Pg`T|4kk!{aa
RiO~Q6002ovPDHLkV1gjY|I7dY

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_close_white_24dp.png b/res/drawable-xxxhdpi/ic_close_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d6b78513bd05b94e57435e3f24908888fd362fa
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z?kjn;uuoF`1aOOM->Nwwu^iT
z6JrWaR$o+}cRGWiRWvV|f31DfciHG$8LO{mZH-zR2BE~bH;QNT>X;>~KePF-qg1t#
z?MHKmMPKE~_@2)@V%5$}soy=>XTcvIhCe<Af4VCo)EM@8bsRo%)=Y8RyidiuH}l`<
zIQW{g;ePkkYx@G5p8sY!|DAK*dtsaV>MHddKQt0c{&}6QU5^kw@@@4Wy$8)K2cC1z
zc`s~nU%g<T|Am_QAFS$kHcn(Y1Jhiw&;LVBiSO49jyZoUK<xPse%c-UT+6iU@tb1~
zY8C&Aat^SZ&ktYBId474vWkD(eLVgZu-JKQ_%n6dXQ&e@{(blAcq_OrqZY+w75~gV
zI-0ltR7iCHbJdFV{jT-uGRI@GtrUMMDE>4<CKJC;;}<G(dwLxy#KLy7I0*2#q;LCn
Q9T@ryp00i_>zopr0Q!N&SpWb4

literal 0
HcmV?d00001

diff --git a/res/layout/reminder_header.xml b/res/layout/reminder_header.xml
index 64d6091604..2d4354abee 100644
--- a/res/layout/reminder_header.xml
+++ b/res/layout/reminder_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content">
@@ -9,6 +10,8 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:visibility="gone"
+                  tools:visibility="visible"
+                  android:padding="2dp"
                   android:gravity="center_vertical"
                   android:background="?reminder_header_background">
 
@@ -23,12 +26,14 @@
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:layout_marginBottom="5dp"
+                      tools:text="Invite to Signal"
                       android:textColor="@color/white"
                       android:textSize="18sp"/>
 
             <TextView android:id="@+id/reminder_text"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
+                      tools:text="Take your conversation with Jules Bonnot to the next level."
                       android:fontFamily="sans-serif-light"
                       android:textColor="@color/white"
                       android:textSize="16sp"/>
@@ -51,27 +56,8 @@
                              android:layout_height="40dp"
                              android:padding="10dp"
                              android:background="@drawable/touch_highlight_background"
-                             android:src="@drawable/ic_menu_remove_holo_light"/>
+                             android:src="@drawable/ic_close_white_24dp"/>
             </LinearLayout>
-
-            <LinearLayout android:layout_width="wrap_content"
-                          android:layout_height="0dp"
-                          android:layout_weight="1"
-                          android:gravity="bottom">
-
-                <Button android:id="@+id/ok"
-                        android:layout_width="60sp"
-                        android:layout_height="40sp"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:background="@drawable/light_touch_highlight_background"
-                        android:fontFamily="sans-serif-light"
-                        android:textColor="@color/white"
-                        android:clickable="false"
-                        android:text="@string/yes"
-                        android:padding="2dp"/>
-
-            </LinearLayout>
-
           </LinearLayout>
 
     </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a49b6b33f..ce1f3af98b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1039,16 +1039,16 @@
     <string name="reminder_header_expired_build">Your build of Signal has expired!</string>
     <string name="reminder_header_expired_build_details">Messages will no longer send successfully, please update to the most recent version.</string>
     <string name="reminder_header_expired_build_button">UPGRADE</string>
-    <string name="reminder_header_sms_default_title">Use as default SMS app?</string>
+    <string name="reminder_header_sms_default_title">Use as default SMS app</string>
     <string name="reminder_header_sms_default_text">Tap to make Signal your default SMS app.</string>
     <string name="reminder_header_sms_default_button">SET</string>
-    <string name="reminder_header_sms_import_title">Import system SMS?</string>
+    <string name="reminder_header_sms_import_title">Import system SMS</string>
     <string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into its encrypted database.</string>
     <string name="reminder_header_sms_import_button">IMPORT</string>
-    <string name="reminder_header_push_title">Enable Signal?</string>
+    <string name="reminder_header_push_title">Enable Signal</string>
     <string name="reminder_header_push_text">Upgrade your messaging experience.</string>
     <string name="reminder_header_push_button">ENABLE</string>
-    <string name="reminder_header_invite_title">Invite to Signal?</string>
+    <string name="reminder_header_invite_title">Invite to Signal</string>
     <string name="reminder_header_invite_text">Take your conversation with %1$s to the next level.</string>
     <string name="reminder_header_invite_button">INVITE</string>
     <string name="reminder_header_close_button">CLOSE</string>
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
index 5c00a36e59..7f92944b87 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ReminderView.java
@@ -41,7 +41,7 @@ public class ReminderView extends LinearLayout {
 
   private void initialize() {
     LayoutInflater.from(getContext()).inflate(R.layout.reminder_header, this, true);
-    container = ViewUtil.findById(this, R.id.container);
+    container   = ViewUtil.findById(this, R.id.container);
     closeButton = ViewUtil.findById(this, R.id.cancel);
     title       = ViewUtil.findById(this, R.id.reminder_title);
     text        = ViewUtil.findById(this, R.id.reminder_text);