From 2bfe355d446bdb86f720e37f7351f672fd2aebe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 4 Mar 2015 20:03:20 +0100 Subject: [PATCH] More icon naming fixes and design --- Graphics/get-material-icons.sh | 1 + .../keychain/ui/adapter/SubkeysAdapter.java | 4 +- .../keychain/ui/util/KeyFormattingUtils.java | 28 ++++++------- .../drawable-hdpi/ic_action_encrypt_file.png | Bin 623 -> 0 bytes .../drawable-hdpi/ic_action_encrypt_text.png | Bin 787 -> 0 bytes .../res/drawable-hdpi/ic_help_grey_24dp.png | Bin 0 -> 588 bytes .../drawable-mdpi/ic_action_encrypt_file.png | Bin 480 -> 0 bytes .../drawable-mdpi/ic_action_encrypt_text.png | Bin 572 -> 0 bytes .../res/drawable-mdpi/ic_help_grey_24dp.png | Bin 0 -> 406 bytes .../drawable-xhdpi/ic_action_encrypt_file.png | Bin 836 -> 0 bytes .../drawable-xhdpi/ic_action_encrypt_text.png | Bin 976 -> 0 bytes .../res/drawable-xhdpi/ic_help_grey_24dp.png | Bin 0 -> 716 bytes .../ic_action_encrypt_file.png | Bin 1095 -> 0 bytes .../ic_action_encrypt_text.png | Bin 1331 -> 0 bytes .../res/drawable-xxhdpi/ic_help_grey_24dp.png | Bin 0 -> 1018 bytes .../drawable-xxxhdpi/ic_help_grey_24dp.png | Bin 0 -> 1384 bytes .../src/main/res/layout/edit_key_fragment.xml | 6 +-- .../encrypt_decrypt_overview_fragment.xml | 15 ++++--- .../src/main/res/layout/view_key_activity.xml | 4 +- .../layout/view_key_adv_keybase_fragment.xml | 2 +- .../res/layout/view_key_adv_subkey_item.xml | 38 +++++++++--------- .../res/layout/view_key_adv_user_id_item.xml | 2 +- .../src/main/res/layout/view_key_fragment.xml | 18 +++++++-- .../src/main/res/raw/help_certification.html | 8 ++-- 24 files changed, 70 insertions(+), 56 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_file.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_text.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_help_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_file.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index b1d4c7a0e..ae2914a89 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -34,6 +34,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 action grey help 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java index ff5fbb49a..096dea51f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeysAdapter.java @@ -272,12 +272,12 @@ public class SubkeysAdapter extends CursorAdapter { PorterDuff.Mode.SRC_IN); if (isRevoked) { - vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24px); + vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24dp); vStatus.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); } else if (isExpired) { - vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24px); + vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24dp); vStatus.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 38ed88b9c..3a2177e8d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -413,10 +413,10 @@ public class KeyFormattingUtils { case STATE_VERIFIED: { if (big) { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px)); + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96dp)); } else { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24dp)); } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; @@ -430,7 +430,7 @@ public class KeyFormattingUtils { } case STATE_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_closed_24px)); + context.getResources().getDrawable(R.drawable.status_lock_closed_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; } @@ -445,10 +445,10 @@ public class KeyFormattingUtils { case STATE_UNVERIFIED: { if (big) { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px)); + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96dp)); } else { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24dp)); } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; @@ -462,7 +462,7 @@ public class KeyFormattingUtils { } case STATE_UNKNOWN_KEY: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; } @@ -477,10 +477,10 @@ public class KeyFormattingUtils { case STATE_REVOKED: { if (big) { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px)); + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96dp)); } else { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24dp)); } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; @@ -495,10 +495,10 @@ public class KeyFormattingUtils { case STATE_EXPIRED: { if (big) { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px)); + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96dp)); } else { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24dp)); } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; @@ -512,7 +512,7 @@ public class KeyFormattingUtils { } case STATE_NOT_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_open_24px)); + context.getResources().getDrawable(R.drawable.status_lock_open_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -525,7 +525,7 @@ public class KeyFormattingUtils { } case STATE_NOT_SIGNED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -538,7 +538,7 @@ public class KeyFormattingUtils { } case STATE_INVALID: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -552,7 +552,7 @@ public class KeyFormattingUtils { /** special **/ case STATE_UNAVAILABLE: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24dp)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.bg_gray; } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_file.png deleted file mode 100644 index 1e397ebed49ee109c37ff6543bb8197890f5a20c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmV-#0+9WQP)4S=B9|*)wkaQv; zLJA8D!7fc&;Tj9MR4D|t3kZr3u~1M#QrM_PBt-9i7Q4oE^X|{?9?o0X4~}KuyqTTf z-J3V}wj_x>^T;}ZtmIz66YB&bbOOUbH?R%-YROBI51%)ZE_9!=q^@SZ)`=r&CX)2N zq*X~*;r))Jr#=hllXNMmCTTn}-XrN-C}Q4c0aIa;Umdo|(6-$uhV?Eq9A3)~TLriT zh8hL17SIu1|2S+_;EEjPWz#6a#d4_%A0^{d?0TEzQhN7IujoOhjnZs_%rt@ zZtzLK3h*(hQ{I-)e-r|&DFj$k2(YFQU`-*w8lMEDI!L($Y-UU(EvcUC60n>xku>ZQ zyq-ynOF#vf;9-7=Ghh)IOB=xI?R4Alsfbfi2(YFQU`-*wnj2M_(Zs-kCMN&@002ov JPDHLkV1gjW14jS= diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_text.png deleted file mode 100644 index 1cbd993a7a58a6e4b3d6a3c6177882c1f821a16e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 787 zcmV+u1MK{XP)kL2QDGkV0$% z7FsD{V_{=wVPWSVVyO@aLB$_X3sDf^Fd!C6K!gNQL`4j8rx=pgVi$9_PIhN!CO3Nz zEW0za-?#6(yEC&tJ(B2VmcN)L0Ffvf5EF<=^t z+ifue+eyyGmLSsF*|13cpGVUyaCR!Fv;a&n#i64gCUg#WSV5+ z`-iC$S5>?bn@)TSco*=Phsm7963k^QYz*8Wc@_!98sLOu?7eJ7jA8U!ru-9lQ4k}N zhq)`+22&@_R@?{Pmk?OQPGCn%`85mg1*NgM0tZ}^cY-QCN;qM21=jrwnB8msUe`LM<|3S9n#QMn>jK8%tUB)4f RPuKte002ovPDHLkV1g9PR~rBT diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e2779ba95dd4b4e2d6b7b29f3488226f2ce8b327 GIT binary patch literal 588 zcmV-S0<-;zP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00G2FL_t(Y$JLgxN&`UGuiH-I7g9?cKF1j zKyfa#7e2XSj~y=g)Rc1-rGoUoIc2b;4RE5Vhc?iXmbh;?v8!cd!$4`x;(KBULWWh= z$RG$Ys+#R76O`A!wt^r`@lKN_?@S^H%Uaf!4oVtzGmIeIb;eZ$VaTYfgbG?P7I+&E zkFU;r3J9zj^Q>ID@vZ%r)W;c;!% zXZ0=e;?&Sg2mAC*>-`FpGk1TA=ZLA5LbWIQ!x~#QG}(*z-$h%i^?L#pqniJ@^VH5- z9n^Xp9Xgp@R59TPWY%K)kHw3wM|O%WOI-!zepbru5|LnzB4ujSsZ*m&f!TKX{qOrx akMRu=Grprw4zeo%0000`UKjTM(_pfM9^oj z^hE><8!HhD(XrJTuElY)5^$>4)WKl9sXnWfZU`7u-_@niTv=_Z z)hIs;4@?66Kr!gI@Cr->Yady8V8>+KsHN7Pf}O1cPe3UJZyq>-&ewso@xFOc4~zq= zz(~xdH((2Bv>|8%r~~`Ja4aL@-rI!ptE7b>-auOl0%jmJy$?`G+xQvYD>j*EpC15s*ko$X} zC!i;wCm<}K+2PnP?Fu*o?m8%7Hw`KJBANo$fzdxC7B~a83Dx|x0=kZWWx}3-T<{6c W@hdlOtj<*c0000k}@P)u z!fmbm2^N;Zil88tT4^D^KomPsS*=wNY!nqA9E(k0$R?XHX4V52l9@AePLj)=n>tDS zC+h!I9cXm8cQ-HzWPvT!0CRq?o$l=0WpDcw5o3S=yJ!@vQg zUk7aWtFO3lgc)E6c#I+hldy|&@n}mZXzuq66e%a)888yJAOl+_Z()x#3iuu2Lm6#Rmi-6ec(LKz&OyCz<`f?V8DhL zWgzE;b3_@~02ZsPTL$`F8h8Lss;qlSL%f=SDav^eg-+K7vR*hx)LF1Zxh}*-$(4bc z!TbbfV=(JQQdl<`<{LN$KK~$UV$YTs?1(0S0?=-Zbr60?m8g7D0f)c>aA)PfqR(3l z>Fegw>LZgRVS(yZ@>j4iVCF@t;$Zi0SOj{2ZD1`;ai~nfn&Ss&rZrhB6xu=n0000< KMNUMnLSTaCo9y!d diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2f086e41a21a5bed3c68844aa5a07abb70e3e926 GIT binary patch literal 406 zcmV;H0crk;P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_009n3L_t(I%dM0_YQjJmg@0TaP^o9=8M^fbqAj6{qPX_} z-x=Jt5bzF)Ucxg-cS_JwT9_#{bbP16qK7-qsp1>~}TiO;E0ph%4mg`|L%ia(rQQdUSq1D@($Mey11!!ttt zHLWN)DMJ`}~ z@Wl4ai(Hi+5oRfGVSq^nuzh!AfbPYi&}!?0TVIWb`rw47rP8_Mr-v_a0`Io*4ldSt zvyHbPG+0@>`>rdRr^A>f5fKYUv=3Xo<4@qK_Bz!Y_Ea_ENB{r;07*qoM6N<$f@|!g A=Kufz literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_file.png deleted file mode 100644 index 5f528864d8207cad08a7a8a395621382d6885804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 836 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf4nJ zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l9rSc@ z45^s&cD8-Ch@-@@`sL4m@@qRg=&&ejtw>lX#2uIuB64v5idGHBjo+Dnh^pL(h;qGP zB6Pv6gJY3K+{%ay0ilEMgt$E)W*b&l#FU+zxp!xE`Hi0k3#xZ-KELPlopWd2y@~O4 zSz)w#3-bjv$px|vW*en9$lbWs@34mL4%0nm-2}cLoHne-_DpqAS!SZ7bpGf$eZieC z7e{vINX%jMOTQi8n3=#R!LFCM?uGq{Rt@$cq1o^&8A!Fk)? zrSAL0(p(sByi}6uX58vHH&|c6Cg&T&Z>xRp8T!7SxPQXVy>YRFaKx5pdXCT2ymz}i zS^MSuqK-S8rv^X!-OzsEtwR*k8@1*CHHzg6^cIBi?wC=&;0&9|zxhk+_ZmqXh-l?E zoHp1YX8dK%#|ycP_qkl3oMSTJ+{3Kau=+q&{KPo695y)y@eiwQ4j4Uq`DSLmgIo+_ zT>9K49HqPsYxmVlcWJ{QL@ZVv5)+jt9(+Q@-1y+b$A31C_9H9pqDulgGY;((yO*8#=FMyRbMRK#*4oRmoWvqYL{229}MT92EACP1U zm3tHJpq_l7u4}Ive`~@&@e4;{7!PWEHrlyxLYpHNJA*5k|1mAssM@#e%eF1R6wl!4 L>gTe~DWM4fQ0H35 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_text.png deleted file mode 100644 index f8867e9229a4f05b9d6c3945919c1d3a8245dc34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 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 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_text.png deleted file mode 100644 index 15650500dd402428394083fdf519f1b1e0d456a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1331 zcmV-31t<88FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11h7d&K~#90?VVkSRaF$nf0I_yWR^YH2Ut-`C8-bPgalcELC^;g z5`9xxqJ6zY&|9w&5d=jKMi0^VLq>&Q51BlGfR5pD)Xo!x8W5JBOhjj+;z2n@o z&$)Y_wYz)$;K1y;>+H2=|L3fI_c?p-GvJ)V(BmZS0CL9!P{ssM#spBt1W?8VP-eDv z00}YxECz;(;}YO|V7NH`4C>6r0c|V--T+o~v3VbO1UL}Fp{1bXJPhohd*cJ#0qg`; zhj3~F2+snq0)w9R=K-66+k16vDG06xz5r&m{B8_*0r(R51y~B)0BitGZn4`BTmkH@ z?cF(-^D*e08*%Myan7ATgZ*;n-0lwhk9&zB_bcED;Ki2mufQ_kNSAXi2EL;`U9AGP z)(If@K44`>`9ZojK8Q%ql+@!*?g9+8{Cp7D=6T+xF7;F*X8{%f7qpbW0etiE@4&v6 zvI$UwvpULS70++A@2tz4oCQb%6F`~VZpO_=^7R7X+>XyK0v@PP*SwaWXBFo<;5T49 zaMY)goW=ngfaieI8u0ZOa1S11gIol-8ThbapNEiJ7=Ls#%B2r@RKe#wU~QREE&^Pp z8L6E5er#fIESIi}Ds= zBk&1uZAeFU1x#lQc!=YTKgBrm#4IQ#z;w1U^Q5ai$Ro*MR82wik>{UR0%wK{BrU1^j^PD3R+K|o%J=v(F+4*20jg2Rdu5R zJ_0O?9!19Z2vB+%8TH9AwXZ^#RJ50LqvE%9sGkgy@7vskunmgN49#k?Kx@5CRNSZD~&xZlliyuoR?> z380J#po|HiOo&c+hzRp#3KmAHHyJ_*aA9#6HLw(a4!lP81#w-$#{14}{5 z_y~~0rgF!$9Qz0`5$mht+3zanFa|QeW zJQX_-B@O`hlXxEh@Dgwf@OQ*mn&wkv75u1X5LI{19Ymf1ub|p)DQl3und>rv?B6in zLmeRB==LD}+Ab3KhS${A#hZZ}Yo0p++y%TBE}V2oeIVA?jSp!HFoEn^(zlHd=?XB3 zH2%BVfy5?70kUa)NKb%Crmlby^V^IJA002ovPDHLkV1ik;P^tg` diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_help_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d64fa516040f4db40def6cb053a5bd998c67a2ad GIT binary patch literal 1018 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00VMKL_t(&-tC%APg6k@h8qm!qrl2qs2>SS{Rv81f(4cs zQ8BLk10Xbc17YO`gNe}uOf)X|QW9MOfdvU91sWQH#YAO6jF!4HX&T~2+oD`oBs0>v zXJ+o)hD9^Wp7ZAEy>sTAIp=!dIbF+B1}X!UfsU6CofyV6wva{^1r(4)8e5pgFgj3M zN}vFuh@$|@X63Pg0i1Ims1-~2V~fJBLo6cX9#9)LrBT=wN7y`25bv~Lj@K+2O#=1c zrz0E-77oyD2B-=z9m5>2ad@2qH6UgT$AX0w)Hwn2jE`M;C#afB4~ma zUIY=rBkW5c)$0INkuNKSTc|kUSAjc76P~N$y(9*DL5R-Sqz50~5Z+^|Ks|)uC>fnk z2!)#}KtbZ%nUOlZW{GntAP@AG*gJB$ybj-ObzaK?wGj{dHfLRpD0YxT4oUQ*iu>&@ zp%jt>+9U#GjzI#SNs--;7=* zX}x9#P=1gjP=Hp^|sr{40CKsq`y)XH0ME0=JpN_^arjG9C7FT&V9U`zK5vjQ1IZ z8yfx-rc=iiMqx_Be^3n6p#{X=K|X8vN5nw2T7l0hsP~a<%MXua_7MXeDSOB4E5-ri z?H85msc4aZSW=t<&QjN)#gYQe)AzDaNrA4)T&3eB!->h=?ZYL)Il?vBcFe4H*sJ(W z$@hmEao{>ows<#I)NJZ@9jHsS>G|AMpl9k`ST9yw16oF2B#j6A z_W#L3ZTM1;Riik|c27rcJmtl>F`TF3y`wh3>sC6KMCVSI$q{FOoL<-`i7ES`l->|H zgmujn+Tz}ryafviC0qgX#S*CL4+;F}!y58L=^jI`eSn+()S?FM7{VkHNFjqf^2i{C o1ST+u>!>b&j8X95vg!umA6#xJL07*qoM6N<$g5c4^X8-^I literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_help_grey_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc6711478a9b32b1b58c4ef10d2e5dba646a492 GIT binary patch literal 1384 zcmV-u1(*7XP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00iJkL_t(|+U=XqYg|5s9Qwy3nh(zT29N3^0C6mellCJt#ze_%*| zq-~}qFv)Wv1LfT}@11k+xo@8ExZC@_=X_@FJ@34G&aFe;|9jNM05L!e5Cg;jQ3B{d z8bdgXF-&0|OIX1QmN1VgT*Vm-A&vHE0yJYU@|b}`7)1^OZ4* zjbQ-vP?IFAAJU_BbpfL8Qi03&$BMCg(Nc#*Yu3g}0Zr%nR<@fT|$r6d5F z7+d!Vj$o~?+Oq)uA?u9?N2FkYugK=6(M?*ATTvuyo;C&OC!6{mZRCiS!XISaeI@{# z$Zy?ghWq~^6v+XhQy<_8Ik)d-rzBg+dtp=;ppX1FAJNJr2g&*w9e^Y`VJ>(^p6$qC z8p~Kl0VlD|Ga?nq$##Md@Co_%>Gue|dDom(2W=q^PPR%HT!jjrCvI~MTYEp*R#{UvnQ1o8r{+e6`+}QOx56edf9jOl56&J3`>h% z!PE<2uf-3QWtXkBtfzO=0P+?ACY5gu&eJ&>z>GzJV=h~7v7Rna06HwXzk=6X);?n@ zv;_mCEdqR@So@Qyup<~?$eR0?m5B8&TLZxWXDzuurUb!y{K{4t4h9&r;{FdF6`4V; ze=!hX%7XhpdgPL6lr@wlf&u2m-T%p>2J^N?QObdXxnO`LVfV+;qS$y7B~7(bFu;oN zoA-Ie!W#w^hH|(7i+DxR@4W>^?3g}I3*vBstS67Cpk&V?C9KU7{^ z*Nim@Vf3ny`wPk$#C`$QOThqVgaE!#e*fzNs;9zB=G@0!?}(^o!%L^PyL3MnQSA)| zXcq!_!OGrhqkK{pMNGLv=&XQdf%Z*2ECS$GEeU9zpaJZ$0fp$!KB@$ujT+5(}t(h zH3j(6ykn~o<23{LS*a*!HT|Wus%GW@MYKw_U3O_4NSOlM_V3i|V!BVF!R=T*d_EP(m4HlrV=0T*4`2 q(aY>|k1s^W05L!e5Cg;jzT;mZEXDE&)Bv{t0000Z literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml index 2a2dee32c..8f9709711 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_fragment.xml @@ -30,7 +30,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + style="?android:attr/borderlessButtonStyle" /> + style="?android:attr/borderlessButtonStyle" /> + style="?android:attr/borderlessButtonStyle" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml index 6f822148e..3ef8e3551 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:text="@string/btn_encrypt_files" android:drawableRight="@drawable/ic_folder_grey_24dp" android:drawablePadding="8dp" @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:text="@string/btn_encrypt_text" android:drawableRight="@drawable/ic_content_copy_grey_24dp" android:drawablePadding="8dp" @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + style="?android:attr/borderlessButtonStyle" android:text="@string/btn_decrypt_files" android:drawableRight="@drawable/ic_folder_grey_24dp" android:drawablePadding="8dp" @@ -86,9 +86,10 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - android:paddingRight="4dp" - style="@style/SelectableItem" - android:orientation="horizontal"> + style="?android:attr/borderlessButtonStyle" + android:orientation="horizontal" + android:paddingLeft="8dp" + android:paddingRight="0dp"> + android:src="@drawable/ic_action_encrypt_file_24dp" /> + android:src="@drawable/ic_action_encrypt_text_24dp" /> - - + android:layout_toLeftOf="@+id/subkey_item_status" + android:layout_toStartOf="@+id/subkey_item_status"> @@ -79,7 +70,7 @@ android:id="@+id/subkey_item_ic_sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_sign_24px" + android:src="@drawable/key_flag_sign_24dp" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -87,7 +78,7 @@ android:id="@+id/subkey_item_ic_encrypt" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_encrypt_24px" + android:src="@drawable/key_flag_encrypt_24dp" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -95,7 +86,7 @@ android:id="@+id/subkey_item_ic_authenticate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_authenticate_24px" + android:src="@drawable/key_flag_authenticate_24dp" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -127,4 +118,15 @@ + + diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index f5423817e..cd7a79663 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml @@ -55,7 +55,7 @@ android:id="@+id/user_id_item_certified" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/status_signature_unverified_cutout_24px" + android:src="@drawable/status_signature_unverified_cutout_24dp" android:layout_gravity="center_horizontal" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index bba412f99..9a75d59e6 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -22,23 +22,35 @@ card_view:cardUseCompatPadding="true" card_view:cardCornerRadius="4dp"> - + + - + android:layout_below="@+id/view_key_header" /> + diff --git a/OpenKeychain/src/main/res/raw/help_certification.html b/OpenKeychain/src/main/res/raw/help_certification.html index 19ca85b4f..8228a4ac1 100644 --- a/OpenKeychain/src/main/res/raw/help_certification.html +++ b/OpenKeychain/src/main/res/raw/help_certification.html @@ -12,10 +12,10 @@ The most simplest way to confirm a key is by scanning the QR Code or exchanging To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys.

Key Status

-


Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. -

Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. -

Expired: This key is no longer valid. Only the owner can extend its validity. -

Revoked: This key is no longer valid. It has been revoked by its owner.

+


Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +

Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +

Expired: This key is no longer valid. Only the owner can extend its validity. +

Revoked: This key is no longer valid. It has been revoked by its owner.

Advanced Information

A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard.