From 67d8fa26a7257d016d0a7780fed97cdcbcb15146 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 17 Jun 2015 11:54:12 -0700
Subject: [PATCH] Pretty up the attachment drawer a little.

1) Rounded corners on the image.

2) A circle X on top of the image, rather than a remove button.

3) Quick 200ms fade on clear.

Closes #3439
// FREEBIE
---
 res/drawable-hdpi/ic_clear_white_24dp.png     | Bin 0 -> 324 bytes
 res/drawable-mdpi/ic_clear_white_24dp.png     | Bin 0 -> 279 bytes
 res/drawable-xhdpi/ic_clear_white_24dp.png    | Bin 0 -> 402 bytes
 res/drawable-xxhdpi/ic_clear_white_24dp.png   | Bin 0 -> 499 bytes
 res/drawable-xxxhdpi/ic_clear_white_24dp.png  | Bin 0 -> 662 bytes
 .../conversation_attachment_close_circle.xml  |  21 ++++++++
 res/layout/conversation_activity.xml          |  50 +++++++++---------
 .../securesms/mms/AttachmentManager.java      |  34 ++++++++++--
 8 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_clear_white_24dp.png
 create mode 100644 res/drawable-mdpi/ic_clear_white_24dp.png
 create mode 100644 res/drawable-xhdpi/ic_clear_white_24dp.png
 create mode 100644 res/drawable-xxhdpi/ic_clear_white_24dp.png
 create mode 100644 res/drawable-xxxhdpi/ic_clear_white_24dp.png
 create mode 100644 res/drawable/conversation_attachment_close_circle.xml

diff --git a/res/drawable-hdpi/ic_clear_white_24dp.png b/res/drawable-hdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd15563a263e138b1f419e02a807ff8c40f2554
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<5~r;B5V$MLsUJ;j;~cp4r~tG;>IB4!nj``h<U6=AnjLMwGdZcJM5%qEjJ`?~Cf
zeh0?&Y^5z?FWi*0LXNvUN^)#uQ3#S1X2{&T`fK~VdB-n@uV`JV6S7V-m@9aH&UpiN
zp2&t%9xwGZn<u_LVSKJp`Ci(VrZbw8FKYkZ$v=5xl*;l&aqo9KNXzP;5Bc+FQ@rpx
z^FF4jrO83LJ$Ed)RKhoU?KRZsI`%VbgKo&96xp}8OtQ{f^ZkG9|J(h7?5UdzC!PLb
R{uSsC22WQ%mvv4FO#t)0cGCa=

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_clear_white_24dp.png b/res/drawable-mdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e80681aeb7305ab08c1f55df7edd35fc9d0eb171
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kL+
z@9E+gVsZNEWNV?r3OuY&?=Z?L&Ho)<z;WC1{H_hgO4k+_%yv-Sc=|x{j1Ae3)Ap<G
zSrg^i61~|yTzE4hck90Adm5$Y)@|G{XNv6n-@ZNhsjSzS1%5<w95tQCdYIq!k=G9y
z*GDn+?HB(Qd*u`?*^zbe6vuf*Zbf!UMel{3Dc>f{7Mm9$xa9H<ciX>@#qTmGi6+RV
TUAFrSbQ*)FtDnm{r-UW|v%+BV

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_clear_white_24dp.png b/res/drawable-xhdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..76e07f0970ac317b1bddfb265c5b3b57079dc4fc
GIT binary patch
literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_009a~L_t(o!|m5g4uUWgh2e{kxIvTw;NDPC;}$JB4lqhd
zALpV>OkoK9KLVwJ46^RFS-GEp1SB8;6w*sYS86#*?l}h6Uf>SEpn?#4jRC*~x$CHV
z$Q9$p5DkXc*(V;TVMyYWH`wz4OGNX2fFas<{^84qfEYpL!$622^D)3j947f)xWLTv
zIibiiz?@L!Ilv}9`H~sS0aHSi=K-6b^H{iCXR@WwrLTXmZjnL#%Uje;9<9+4+I(rv
zD1y-D=aV){#PY3k-YW<`Z@;xPu`I73{Q3BrLlI2gzuptXH+hP159`UiO>{hv;}-f-
wa1v+DhnFD7naqzw=gvd2^p}}{1pEQ;1dp!cmVSGKY5)KL07*qoM6N<$f)#I~?f?J)

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_clear_white_24dp.png b/res/drawable-xxhdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f54f4f9d1103017ba9e6f5444001dfe815cf70e5
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0000WV@Og>004R>
z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN
zS#tmY3ljhU3ljkVnw%H_00C=BL_t(&-tF2=j)O1^1z@*}a5!2nN*Sp?hZ|O}3l?ps
zfjE9<iYh1D$oWJ_up@SmZMFTU0Rak7fCBVsK!5@iAQ2Jiq?bg^)5svLY9z|N!wBGv
zq!^p;4Q>ENwB@l{4hYi30e}$)7WCj)Ne|9MI&z>BUfZRT^vVH%o&zOZ2+}*J_>9Xz
z?IZ(71G17#934oIaQzefS_p3BXhF3kGe-}qArYJ!kd{Po>OdM2$*Bbi(%Xc$rwM6J
zJ!pyKz_EblNG=>3C{J?XSV6hvapBlO%OoP1vxDYIOm0bm@+69b?NuFLv}7B5sW-Om
zbEh(sdy}C2M}jK{2+;gD%Z22}aUywgCQ@xVK!9`!21)Yf&?J8jNm_$Lk=Ef%q@{9z
z0NHb86KOq;kyHx#LvZq>fdjS9S9-sti_dbvgX5)Vk)zvXN2hCH1xI@hb?CX&9SsHz
p2eOMF2?7+L00k&O0SeInwmXy-hQCk^XBq$i002ovPDHLkV1i=*zf%AJ

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/res/drawable-xxxhdpi/ic_clear_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b2a480a02138f7e1627c47c7810769c07d02987
GIT binary patch
literal 662
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s
zRKe%z;uunK>+Nmdyh8>8ZHbpxdC!t-6PsA@Az*9tuW|{ks)qI5Is(2vHs8$WDV<Ge
z7x`nSq2eXL-ST>#^lJw82zHADRtFfbG4gHTD`+TfU|z#4lOX$m0W5We-Q=O=n$W0Q
z7uuIr=%3ieCeN^Mqu4w1{aY=VZaj|LHa}+~drgvrS>g%y26IV8{rSEYPrErM{n4Mp
z-(4_IUuB8@=dO<i9CtP38Omx7q!ld;auTn+u5Rbh956@Umb;L%rAD*CbHS6-j5<u3
z_Us1~N`5?i@|@9&bK{@mbEeria5m1G&woO7!e?&=OO~oSNe8bRe$V8+K6x_=HF?!p
zDokB4<vha@fh(UZ8!VfW?6?a$7tA`(e1!AzPwi{FY#e%kJk}+GD}Lr2uxXrgo;^nG
z!e>*4!X_uX5V?1HO6%{pS+`z&G2gTLp@3D==llE%%bt1rs9!l7u5jhta^Z@fm-)T;
zCa)Lby!CVS3D2o+7tZl>>|*&_lj_u46Y4a##?>iv-;*-e)&&#g_eX{(Tsaf22-92i
zY5URsj82yB8m)tB^F214S}yqJlPAmR8ZO1!mEx^`EEYazmfF+*$++&iuhN^1PniD+
zMf^-|Qi!h-vl5)~^Epf4zCTt50yloDHyPMJ_qvm?e1g3|Ri@pcL;t;BGO)*dw>VHG
ulVHoYL5@A5pLxx3#%qrmUhk|rpuh24@WsQ^%4LDcg~8L+&t;ucLK6To`3n{R

literal 0
HcmV?d00001

diff --git a/res/drawable/conversation_attachment_close_circle.xml b/res/drawable/conversation_attachment_close_circle.xml
new file mode 100644
index 0000000000..2b799c02db
--- /dev/null
+++ b/res/drawable/conversation_attachment_close_circle.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <size android:height="24dp" android:width="24dp"/>
+            <solid android:color="@color/white"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <size android:height="21dp" android:width="21dp"/>
+            <solid android:color="@color/textsecure_primary_dark"/>
+            <stroke android:color="@android:color/transparent"
+                    android:width="3dp"/>
+        </shape>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/ic_clear_white_24dp"
+                android:gravity="center" />
+    </item>
+</layer-list>
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 27e8c839e1..59d5ff1083 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical">
 
     <RelativeLayout
             android:id="@+id/layout_container"
@@ -28,35 +29,34 @@
             <ScrollView android:layout_width="fill_parent"
                         android:layout_height="0dp"
                         android:layout_weight="1">
-                <LinearLayout
+                <FrameLayout
                         android:id="@+id/attachment_editor"
-                        android:layout_width="fill_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
+                        android:layout_gravity="center_horizontal"
                         android:visibility="gone">
 
-                    <org.thoughtcrime.securesms.components.ThumbnailView
-                            android:id="@+id/attachment_thumbnail"
-                            android:layout_width="0dp"
-                            android:layout_height="150dip"
-                            android:layout_weight="1"
-                            android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
+                    <FrameLayout
+                            android:paddingLeft="10dp"
+                            android:paddingTop="10dp"
+                            android:layout_width="fill_parent"
+                            android:layout_height="fill_parent">
 
-                    <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="wrap_content"
-                            android:layout_height="fill_parent"
-                            android:gravity="center_vertical">
+                        <org.thoughtcrime.securesms.components.ThumbnailView
+                                android:id="@+id/attachment_thumbnail"
+                                android:layout_width="wrap_content"
+                                android:layout_height="150dip"
+                                app:riv_corner_radius="3dp"
+                                android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
+                    </FrameLayout>
 
-                        <Button
-                                android:id="@+id/remove_image_button"
-                                style="?android:attr/buttonStyleSmall"
-                                android:layout_width="100dip"
-                                android:layout_height="50dip"
-                                android:text="@string/conversation_activity__remove" />
+                    <ImageView android:id="@+id/remove_image_button"
+                               android:layout_width="wrap_content"
+                               android:layout_height="wrap_content"
+                               android:src="@drawable/conversation_attachment_close_circle"
+                               android:layout_gravity="top|left"/>
 
-                    </LinearLayout>
-               </LinearLayout>
+               </FrameLayout>
             </ScrollView>
 
             <View android:layout_width="match_parent"
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 2c48461def..f1dc5871a2 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -26,7 +26,12 @@ import android.provider.ContactsContract;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.ScaleAnimation;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.R;
@@ -42,7 +47,7 @@ public class AttachmentManager {
   private final Context            context;
   private final View               attachmentView;
   private final ThumbnailView      thumbnail;
-  private final Button             removeButton;
+  private final ImageView          removeButton;
   private final SlideDeck          slideDeck;
   private final AttachmentListener attachmentListener;
 
@@ -51,7 +56,7 @@ public class AttachmentManager {
   public AttachmentManager(Activity view, AttachmentListener listener) {
     this.attachmentView     = view.findViewById(R.id.attachment_editor);
     this.thumbnail          = (ThumbnailView)view.findViewById(R.id.attachment_thumbnail);
-    this.removeButton       = (Button)view.findViewById(R.id.remove_image_button);
+    this.removeButton       = (ImageView)view.findViewById(R.id.remove_image_button);
     this.slideDeck          = new SlideDeck();
     this.context            = view;
     this.attachmentListener = listener;
@@ -60,9 +65,28 @@ public class AttachmentManager {
   }
 
   public void clear() {
-    slideDeck.clear();
-    attachmentView.setVisibility(View.GONE);
-    attachmentListener.onAttachmentChanged();
+    AlphaAnimation animation = new AlphaAnimation(1.0f, 0.0f);
+    animation.setDuration(200);
+    animation.setAnimationListener(new Animation.AnimationListener() {
+      @Override
+      public void onAnimationStart(Animation animation) {
+
+      }
+
+      @Override
+      public void onAnimationEnd(Animation animation) {
+        slideDeck.clear();
+        attachmentView.setVisibility(View.GONE);
+        attachmentListener.onAttachmentChanged();
+      }
+
+      @Override
+      public void onAnimationRepeat(Animation animation) {
+
+      }
+    });
+
+    attachmentView.startAnimation(animation);
   }
 
   public void cleanup() {