From 83e1d0d0a5acd87fe76658fb62f9f4269ece6240 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 5 Jan 2020 13:30:26 +0100 Subject: [PATCH] make checkmark icon more material --- .../ui/adapter/MessageAdapter.java | 2 + .../res/drawable-hdpi/ic_done_black_18dp.png | Bin 0 -> 149 bytes .../res/drawable-hdpi/ic_done_white_18dp.png | Bin 0 -> 157 bytes .../drawable-hdpi/ic_received_indicator.png | Bin 560 -> 0 bytes .../res/drawable-mdpi/ic_done_black_18dp.png | Bin 0 -> 138 bytes .../res/drawable-mdpi/ic_done_black_24dp.png | Bin 130 -> 0 bytes .../res/drawable-mdpi/ic_done_white_18dp.png | Bin 0 -> 144 bytes .../drawable-mdpi/ic_received_indicator.png | Bin 402 -> 0 bytes .../ic_done_black_18dp.png} | Bin .../res/drawable-xhdpi/ic_done_black_24dp.png | Bin 188 -> 0 bytes .../res/drawable-xhdpi/ic_done_white_18dp.png | Bin 0 -> 188 bytes .../drawable-xhdpi/ic_received_indicator.png | Bin 717 -> 0 bytes .../drawable-xxhdpi/ic_done_black_18dp.png | Bin 0 -> 199 bytes .../drawable-xxhdpi/ic_done_white_18dp.png | Bin 0 -> 217 bytes .../drawable-xxhdpi/ic_received_indicator.png | Bin 1016 -> 0 bytes .../ic_done_black_18dp.png} | Bin .../drawable-xxxhdpi/ic_done_black_24dp.png | Bin 277 -> 0 bytes .../drawable-xxxhdpi/ic_done_white_18dp.png | Bin 0 -> 255 bytes .../ic_received_indicator.png | Bin 1303 -> 0 bytes src/main/res/layout/message_sent.xml | 48 +++++++++--------- src/main/res/values/themes.xml | 2 - 21 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_done_black_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_done_white_18dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_received_indicator.png create mode 100644 src/main/res/drawable-mdpi/ic_done_black_18dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_done_black_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_done_white_18dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_received_indicator.png rename src/main/res/{drawable-hdpi/ic_done_black_24dp.png => drawable-xhdpi/ic_done_black_18dp.png} (100%) delete mode 100644 src/main/res/drawable-xhdpi/ic_done_black_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_done_white_18dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_received_indicator.png create mode 100644 src/main/res/drawable-xxhdpi/ic_done_black_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_done_white_18dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_received_indicator.png rename src/main/res/{drawable-xxhdpi/ic_done_black_24dp.png => drawable-xxxhdpi/ic_done_black_18dp.png} (100%) delete mode 100644 src/main/res/drawable-xxxhdpi/ic_done_black_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_received_indicator.png diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index e3afab37a..6867bbeb5 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -208,6 +208,8 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie break; case Message.STATUS_SEND_RECEIVED: case Message.STATUS_SEND_DISPLAYED: + viewHolder.indicatorReceived.setImageResource(darkBackground ? R.drawable.ic_done_white_18dp : R.drawable.ic_done_black_18dp); + viewHolder.indicatorReceived.setAlpha(darkBackground ? 0.7f : 0.57f); viewHolder.indicatorReceived.setVisibility(View.VISIBLE); break; case Message.STATUS_SEND_FAILED: diff --git a/src/main/res/drawable-hdpi/ic_done_black_18dp.png b/src/main/res/drawable-hdpi/ic_done_black_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8d867ac01c83890e875a454a4d2d0a2a8b4e4dff GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(DF`h1tAr*|t5)1}hXC&{Oy!fT@ zA$v3T%US=7Z4v?`JZDKrzVWzz!AAo-}1>Xmj9PI zA?3-zvEvwzkTd_fkKCP(d{;fPY#dD|t>Ro2*p}kEn1SJi`^>-3wicKH?PKtC^>bP0 Hl+XkK93ntJ literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png deleted file mode 100644 index 6d842d6cbdebd202be9f2552d5b95080c43b7e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmV-00?+-4P)5nZU6uP8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10j)_yK~y-6t0oelbt&O`5up`ILG4i5hUD%!_2 z8GF*n0vHV|ig@a-Um}`5M*u>NI*Imp8kOlPs`Fn`#o5}r*$862vxZRS095$s92GOy zd+uD#+O%3k*zkvbGsEU9vUq_Z{;&YF1Bhy>FjhGJSDOG>OV$Gb=Z#aUEhch_VbD*2 zh_Yd)oYC9n8P=NhOd|Z0h<-pXKWP7Qe^k+&KkPTIapPUCuI4fTG=n_t$;Btm3#Fz~ zMxevL_L4niAJv1TbG@@UTru;&AW#<3m!jsrhx@rYfWKw4(sej~_`NO!5MPP68K&$3 zU4H%-5Cu?p?@T&l^^odnKyj-0Lp)LM|Wx`?Xy_yca;ZrhXFp8p{WQ y0PKl_9aYAGV*nA}?q+u@jX<|XY%vxI(tidu=Y#WO(tU>j0000 zDQABF|6k8&r`nUC%KKyL8CCz2^%wtF|9^dG>Y0OCr|N(H=l{3=-}-iU&WM>z5i<|| tzgcmYDePN!L-E2>QXK6Y4=m`&Vvv&c&N-+tM+RsGgQu&X%Q~loCIB9gP2NC8#zd%8G= zXiV(wGxTB(6mdQO+iy{8(_Rk6pOP<(!7^qgP08kUg$*K(ylpAJZ|OjavkAj_4&M z3l=aQv`E&DU}G`;S1G2%V%&M})4pQ4@E`74y{G;dd=D!=)cuotn{V{r6Z`E~oS1rW z%}J9R`M+IDU)nYt3X?e&n=ce&p?~IOdKIV65;yb73NM*_M2ei(HwJ_%dNe)xw*35@ z5IgOBZPaW|7%)WpAOi6WhuUnCsV&ROR&RMff zGpM?<`un`&Eb3JpJaY`q>r%dl++>fNdpYb{4C9B{M|n+`F`r@5a4D2%k8EOmaee-~ s5YBy(6G9g0ROoC=y`Gy=zRWP*=T^+M2L^`y!0==6boFyt=akR{0JWf-AOHXW diff --git a/src/main/res/drawable-hdpi/ic_done_black_24dp.png b/src/main/res/drawable-xhdpi/ic_done_black_18dp.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_done_black_24dp.png rename to src/main/res/drawable-xhdpi/ic_done_black_18dp.png diff --git a/src/main/res/drawable-xhdpi/ic_done_black_24dp.png b/src/main/res/drawable-xhdpi/ic_done_black_24dp.png deleted file mode 100644 index 64a4944f7531ab9fb745fd34dd00c778cff1573f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DW=|K#kP61P7xwZt8HzYxyd7xd z_anOJT=vF;=6o%TO%qmB2=N*^J(z8E{F3t0DRy@o7f;`BG-3LF`^uk20(J8L%76ab z`e&B#*^~M_=S=wbCso$$y|k0wldT1B8K8v!{z=h{y4_R}8rt40u`}^1XVn zvWkOUU-^j{pVq65HqD1Oi)r3+T*LWdLcQO)Q$gY0SWi# mI0*h{o5b;0Guz~Cq_l|d_dwzLnQwv4VeoYIb6Mw<&;$SqxI>Tt literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png deleted file mode 100644 index 799593b24d7b69acfe4ccba5082fff6c4b460445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6!HP)u9DstG>7I zndkjI-}k*U1AAPuo3KzUbV@|ec@ROEH^qxty8*VJ*yU940JKBF5CFyVFo(^Z!oz*x zGB1~VE6~i^jZ7t7cZf9k)Gub4b$+a6>?eS+6MksU?()M01}n-B z)UU$xT4`nX*w;jPQ4mBvr{~iRshg>^-&az=iSA=3bA~YjROF@6<&{j`^!4dq8@+*t zT=lYQzo_*QIFgqZ48yFSY@bYR<_|oBeOc=vXe7T>QEf@ICKCVi2fCu;@tQLp@@cJ4 zpSw=7W2>H`PY`(>Ip`s=Rk*@;!?12`*H?7F;_~8spr#-w?TOaJ!ghTU?TlJ8hkx8f z<+Nw$qhwohaHGkN+fjib--h~KXW~LJ8#7XeQ%xXu5E=}XZoAh$^%^%^d)Fx+*9%hk9xr160SWD?xAj z{HmUG6$^*_8}WAzseYi*_h<;z1fo9egX_3W1SkVwxN|tWVr4G_qrT0aT@MEpeH8>= z2mqM6IyEaEjlLr=-=9l_Q4geVM7@zUbi@@)HoFW4o|CE6P0FqAfs|r_u+&aGI z-UNli7XPB!cx@f(ISQ4Cj<{{fdk9)e$ez|8Y>UWZ@171&00000NkvXXu0mjfZL~x= diff --git a/src/main/res/drawable-xxhdpi/ic_done_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_done_black_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1c4739e006b28c05b7a19e80f293b7b5f8c73ee1 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+K2I0NkP61Pmp1Yq43u#FC@dy0 z^<4d?cHW)@Vb;$Qj`x&4dAcZX-xvRQ9&6p%g=?n-c}0J#z0!R0lB?*`$1T5#X6vom zk)RW@B4A-yjAZPU-bY721ZTe!`TCGAj;qYa%i^}!Y5ww(AdTls0?v7AmKT9oQ>uSy vJhYio5a(r~uR3SC&^a&8@@Mg0noG@(_deH~=DVI9=rRURS3j3^P6M7L)iaL`^Fl;m&EuUVkIj`gf`xk%7{i-Vh{ zTU?Ayz2oVjTlgq{Vj;ic*MpfWnU*gSvrwH{nDwf)dx6?J85hgvcm7K=E`2Acm~6A^ QAJDA~p00i_>zopr0MfryGynhq literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png deleted file mode 100644 index 7ee61364e136e5f1e291422cf0f1c556faf92636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1016 zcmVbYrTKxsm?pDFJ6B^ zgr|WAfXzTz;6mBj=hqbEj5<%KR8E218x+?Fk3`lClWRYqV!x?@`32-zFXNqGlM`}A z+n-aBPYLW<{Z`7+gKn=o3lM8H#^lU?g-?L0+fZT9%M|;NzZ)7_+|(WU_D8MCIUrtb z;i#MS`u#aA1MND#YkMVDz5v|q3t1JiUbic5JiwnOk9j=E7 z6_grGC8fd{V7)Ii7cIx0nK?4E&`6!oK#7fscYynS(<-8wLT{neXq`}c$ec6}i)Di9 zmw0F@>%Fp)T1}sj88&gLkPpE8n2fJ~bEWl~21!DXBJB1}TSN{{9+;e8alK|RPTqM? z)qaofbQF$xS?}f5)V$?{wtcwmu8xx(TN+6;!zQlQe&ojhKU-_xSPkYT$mGo)Cugq4 z*R{=ATPZqY&W^g73Em30Dg@r1?wS5|^&mw=bwuHw8(V3`o zrbbqa0f;!G&gOu>xF>h!cJ|atQjHD~@Eug;_3{4ka#Nt?w&g#7LRCa`z>J!-f7;~C zJ{2CTE+vy**892{3_zrGsI+KB_W*Og*ai{KI>()@HzrbpsicSw1Qk+rppkD?T@XOA zyXe`7?gRex#dm1TPMDl|2q3vJ*@w#ZfI3$;*-dAf#enY}a&ql2DH7C_D)56s8c0+Z z(LOg@d@l^pE$@(yURnRXQFQMOE?zw!mWgz;o z3%@Vz2hKOd5jh5ZMbX1+UN#!o<`C0k~Or!m2(Fa*luADFr?4-dQ{wHfTlvLtP_X>*nqJ m*2To)wbG%|wXiX_<@gIJEh>*Xb<}JC0000b^wD=lt6oW;%QS1o1=daUAyI8~(&3 zd|u96v#;i-{{JTZcp&}h>FMeJ8GvN{`tw#N{;ZEGUD<;p)-Lh7=#>`kZ6pLOOe=>Nw L`njxgN@xNAv*3Ko diff --git a/src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_done_white_18dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebb55559b55f99df3270796763745a71f113078 GIT binary patch literal 255 zcmV=}0*5fKp)HP1G&I6Iqc zjKz5rgEVtukiIy2Qo_-K;J|?c2M!!K@i?}(lWik$uJ;4aeo|e|;mI*SsV?U@bDX5g zSJ{Te;g>S0!OODIPipkgGo)TTcRZxVWAGnIFqKOr(UM3=(~BhBSvit;g=R?Vjh>M7 zAB+M?!6}eboF615Cqq(m7NiKA4^kA)n-qydL_|cirW>R3em?os7vTT^002ovPDHLk FV1hF8Y9jyu literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png deleted file mode 100644 index 0fb694c9f6528f2503d69280480e1d7a710bf5e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1303 zcmV+y1?c*TP)sj^QMXak-PvtSB+|x*Run=I zL?QT4st;OA&1RPbMX_S>$xTsFAzmBIX44B+N)?~HV3dN?TL~J)%R@6e6GOUD(1MMo zx$W-xeQ0XiBxiQ^Ua;TWp8q@F|NS#_=KN;=;f*k9mzndX~Z)6Fd z0R(Mmr%B3t6A|m^YQf4a;wVI_df^=aEou_~PC~oK=rVs)F+>ThIYMxq{yYQsDG9_A zTDt0Xqtj5D2P(7%^dWs4G2XSwe@Y1LjadvxWAo%9yNpetg!V>F>)2XfcjVJYb9t9$~PR3&Hc0R zY_akcy@1*)YkC3rRdFfMoqRGmSFC*JuhM(a0@HzZCcXs{)zI*T*=ZinMQo{28-Z$r zBz%wvnd%lg54Zrp7xS&vrp4y~ZzRUqvLt?OIMC4KbfL9H+gwv38HajzPYKeVE{^T< z5C9-F@i>5u%VO)RQd+N5p{e?lPXO4YiZdhTq`%J<0sx5l&Q+sCyYzkfmTV$=T(1X{ z-NHOASUA2IxnOA#Q=KBNLE@k{=5=Qg=>wqB0GRrWh;b@UkG42_2fznZ1OkF};AWc% z!-UN4OszISb1(p0tK>2c8DaC`;@Mr*&&AMVx_@aiy1Gzt3BJwhvPKKlvBQd1!i<;} zGqwU)EKvJIsm%k5UdRla$B20c0M1{U4(C7DIh4(u5w?ynA)2pnCX+dm@7!FF^-v!e z^bde2lB4QKB4lpP+f@$8+D?1;s>c9c_0zT*{C>WMaz)kxMkAvsuBEL2{p47bTpt!@ z%Q+k!Xv~MqzcVt^0pK?W^j}KRb*kX_L^d87pJa&+05i5kqP>Nh$^|(cDb0xay=1e-V5+M&6$m{c(S*2HGqEFMvfN`Yw@7d~)GGh?ntyz`xC5ceve=M-u=5 N002ovPDHLkV1gp!WugE8 diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 29ac6fc65..ef6030cbc 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -1,49 +1,48 @@ - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingTop="3dp" + android:paddingRight="8dp" + android:paddingBottom="3dp"> + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:orientation="vertical"> + + + android:layout_height="3dp" /> - + android:longClickable="true" + android:minHeight="53dp"> - + + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> @@ -85,7 +85,6 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" - android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" android:src="@drawable/ic_mode_edit_black_18dp" /> @@ -95,10 +94,9 @@ android:layout_width="?attr/TextSizeCaption" android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" - android:layout_marginLeft="4sp" android:alpha="0.54" android:gravity="center_vertical" - android:src="@drawable/ic_received_indicator" /> + android:src="@drawable/ic_done_black_18dp" /> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 6ebf7505c..219fb6702 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -87,7 +87,6 @@ @drawable/ic_edit_white_24dp @drawable/ic_edit_black_24dp @drawable/ic_save_black_24dp - @drawable/ic_done_black_24dp @drawable/ic_group_white_24dp @drawable/ic_add_white_24dp @drawable/ic_reply_white_24dp @@ -202,7 +201,6 @@ @drawable/ic_edit_white_24dp @drawable/ic_edit_white_24dp @drawable/ic_save_white_24dp - @drawable/ic_done_black_24dp @drawable/ic_group_white_24dp @drawable/ic_add_white_24dp @drawable/ic_reply_white_24dp