From 18a827eeed042ffb43338e06f408b78b0a6a3394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 5 Mar 2015 11:06:17 +0100 Subject: [PATCH] Design fixes for decryption screen --- Graphics/get-material-icons.sh | 1 + .../keychain/ui/DecryptFragment.java | 2 +- .../res/drawable-hdpi/ic_action_accounts.png | Bin 669 -> 0 bytes .../res/drawable-hdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 391 bytes .../res/drawable-mdpi/ic_action_accounts.png | Bin 499 -> 0 bytes .../res/drawable-mdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 301 bytes .../res/drawable-xhdpi/ic_action_accounts.png | Bin 827 -> 0 bytes .../res/drawable-xhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 463 bytes .../res/drawable-xxhdpi/ic_action_accounts.png | Bin 1212 -> 0 bytes .../res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 714 bytes .../res/drawable-xxxhdpi/ic_action_accounts.png | Bin 1663 -> 0 bytes .../drawable-xxxhdpi/ic_vpn_key_grey_24dp.png | Bin 0 -> 825 bytes .../main/res/layout/decrypt_result_include.xml | 2 +- OpenKeychain/src/main/res/values/strings.xml | 2 +- 14 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 95df5ca9d..d34e572fc 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -35,6 +35,7 @@ python copy OpenKeychain navigation grey close 24 python copy OpenKeychain social grey person 24 python copy OpenKeychain social grey person_add 24 python copy OpenKeychain social grey share 24 +python copy OpenKeychain communication grey vpn_key 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 7d8fd1388..60103f344 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -243,7 +243,7 @@ public abstract class DecryptFragment extends Fragment { private void setShowAction(final long signatureKeyId) { mSignatureAction.setText(R.string.decrypt_result_action_show); - mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_accounts, 0); + mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_vpn_key_grey_24dp, 0); mSignatureLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png deleted file mode 100644 index 10c77d07d5162d7abceee206924437d59faa7db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)zi-n(6vw~M$AVbOTp=L@5<@#OBsM4#q;nS}R2CNa2jVl?2ou3}#10cf z5fT#W+)}B9_=1GQLN}23y_SwF&SP@A-4zXW0iV^pA;(ZU};) z4&W*?Uj%R}OMfMzR{)-cVYo9BASvZJ01pAw3VQ4TxD`dw`>6pn8jVYi<7@#qIcA?9 z{eFMF)9Jh{9jMuCo=wyA4S=P;>~$oBxX^C5KiB{{dLm8JM?+wC06fU9CM{)a%X26Q zg3HYOBA;XC>v0@E8N|NtZxGR@u_4iwFbsD~afq3(Y4z0AfinvIFT&l?l|#SPc}e*jEsn$+B6%$`@Vl?(#0YlBuVnob=?|((>6pz zRI662P)hAvIRpSgh?@Y8Y;7W<)+9~|J<;uU4=a^QkBHU*9G|sQVpy`*>wR`z_c?%7 z%y@jlR8UGCDy1HKo~MZDCx8=~V<~_y0Nw&PQ#MrLiE)&IAZRi3*zXB5x8gXyJCQ@< zC`pn%&+`byr^>ONvI3e0l-0;aNlMuSaL-gXjj!nEIyITTQ*#3{LCqCt0F{re&Mu?G z%&!65*B*Ym5O9`mNGW+(K8m8>9CII;t_9FS|DApTQyIiKJD8AF00000NkvXXu0mjf D->nly diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..cbc93ca36dac9065ca29fa407c02f58eacfa2c58 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?{z*F*O%&- z^&&sEZdo&BqDk`&FY`r`OwFskBRvc=82OSN3amb|{d{D|#xl3l^aT%NGoNt!1goxP z%}d!12pF>+yH&p^k@?617nOzVOJf48E4=1U$O_P%6u>{JSUo5yKzx#;u*Sz*wL7j? zcz&NH6_p^(G<*u_bDA( ia4{<7$^u3+4u=1;HW+ZH{qq6_1%s!npUXO@geCw(}6TtKSPDj(q#+`jCGzajv*e$uTI+UcPK&R==ogf+l{TB!oqO} zByMDJFc&5m>}#-L*kIt$aP_=o5Sv&@;bry<2Co?$)jA7{C+*mI&_VlbY2%Wlm-0-^ z=~g@Ue*d?xI5^?D>uFZSBll8_GzBiQHaxEU**o*S@NUR8dJU6yB66nd8~O+ zKlg0f^RsE6wM`a8=&V|`YM(&ho$Q90?aMM>tqnWP!!$w6?edm6$(6^qy`7PJ+mKf5ZQ?%dpCFU0%IIbmq@pF?!<9_PxFI zX*1sg*#jr<%s;v5&r8GSUvr;!zH^$R5x6o$&zW)A<(It1{LMlg9xRO~xQ!)va$>K` zt9V+m76=GT@>84q;%n9UeGCjQzW;vgqgI?9dCgqVmC=QNLhgCS|9PquGHTCZ#kB4EuvVXq6Ws$&m^F-&ID7)~z kam&}L7G%9{xO-hc(KlFj^QqUHx3vIVCg!05`14G5`Po diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7acfab4f4816384a55db9d930054f51facbd0490 GIT binary patch literal 301 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)YHW=#NzbZ%Z^-!3gjkzcvZ(!`>6_#OuH`KdKI|kfl}V3OShI>-1;fZ z`QG*!EgYX>pGC+}+h0juJ{B6) rAh1F4;la5rUvDptJox|k*QcxoNsH&Lbkl1GI+(%J)z4*}Q$iB}&be_X literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png deleted file mode 100644 index ee8067c7d257367aa7ce2416800c354e8bf52727..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmV-B1H}A^P)v5nYNMHN<%6+tr{g3ya{?GmO+@9Q1=&Gy# zTaqN$^Spjw6c|y}E5JZyYePhS0B?aM-}g7$3Se?_vahG7=Q;2Q$i#$~fW?D@gQp7% z3tKG*@H}r+RbK%Y5_<26$b|3vOKAdF^)_ACeGI$=vQ2oO2gYsN-U-8SB`tuO6{vjk zZ-8^B%<)G=9;8)?NC40CE~)BQAZIAgu87?5egCIvfXHuGRiD*3{01;4A~_Ms0b`Z5 zIOQsy##L2;LZL8VS=M)|yUk{)RJt`kKmY6aVm_bm&15obKz~fGQn_5dS}YbD0d81T z6|gL8l;~DjIC*%0%37g;T$zfuQAJ&$`%!`W`}-einbg~B#M>xMC3hy zs@?-$5Z{50w4FMDs(u5m*N7hgUaM-e`PNJWL|vhGrjs1g@6-XxIzoe3a}RHEiU69mD!ZQDD*opy$(JCTK9xZ*g@Dlo#~gw=KsR$M?31nYx?gNv4B zT?B4&`U%Y_go(dZ&H>vZ@>x}PfQQY3sOrqz++3o;$N1g$Ja0x-o9-}4A!4skQUyWq z(QzCBhMW0(((7a#;H)810XR#DRQh`(a$UEfCvDts!gxzGt+;1L+XKWwbOb;>h>ig` zg6L>~NT^mH;H2WZ)9mc*KWFav3UmQltu8=UU3Jx3{RQT;0*s;$u(SXG002ovPDHLk FV1f{kbwU6D diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..49a44704c99e75b136beb42a40e4559e8e8c9d51 GIT binary patch literal 463 zcmV;=0WkiFP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BoyL_t(o!|m3~O2a@HhT+)>wkmEtw$Y1`f~6n`BGMah z;pQzC^;$$+D5!fy@g_vYb)n!+i!OQ`R}D>Ol1wsD5Qc9#@I5)rKM{!Ejc|Yi9N>U# zfX5LJwCT~O%{@&@`2il+jF6!WxnLy^pw72aK2C=nTc8VA5kR$)bfAH&&>Mu^Ss#u$I8+Rn-nNgv#6f{)>3S=zGhfxio>Jg z${0A+>{kPzY&h&bSjYwl_6+JrY-uNs5g=$J*6&A*G($kJ%U8@v5PjGf1A zNkl+pZ3=quSUlL;g_#XG zIi5l?bFhtvl8XnyqB%(o6!f6D8Mk;aBF6Mmqu@bBDU=l3Oy}nz69{d0-puUGyh-qUx%&^AH zXFSjQO16v#ky?=BIFD>>Y@7#hI_E44gM)+bI*#+7Y$-cQC1`qj`d|+>(;Sc~NRRt5S_F#LIe!3nZEkLE<(|KH0Ca5I{s_Pq0O}d?9f>kr zk|ij11TphFg8H{LO`CLGccoha*L7DkO`8O8J4?U>8RQ6x-mOLi^%rJmXMYrR5|vrV z5|D^SEXz7vIYH5jXY50qh(1Yip^3}hUzJYE(G!1*jV7r7bBeywl+BW*5aLGAv$8@} zDN9#D(SDAI=Th{Qrfilhg%Ed(9S~J!<~LJZWa6?}vJ^$4SB)4>Pfbm|ASx7<>1BIF z+J;)3pqmNm?+wFn$+qpI-3r*YeKZWiB>;PS$oa1%KiyZ-MD#l|KboM8I)JOKR_h{w zOJNxP1OS?*JrCdwW_}yMo*r}lSvf(>yb9o0!glsB^H~6AiD22U&vRZn0%q zq3$IN!|!DE9XHKi!Pe=6bcpC_S$%iiO7MOEhG7^JMD(Pra633*7zTXb|EBDYW2bo{ z`cR&e`?5HeWxZE+zpu{o*)WW2MD&(yIop&i zNw}Tq`~LOO(a}QyUX(3on=&OOdesPm;2eOfvc>GAtY=c94e?H=6Eqr)&%-c$9Tj;V z0p*OO#3u&rcKcSN(fBkB!*OKWfG>oiC8au2X}80_lxxvhi z=Xvkv*=FWLIp6oM*X#9*wOVZrz##xnAjdD(vQWfGD&rHpy8!+H@E3p;Y`p{z185Z` zD$kK5?LXdXwH#(HY?{tXlC*R0<>lqC$HvA8z<3eu=XJYD{V-rRNRlcDsJTe4!?cIK_%w6j~U2Zy_kw7UR(CkRLnx({@rMvwp{NPrR~KnW6{1PM@r1SmlQlpuvdp-?Cu aTK)$=^@Ia4anRBL0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00KfuL_t(&-tC#sOH@%5$3M@cUZJg`pil@jnT(i1%RouW z@CO9#tVN63%)+#d{uf0hkCLcXNwkcpSAl_P{s0FeZLBttEu|I}sDVrir=oF=&YOF$ z2%a;W;e7A?&S&14x#!FquZQ&&MJSL0DUbpwkOC=?0x8hCisDuD3Yw`WMj54e{NM{y zjPR6Cu7Esogxy3tozw~HC;<;yT)UFBFipRR1IOrRl2dB~w2ixjRIa)=#tZuJT?6f8 zn2UMuPcX<1mq5E1;!q@qBX*IBvWgY5FS5se9<#*_P!RFz{E0fQxBzP7Lcu;A9JdWr z%ng(Cj9xsuKIHp{mcKYlF-aT0+ylh~Jz#oS?k%_61C~{H~{`WIzjH8BL12l9Ibqa>@me@dlOQ2bDgDuiAWA(H1f@5x1Xhf+j;N5 zNh4ofk00|SXySbyr8-H+3PZoud1!!Y&hlE^H$*#eUb<`@xnpnUmR>pAf$y1HdLf@9 wpHq3Z4p0A;Rv-mZAO%t&1yUddQlJ&%H}wySM^L4%c>n+a07*qoM6N<$f)C6#&j0`b literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png deleted file mode 100644 index be1bc9ef48d2287f39f26de1861b29e0ab4a4c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1663 zcmV-_27vjAP)Fk>e?VA85j+&P^q?eh zW}z2dy%e%*5>U`qDkw!OK@UPt7OT*i#5Rivt=RSu^0D_q|Wv&dzV#N0D}NF0vKo? z(gbiBzycBd#>{ife4<{jUsgRqNt2j>v9Ymxvf1n_%={{V?GgH70H=uPNUPQQVrpvY zs>+E<3h4qWmCAhp-eTsx`2RmVE=?jj2;lvRiHX0uIYCJyO+dL^&gS#^(I5!kCZcso zgk|O>!!X{vcJ12qp+kpS-J7Q5kRrfwoXte^6*F(^N@${=nfaw!t#+Xs{UwPJw*lL> zp9e7Ct;q*~c3<=DzIz%o&dHTZr3~P6067KO*Ah|5vaCz4>oyehFNMeg9LL!Q;A2Qw zMKLe{JX{0(BRAc^=y^uol%#J8%0h$1Xte0+S1X_}`2 ztXCa=7616Y|JdZ@6?52Sf9ycj+V>itm+^l2nopN^P}DT zwj&BNZ_DTNqpEX=5c(r%baZr6CX+cI;U?=WfKLp=IPUxY?*L$$=7T{Hi~x8YKtbk! zn0aY=d3nq9^z_Aq=S~Wlum@(dSqFf~|&A{0G9(1jsgtB7!qlang5I$CeFDsva2A>3V2v`$QYzPdq)955NsA{kcjS& z8Ya%UGP0|nqW~hhTcknX_n(RyCeFDsva2A>N6=k@gWgjrm4wUGrBcZxqCJwwCzM?U zNjyy1IygAESM;RzIa?)X5&k;dZNdn+F4`zFPuaFT683o8wnvzGDuMB({#~Mu#W-gE zn}{|Dw!4OijyaBVt704gpjxdOvWs!6xROAdQt2qbFpLY#{7{6p*8upi*=+7}9OtIx z=w`Diy&S!Y)W6yorW}0^z|%4MC;*raf&fG-H`GB8#Ar^4)IX>Xb06@N>X1=kW>0m7 zPK3D#e~*&Kk%K)TSEW1e>SAtO0vQQ|T&gF8?0NA8DcvR9RK}bNO z(FlfyhE5oU@fv`&s>4SmO%jCb_Or9Iil#l27H**bn&i2JsM79fE*60`tGM3tZgNF<5`EkH7& z610E>5Rsq-Bt%#VT0nvjQMJ=CT7Y7-0L5qlin-%zL88R19o1^J+s?6G0gBNA6r%+w zMhj4k7N8g{Krvc?VzdCoXaS1R0u-YKXfzs)Mx)VaG#X8p`42gnObs6Lz>5F?002ov JPDHLkV1i0f5Jdn0 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2ea2bf77c5445e59d6df6e6392bfb71951d35ea6 GIT binary patch literal 825 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 zRI$<1#WAGf*4tZWvxOZcj(_abe|fO`hWPzQj!TdI;a95qpirU3<)!^7+gEsHQ+&u5 zjeA{NU)@*o>Q~C@y?Sp6$3Mm_p-XPLSHCJOoG|_F&AT(_hRV(ReBk}$xpU`Ms&ReI zpDxtEz@osw$l<`iB!JA!Jy7O0^P#5v&qG|RuSBLy%XGUrt?U3p_{s-g*W5p2cyd|^ zQ<2S*m%?>xr&S!dR>HXH&NZI!D{v-#+c1Q_YXgIGHR$?Yan_|Qq6ms zjqANgXZBEbh2@4BGmCTgJG2#g3+tOa*y8qwIadC$qIwJ8fyW0F_kK5)~Qnoo$ri0Y%gT6eX|cTTYF@ErmQ9}gNSh$L-|&|b~gsgX}!nSUz#uD zPgOdN@h(GHYmvd+{9PQZn?bk#BS-EBg*NZ1uk4LN! zn;O`#NaC~Rnj*E7{<8)ShC+{HSGet%ZO9k!ru&9YrR>YNV@wVkCrT^o&v_NoU!k7N zx**`qgMH7w?>s2dJn{FLYYbej_Nj3{*IDRmZnO+rd`Ig+K5yZq%y}D5q}Oe5>gBgd v?h59SeDOt{VM2WlCwg)LC!#<04ffw=Se}S{H+3yAMKgH1`njxgN@xNAdQn+1 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 7317e7742..9d47009b9 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="Show" - android:drawableRight="@drawable/ic_action_accounts" + android:drawableRight="@drawable/ic_vpn_key_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 88eb89ec6..207553620 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1002,7 +1002,7 @@ "Encountered OpenPGP Exception during operation!" "Integrity check OK!" "Only metadata was requested, skipping decryption" - "OK" + "Decryption/Verification finished" "Using passphrase from cache" "NFC token required, requesting user input…" "Passphrase required, requesting user input…"