From 6991da2815e6334336222443e81f0cb9fc093d6b Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 2 Jan 2015 02:57:15 +0000 Subject: [PATCH] New delivered icon, tweaked email listitem layout --- .../i2p/bote/android/EmailListAdapter.java | 12 ++-- .../ic_beenhere_grey600_24dp.png | Bin 0 -> 439 bytes .../ic_beenhere_grey600_24dp.png | Bin 0 -> 325 bytes .../ic_beenhere_grey600_24dp.png | Bin 0 -> 511 bytes .../ic_beenhere_grey600_24dp.png | Bin 0 -> 691 bytes app/src/main/res/layout/listitem_email.xml | 63 +++++++++++------- 6 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_beenhere_grey600_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_beenhere_grey600_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_beenhere_grey600_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_beenhere_grey600_24dp.png diff --git a/app/src/main/java/i2p/bote/android/EmailListAdapter.java b/app/src/main/java/i2p/bote/android/EmailListAdapter.java index fca0aeb..6e04395 100644 --- a/app/src/main/java/i2p/bote/android/EmailListAdapter.java +++ b/app/src/main/java/i2p/bote/android/EmailListAdapter.java @@ -141,14 +141,12 @@ public class EmailListAdapter extends ArrayAdapter { getContext(), email, false)); emailStatus.setVisibility(View.VISIBLE); } else if (BoteHelper.isSentEmail(email)) { - if (email.isDelivered()) - emailStatus.setCompoundDrawablesWithIntrinsicBounds( - getContext().getResources().getDrawable( - R.drawable.ic_navigation_accept), - null, null, null); - else + if (email.isDelivered()) { + v.findViewById(R.id.email_delivered).setVisibility(View.VISIBLE); + } else { emailStatus.setText(email.getDeliveryPercentage() + "%"); - emailStatus.setVisibility(View.VISIBLE); + emailStatus.setVisibility(View.VISIBLE); + } } } catch (MessagingException e) { subject.setText("ERROR: " + e.getMessage()); diff --git a/app/src/main/res/drawable-hdpi/ic_beenhere_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_beenhere_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..847e0ae485077c25691e29d0c15bffdef9451e01 GIT binary patch literal 439 zcmV;o0Z9IdP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00A#aL_t(Y$KBRDPQySD#__cT7ogw@G~saxo)SI=9p%3v ze(X_@a)2BG`UJ!=D5zuN#uPTh$-ZXoRA{Pce)?q3?yN%Xr}|AoN{$v*K}uqS66Q3K zHQ!JhD2-+s8tzRf9|Ywlqz6Ie|AJOL?*m$KiK6VfVkp!y3dQRfsQP2{m_#Ns2(mE& zXvVjY@lJM*;%62|W(F*d9#in6GH&lOx-LobVCFEI6@mTE!tH zwFp`B#DQyNw{;=NwPfPk{jywZrrTNEkT2I8r{UK~C|6Bx%MyZibG>sWeIL1V)fDb5 hGN{dU9`|A!RX-fx`W#hxJ5~Sy002ovPDHLkV1h(-vTXnW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_beenhere_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_beenhere_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a7af801131069d956416492ebbbc4b375af5ce13 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkLc z*VDx@#NzbUEB1U%1|kg~)ohz8WX1UtI;y7Ro64{$7Ri*Ev!53I^I2lTgj3nN&6V7T zzdvqmxt1{P?2ieLC!8pGQzLMm_25qjp=b3AV%fZOSPxnAPKofbn(>Jtqj~3tSuGm*8e750WGdi#ApfM$;;>Uw;pZ$0JO7Ipx`#z^8;lvJ> z&s|r)cS=87@TTy|Ey20pOyc7F-(PDySn%gf;hV$L8|<^Cq&D4HJJH5gw%1IJ_p!rq Qphp-yUHx3vIVCg!0NS>DN&o-= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_beenhere_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_beenhere_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7e7afee477c07b775568dcf092e047c0d86d9592 GIT binary patch literal 511 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00DPNL_t(o!|m8fN&`U@#_>9USvh3mT0M`tQ19_A#R9=Q zxECBSPFIL}3^#%haaM3j^4uh`yQ$apRdux}NUb`A|F5bcO}0$oEHd=b>J=u@T>#fB!K8Z?;n6b(Eo!#8yj^3ZH&Rdj;?z; z(2vfW43QN0&esB*I`V>UD!`pj259+2fSwn8>Ol5u>o_mTH`F`{tiqt75aoFaSQ}is z2w$E8?C6ssapuhnKA2nNCYU@4xCky!14V+(3*K2EPq6tQAWN|MK%hui;#d9_24o3K zJw}3oAz{hqR0JTfbYAeP1CL4mRb1)7RuW)S2c~gZIe&r4vH_%t!%F!*O!!Br72HO} zud&F^Xffy5E$-bn1TN!-j(4ySGi9>pQ1;G^vA%PZ?46yHn>bMOJ7s$h8N^-Z@a{cq z(l4Ha*n9Y^gr&hbI+(BPUBwhy*v9y;ei@Q{eF0fP*(4bUf5!j-002ovPDHLkV1g~K B(gFYg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_beenhere_grey600_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_beenhere_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5b69faf76b090afb0ff563835bcc4b9aa7e93c60 GIT binary patch literal 691 zcmV;k0!;mhP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00JvXL_t(&-tF4UE(B2!2H>$F*5i_}84OQj^nW1ya}jWN{30X1RQ2&K68(M$zZW5+nht3CIdNT6XW9Ir-cpbcxFEgI;?8t8!r zdb0*{XrT8Ll!8jtM+!x#C4RtErfEB@?aaLwb zE|F7YHu2{6x;YWDiN8oNfJ+wU9Nnfi8yc`|E*tKuMVy?@(PLxxgPPMk>g+9}^he~x z$VPWNrXEWrISZU@B-VApa$;vAvp?j|Nh2G%g{D5Y75#2Vdy}$ZRqyssi@MpQJ81tD Z^a&6}>0sFkzL@|3002ovPDHLkV1nGCB?|xm literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/listitem_email.xml b/app/src/main/res/layout/listitem_email.xml index 97f40a6..23dd23f 100644 --- a/app/src/main/res/layout/listitem_email.xml +++ b/app/src/main/res/layout/listitem_email.xml @@ -1,5 +1,6 @@ - @@ -13,7 +14,7 @@ android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginTop="4dp" android:scaleType="centerCrop" - android:src="@drawable/ic_contact_picture" /> + android:src="@drawable/ic_contact_picture"/> + android:visibility="gone"/> + android:textAppearance="@style/TextAppearance.AppCompat.Primary"/> + android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/> + android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/> - + android:text="##:## XX" + android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/> + android:visibility="gone"/> - + android:layout_marginRight="@dimen/listitem_horizontal_margin"> + + + + +