From 2d65464c043b1b9f1f141e99b1c68db4a0b87d34 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Wed, 16 Sep 2015 13:41:10 -0700
Subject: [PATCH] fix attachment remove button alignment

fixes #3597
Closes #4077
// FREEBIE
---
 res/drawable-hdpi/ic_clear_white_24dp.png       | Bin 324 -> 292 bytes
 res/drawable-mdpi/ic_clear_white_24dp.png       | Bin 279 -> 195 bytes
 res/drawable-xhdpi/ic_clear_white_24dp.png      | Bin 402 -> 354 bytes
 res/drawable-xxhdpi/ic_clear_white_24dp.png     | Bin 499 -> 586 bytes
 res/drawable-xxxhdpi/ic_clear_white_24dp.png    | Bin 662 -> 588 bytes
 .../conversation_attachment_close_circle.xml    |   6 ------
 res/layout/thumbnail_view.xml                   |   3 +--
 res/layout/thumbnail_view_remove_button.xml     |   4 ++--
 res/values/dimens.xml                           |   1 +
 .../securesms/components/ThumbnailView.java     |  12 +++++++++---
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/res/drawable-hdpi/ic_clear_white_24dp.png b/res/drawable-hdpi/ic_clear_white_24dp.png
index 0fd15563a263e138b1f419e02a807ff8c40f2554..a33d87a911c0fbb21dd0506c0647f168b6c71b35 100644
GIT binary patch
delta 265
zcmV+k0rvjH0;B?vB!BBkL_t(|0qv9pa>OtU0PFgHWpoD*9(M4=a_wwADrp*!ibGa%
zxx}!eHSM%$@hJ!df1L@lOHBkD=Jh}JYHA5f)&y4`Y=I{(>)WoXk}ncZz*<_Gpd}AL
z7F5*PkjPML7Y<25C5lFAjFg%ft&raZqm*2cm9i0ijY91xn13Re3#I!-)DwpsE2$pF
zC)f#~038>8seV?6+)yaouy17J1|8ZUTP=%PGS!U1KH!in!1Vn&%UnoFqI?<ETYgc4
z-GT(Q`~=fmqRG3{mOL7pc4?xV$H>OcNnore4z>kr!v7w%Uq1X>w0H*K6-!YK?)hZ^
P0000<MNUMnLIPldjDB_C

delta 297
zcmV+^0oMMc0>lE4B!3`dNK#Dz0D2|>0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqa
zx=}m;0007FOGiWi|A&vvzW@LL32;bRa{vGf6951U69E94oEQKA0K7>=K~zY`?bS&Z
zf-nq#;g);Z!#G^33`gznLU>l%BvpAV6xfolLk1jfo7WxCkAFY`uLgC57U)JIDpbcr
z;$lI81Rzo!698$wtM!MTp2yQysD-I4RIVvg3RAyq&oBoJS%At&=`SgRk?Y7a&VeJ|
zX0(FLDU;DF`?(L3v05ajqF(R2KpPz`&s6;UvR@OfH;w|8bz@R(jNCX1Bv-LYy)h_?
v#`$WnEmY!U9U|@8G-}T~4*%m%`$y0n%Gsfk%lJ3-00000NkvXXu0mjf6?%3n

diff --git a/res/drawable-mdpi/ic_clear_white_24dp.png b/res/drawable-mdpi/ic_clear_white_24dp.png
index e80681aeb7305ab08c1f55df7edd35fc9d0eb171..00b0f17dfc3db2f74263c0b95387c2db27bb69a8 100644
GIT binary patch
delta 167
zcmV;Y09gN*0>c52B!7xYL_t(|0o~Ho0Ru4z2H++c_Bz(NO!?K_U3iJ|3o!b(5QNir
zkH!qgShI^KYGkw5;|U#FaebE-H|vD`6ls+*Pmjw}I^#mrqMPrBUB1&PJqjf{@w(!c
zpt!Q2>xA;Egteps{WT7{wdwwX>D{sltBS45dPU>be5X2{sUU^j+x2LC|9F2<OaMdl
VqC+3+G=~5H002ovPDHLkV1m@iQsMvr

delta 251
zcmX@iIGt&NO1(m|N02WALzNl>LqiJ#!!HIP{epp^)PRBERRRNp)eHs(@q#(K0&Rd2
zOiAAEE)4(M`_JqL@;D1TB8wRqxP?KOkzv*x37}xVr;B5V#p$P$t%VLN@UT9;!zimX
z|95x+$8F2=yEYgrU0Yl*+d*~X=>y3#He^3e+h3x(XHAr6OY~;<aN*62+^zeb?`f2p
zTeoq;oGG&NfBW|2r?OsS7Wfg#any7k>tTM^M_xZ<Tpz{Mw_p5M?3GinWJlJ;Qyk|N
zxfR(Z6}=aBrhJ<)TWns4;F8Nb+-?6p7Qf4&B$^<bcG>PT&}|H!u6{1-oD!M<Cdyu|

diff --git a/res/drawable-xhdpi/ic_clear_white_24dp.png b/res/drawable-xhdpi/ic_clear_white_24dp.png
index 76e07f0970ac317b1bddfb265c5b3b57079dc4fc..c0d62194e05bbf3c0d13bc031941807c36e7efd0 100644
GIT binary patch
delta 328
zcmV-O0k{5=1L6XZBYy!YNkl<ZcmeH}g+atX5JjN`+@%MsZ=4cNV+}wPI6UlQb3}(j
z_n%)T^Ri>vk)WWUzb!_eULLFB6ZPq^Di)jUFmF$`?pa`mjVA85H~}K&K1Rs>JTY+G
z0KpM(2J{WWxR=#IeZUHR;2ek*s6qFsEPAXo3DP_XZ~??xg@1MbdbGaGH7ZahIOi7L
z1QERtlqx411UE&PKs~xwaBPkF0~ImBWKL$Bh)7Pm^z_XaoSao$0dVEG`U1ohU2eJJ
zid))D`rQ`+x=i^2#UV<W|J)43N^OU(zC{j1K|hZ(sUCK&!n#*mnHiP15GFV(Oxt>m
z5&1Jmh{zYHf<c)hgb7q_u}WkIazXM}hIPw~WOY~{urbV=z7UnSE$iRE@$zpSgMxzo
avhD!0F(vu7D-cxx0000<MNUMnLSTZi^^&sy

delta 376
zcmV-;0f+wL0+IueBYyxOV@Og>004R>004l5008;`004mK004C`008P>0026e000+o
zoVrmw00002VoOIv0RM-N%)bBt010qNS#tmY3ljhU3ljkVnw%H_009a~L_t(o!|m5g
z4uUWgh2e{kxIvTw;NDPC;}$JB4lqhdALpV>OkoK9KLVwJ41cojwpqEKfCMBU02I<o
zMOSJ$O71xZ*IwWbz@UN<dyN6W1-a{}d&m{z#t;pL*V!i?s9{LrlQ-D&082#ket;p`
zcmCnahkzJC<-<UTAoDT6M;s>kUAVx^@;RZ%Gr*is<vGA6KKYUv%K=kDmFEGQpz~O`
zTxYVS&!w+_uyJmYLH)~H)Jz_&(Gl8wY0W5t(B|ipHcG_ut#jTh2tIGWwKTCTuOR&S
z_?klzOy0lV6T~-pif|9>$-GT;JdooS`ciNbXU&I~Ajg@^k3{FrL$dUjnSccR0q_Km
WuH%+|dxL5K0000<MNUMnLSTYO+oAga

diff --git a/res/drawable-xxhdpi/ic_clear_white_24dp.png b/res/drawable-xxhdpi/ic_clear_white_24dp.png
index f54f4f9d1103017ba9e6f5444001dfe815cf70e5..85424b8f63abbe05f0ab68d6a31f13456262575d 100644
GIT binary patch
delta 562
zcmV-20?qyN1Ih%DBYy%BNkl<ZcmeI01$HAb5JcCxMfeh7=G=4{F0go%c))am80Ig{
zYeR*U*IHDWK{KVQR=cbxe<czU5)u*;5)u+<)Q@w)Bj@Z0zF>hDoCi=cI$ZLc1!r|w
z;tP<m8$5cS9Qee7qe`su85jU94j!VCsdGf99{G_aKaJi2eSazjK$AV4>n(H+$$<eC
zec-hpp>wW)0Y>S8W@Qtjt~m9qp@aJ1FakR4t8t=E4;X<>!V7kS*2D>Nr8HAJrA<I9
z&j;*Lm<6)pWM$p*O<$D`Xidz!RFzaqN?ioLl<Z_isWD?#dy4d)nB{I<cDo%MQckVM
z?FbZ9rJD-&$A2fsbS4Wwnps*UbY)4`ZP19e)vUP2HK(lEV4HlZ4erRGxGG7j>;glm
z>FkD><=-ktV9&H2M25D?Ar&J=R1AU4->eXowkfGhp^Aca2X!0?m27(w3QvP-Ss}mc
zaUp3?i@L?3vq~Xp&`5M9mVM?OH^S54I-6vYD&s@apntVNX_eim#z`8KRCH4kifx>v
zK?xX=Dx(^QYEW3fkW?8pP2Z9R3kevKDx*@8G`RD?RO#O;!_uIpO6OKdL)u`+%z9|5
z%s6mNNL<nkPlN2uj5_~4n+=jGZL{HxAE9MFK5{$e(3-#pmON`{k<aokEF@KaWWhOQ
zv&eJK9xJt_cfm6j{{BtRgoK2IgoK2Igg*mc0YSntBgs&;fB*mh07*qoM6N<$g2UVX
ADF6Tf

delta 474
zcmV<00VV#*1oH!sBYyxOV@Og>004R>004l5008;`004mK004C`008P>0026e000+o
zoVrmw00002VoOIv0RM-N%)bBt010qNS#tmY3ljhU3ljkVnw%H_00C=BL_t(&-tF2=
zj)O1^1z@*}a5!2nN*Sp?hZ|O}3l?psfjE9<iYh1D$oWJ_uzw?VkZra7rvU*9P=EsT
zX+VGi6d(~1>7<uL&C|#rt!gC7y~7CLjHDQw?+tDMMzrOzS`G-(!~uX22Nv|;SV<4g
zL^^Vy6JFb;lJv>}fSv;-TnN%Tr}&J^LG2_1M+35wOdK6ZkZ}DI{8|WZ<Y+;)Br``3
zsv!}a8jzMmaewMS8WPE=1qssIgtw;&X-++8iR8esfaXXp92+Q4a^YA(x#e-;*g?xA
zBAK&;=1EL$NrCbtii7P{9bdF$8+)lYw(WDLGLw6gp!`RID+dVB{5Q*m<i~L$d2%LF
zZ8<=IbO{DY^5)Pae-24ngF}(l;Y_5Za)1EYb7d20JyVX6R0{b+aPp*q1GUaqdcUQM
z&vL+n<E3YjquXUir)yyaM|%!+=(*G#4F(MdvWp)H0u-PC1t>rP3ef+yJCqiNzfcWl
Q8UO$Q07*qoM6N<$f~`5c_W%F@

diff --git a/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/res/drawable-xxxhdpi/ic_clear_white_24dp.png
index 7b2a480a02138f7e1627c47c7810769c07d02987..583f52c74c0f657f5cb6be828b1fafa60c9f112a 100644
GIT binary patch
delta 564
zcmV-40?YlD1<VAHBYy%DNkl<ZcmeI&hi;@W5P;!POMk>YI@xzh&ns>(kpFt&MnZAC
z_~xYf)Rk^qe_%k~&pGFubIv*EoO8}OE_tGs6QSjSOG$?to`H^BPJoIYc;s5r;EHFy
z+fhm+8uombW*4~RmESg0k%wo)Z;zbI)OcZNMG>+3Yla?VYJar!3~k6ic=k68byPAv
zO7(+};k!UhrxqfUG^klIbRZA>4oCD+OovA8LO_vd*#qbpBt-quUxHh<=s!L^s<C4b
zP@V&s{2Nqsx=4ZLIgWgVwIb1=6Z}acBrOt++OK8A>ZdLew;UK+M}#wVk(jIUY$H}b
zb&+UQdG-<INq=1=YPJFYw~ZAkr&i@zN0cXdk$T=#c`~s}7s+0E0*a(;4X?f~lCoE4
z-zrLa{?;)Q`JexQo>C%MI6_A%F-*^Sv^}*Lrsq7`hDH*KpYwF|46V}bLj0WPz>HE~
zBT<Sydd|a|nZ8C!IKYaW^DN2qHIm69={b+S=AmI@wtq-^&cl}MU3YDb&GPKY-hJ0r
zTP#mL^4YeEL=$?qWvWPe&cljK#uzBl_?)MdadwKtTu+#X;nWNji8g$~Y^X@oY{Mta
zW{Sj|x3~%ONRfJ4nHtY(>+|?IQp(4y7d)Nn*_JBO1LtX;)j!5R+tNkio=ZuCYo39Q
z?1V3SJS}i7+N8Ts$%)W}z3AbbbIv*EoO8}O=iFzTs-Vq)R!S%U0000<MNUMnLSTXq
C))^-N

delta 638
zcmV-^0)hR^1eOJmBYyxOV@Og>004R>004l5008;`004mK004C`008P>0026e000+o
zoVrmw00002VoOIv0RM-N%)bBt010qNS#tmY3ljhU3ljkVnw%H_00It4L_t(|+U?s-
zZo)7ShGEmHOPU^r7Ljo9P_<k7cNi*qfUk=z5KT-x_BWm)&3|Nv6#PCYBuWqqgzKIg
z>i`E>2ROhwzya0)4zLbzfOUWatOFci9pC`#00&qH)CV--IjmJ$+R%rkcrVDd1|I;v
zu@>$(zqL35*yCQdpKOr_d}0_jVaNx7HyI%>pG`RBiwTnaFPsmHaGozDq%ZS|@h}M8
zC?5cJe86UMp?^|B7kSqwK0t#|oG(2KaS4QcDS%0!<jVmp0x3TSz#w$^;pFE5N(r(2
z$DEctKna1GpAX0-kn>9bIRtus89++dPUas<@=E~{f=YflAeEq$&j6$l)bcriIf7z7
z3vh{`n$H8o3Dfy2*19}EjG&s&1*8$E`E0;Eft=3=Tz@9e^ECi*f<iu29_}t8uiu6{
zh1KYvNqgZCI%4zR521GEOH3!!%~v4Q&ZiT2`O^<d4wJ7E3EKIq$Vrt((9RDCx&-}v
zWkQX7RYIM7MM7!5<aR}cpphTHSyUj@%vT}Q%~v4Q&ZiS{^0&p0Xo&=id@8{vpGdIE
zrxEP(Np}Rxd<r3bsTYO(IHBhQ8oZD4Gk(`iBJ8o`1O5_N`D210UwRfg5t#Ys1W~^H
zIxrB}`6q%fKj%u^V5g8j5PE4o!ovSc=>P{@_c*|M9AG^TupS3kj{~g70oLOH>$!Ts
YFR{*3(ZiN^9RL6T07*qoM6N<$g8x(rvj6}9

diff --git a/res/drawable/conversation_attachment_close_circle.xml b/res/drawable/conversation_attachment_close_circle.xml
index 6231cb8fb3..86741f86e3 100644
--- a/res/drawable/conversation_attachment_close_circle.xml
+++ b/res/drawable/conversation_attachment_close_circle.xml
@@ -1,11 +1,5 @@
 <?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"/>
diff --git a/res/layout/thumbnail_view.xml b/res/layout/thumbnail_view.xml
index 58b8325d10..e11b923267 100644
--- a/res/layout/thumbnail_view.xml
+++ b/res/layout/thumbnail_view.xml
@@ -6,8 +6,7 @@
                android:layout_height="match_parent"
                android:adjustViewBounds="true"
                android:scaleType="fitCenter"
-               android:contentDescription="@string/conversation_item__mms_image_description"
-               android:layout_margin="@dimen/media_bubble_border_width" />
+               android:contentDescription="@string/conversation_item__mms_image_description" />
 
     <ViewStub android:id="@+id/transfer_controls_stub"
               android:layout_width="70dp"
diff --git a/res/layout/thumbnail_view_remove_button.xml b/res/layout/thumbnail_view_remove_button.xml
index 2ef239b575..9c40b31397 100644
--- a/res/layout/thumbnail_view_remove_button.xml
+++ b/res/layout/thumbnail_view_remove_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
            android:id="@+id/remove_image_button"
-           android:layout_width="wrap_content"
-           android:layout_height="wrap_content"
+           android:layout_width="@dimen/media_bubble_remove_button_size"
+           android:layout_height="@dimen/media_bubble_remove_button_size"
            android:src="@drawable/conversation_attachment_close_circle" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6fb7404c4e..a4666889bf 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,6 +24,7 @@
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="media_bubble_height">210dp</dimen>
     <dimen name="media_bubble_border_width">3dp</dimen>
+    <dimen name="media_bubble_remove_button_size">24dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
     <dimen name="message_details_table_row_pad">10dp</dimen>
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 6d647f02fa..33d5f41d30 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -155,6 +155,8 @@ public class ThumbnailView extends FrameLayout {
 
   public void setRemoveClickListener(OnClickListener listener) {
     getRemoveButton().setOnClickListener(listener);
+    final int pad = getResources().getDimensionPixelSize(R.dimen.media_bubble_remove_button_size);
+    image.setPadding(pad, pad, pad, 0);
   }
 
   public void setDownloadClickListener(ThumbnailClickListener listener) {
@@ -324,11 +326,15 @@ public class ThumbnailView extends FrameLayout {
         Log.w(TAG, "onResourceReady() for a Bitmap. Saving.");
         part.setThumbnail(((GlideBitmapDrawable)resource).getBitmap());
       }
-      if (resource.getIntrinsicWidth() < resource.getIntrinsicHeight()) {
-        getRemoveButton().setPadding(0, 0, (getWidth() - resource.getIntrinsicWidth()) / 2, 0);
+      LayoutParams layoutParams = (LayoutParams) getRemoveButton().getLayoutParams();
+      if (resource.getIntrinsicWidth() < getWidth()) {
+        layoutParams.topMargin   = 0;
+        layoutParams.rightMargin = Math.max(0, (getWidth() - image.getPaddingRight() - resource.getIntrinsicWidth()) / 2);
       } else {
-        getRemoveButton().setPadding(0, (getHeight() - resource.getIntrinsicHeight()) / 2, 0, 0);
+        layoutParams.topMargin   = Math.max(0, (getHeight() - image.getPaddingTop() - resource.getIntrinsicHeight()) / 2);
+        layoutParams.rightMargin = 0;
       }
+      getRemoveButton().setLayoutParams(layoutParams);
       return false;
     }
   }