From 8564c4aca15f3dff339063054e137602dff42567 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 6 May 2014 00:39:09 +0200
Subject: [PATCH] ui: use primary icon color for certification status

---
 .../ui/adapter/ViewKeyUserIdsAdapter.java     |  19 ++++++++----------
 .../key_certify_primary_ok_depth0.png         | Bin 0 -> 623 bytes
 .../key_certify_primary_ok_self.png           | Bin 0 -> 473 bytes
 .../key_certify_primary_ok_depth0.png         | Bin 0 -> 505 bytes
 .../key_certify_primary_ok_self.png           | Bin 0 -> 361 bytes
 .../key_certify_primary_ok_depth0.png         | Bin 0 -> 722 bytes
 .../key_certify_primary_ok_self.png           | Bin 0 -> 623 bytes
 .../key_certify_primary_ok_depth0.png         | Bin 0 -> 889 bytes
 .../key_certify_primary_ok_self.png           | Bin 0 -> 890 bytes
 .../main/res/layout/view_key_userids_item.xml |   6 ------
 10 files changed, 8 insertions(+), 17 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
index 05f8f8860..64452e8b4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
@@ -111,7 +111,6 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
         TextView vAddress = (TextView) view.findViewById(R.id.address);
         TextView vComment = (TextView) view.findViewById(R.id.comment);
         ImageView vVerified = (ImageView) view.findViewById(R.id.certified);
-        ImageView vPrimaryUserIdIcon = (ImageView) view.findViewById(R.id.primary_user_id_icon);
 
         String[] userId = PgpKeyHelper.splitUserId(cursor.getString(mIndexUserId));
         if (userId[0] != null) {
@@ -133,17 +132,11 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
         }
 
         // show small star icon for primary user ids
-        if (cursor.getInt(mIsPrimary) > 0) {
-            vPrimaryUserIdIcon.setVisibility(View.VISIBLE);
-        } else {
-            vPrimaryUserIdIcon.setVisibility(View.GONE);
-        }
+        boolean isPrimary = cursor.getInt(mIsPrimary) != 0;
 
         if (cursor.getInt(mIsRevoked) > 0) {
-            // no star icon for revoked user ids!
-            vPrimaryUserIdIcon.setVisibility(View.GONE);
 
-            // set revocation icon
+            // set revocation icon (can this even be primary?)
             vVerified.setImageResource(R.drawable.key_certify_revoke);
 
             // disable and strike through text for revoked user ids
@@ -158,10 +151,14 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
             int verified = cursor.getInt(mVerifiedId);
             switch (verified) {
                 case Certs.VERIFIED_SECRET:
-                    vVerified.setImageResource(R.drawable.key_certify_ok_depth0);
+                    vVerified.setImageResource(isPrimary
+                            ? R.drawable.key_certify_primary_ok_depth0
+                            : R.drawable.key_certify_ok_depth0);
                     break;
                 case Certs.VERIFIED_SELF:
-                    vVerified.setImageResource(R.drawable.key_certify_ok_self);
+                    vVerified.setImageResource(isPrimary
+                            ? R.drawable.key_certify_primary_ok_self
+                            : R.drawable.key_certify_ok_self);
                     break;
                 default:
                     vVerified.setImageResource(R.drawable.key_certify_error);
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_depth0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c07b913049ee2c52b68b8ecc075c8e957ae312dc
GIT binary patch
literal 623
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAv7|ftIx;Y9?C1WI$O_~$76-XI
zF|0c$^AgBWNcITwWnidMV_;}#VPN<L6l!?Ez))(y!0;-8fx&791A}<MoLzx7K#A%A
zpAgrE4Gc367}Fp9|NsBf*U<YwXK0iJ`2{mDuse6E%`KS0yJ%*Zs+m_vLPg7TDUR;C
z^f~!83lwL&&CBDQ)vMy^W09^0)WewM?e3zncf;0AKn`btM`SSr1Gg{;GcwGY0}8Tr
zo-U3d8t0c@^b~4V5MaG<Oz>!=OyQxA|IB+j6<Iac=v?9!`=48Pnc;s=;+=-fdkv|X
z$tl)-y(N#5-n=S0uYTmaiNJ(nCQHu67M`2u*fl<joOLAdM^jVMBA#VOLzk}+IT-p=
zuYJL^g>C+sEWX;0wlQW(viLACm!9-<_`cOue?j=?gO-~MZRFDf5|n0~KW$X(qsDq;
z*V_hxH@8oTJUAZ8cJScT#a{bg-Ie`u-G;%zg6kw}|Ds-?%T-HUBT7;dOH!?pi&B9U
zgOP!uiLQYu5QP{SS{WEynObNY7+Dz@q#W9G07XM?eoAIqC2kF(^SNq(8W=oX{an^L
HB{Ts5RU_#;

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-hdpi/key_certify_primary_ok_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1804b2c12020a275f5541c43c52902505ba9102
GIT binary patch
literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-US2=4;QcT#e)C<0cJ@=
zK~zY`<&`l?LqQORzZfMTzCu)xr%fOUSP7ZdS}=zZqId!!rG?-*asmqvFl8D|omeOq
z8WYeM3x8paiM|bK#DQVo&i*t1?#%34_*Y_P1v4we_$)+n>`61rVkE)7#>=@9m>EC?
zSl7G)T)X>xQlvmN;6+-?5<D}3nI%9K$VscR&8^4>KtGuGW&2ff!7j_ds`9)HtN@!D
z*CuS{4Y&uMfLo2vz#Z`5?l<E_?g2+Z8nT>zLt2z=Bt4y!q7G089tDb(k$mfl^_4(f
zF>v>j5D+09`3}Mk%ZG?=w~LwK?pJA=ZUNgFPLu!GpP$M1+agm)JWbQ0a{QCD-2Gxw
z@TqMY0JHRZGUgL?4@wybN;6$FGb;ka3HWiJp|H^>C<Cu5@)FPj4y7&GM#7Y5A=uG{
z>j4dSKi4m!ukVJ|a>7Ov>;g@9KL*;Lg$#<>)>>28=%+D>z$dX!>EDre3*~?V$dqz6
P00000NkvXXu0mjfKR>~n

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_depth0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e61c1bbb290b58150084c1c82332ee1d27350c37
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c
z!@6@aFM%9|WRD<U28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5ln4y)
z32|-Mz%cWGF}2YD|Npl-tX2XVE>#lb2XrlyO|$I0tQqPlMfE*1L#^iOD0t2hn{L7S
z!#qX`sERSk+ucQ~H2sMYki%Kv5n0T@z%2~Ij105pNB{*3JY5_^Brcbpf6dpRz`>eu
z#mMWhk8bUM@wcnA!~Z<0VK!r^>-x;qvSLAI+{CRx+umr(CQbic7f|J*B(qiOSFKdf
zlHE%hi}N>CxNHf&H|s59nV$Mx)^!c)Jd7vB1040c`Boi}YBcP~KKHV&XZiZ==3l<C
z%)i;qvj%9lYKdz^NlIc#s#S7PDv)9@GB7mJH82ID5F<k?17j;w3vB}<D+7a+Lz@nu
dXvob^$xN%ntwD4?R}D}DgQu&X%Q~loCIF0Ws;&S4

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-mdpi/key_certify_primary_ok_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..11a25b504bbfd186407d0b9f1cf225e02b0cab42
GIT binary patch
literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmPqD+{lHl8FSr9Z=|-r;B5V#p$h=4ZWNl1=t>(7r(rc
zy&_3dX~}H8q}-{&72MYT4_LpLblsIv=<Pk)Tyil)E6bRX_gBvXX8YaNpWoYW-punq
zQ}CjT%jM&lbr&SW_ia5Z&*GQ0_vcgxmjiNTulKb7J`?kv({;{+l?Fdw8RdkuG0P;g
z-)>!-Dw7}aVB?2|*JtLK2`U;dpOM_Mjm0cXC^tN(r83P=`H`@vOHX0fbJ50BQRkS{
zXKycA{y6bs*SmeWx2<I!mbxZ%bjM^K3-^urQu8`#ZoI`2@2NH#d#1iGh;3xFnj^aF
z(^}OH{in~^9Ov15D?V&Zc|}|8;o!rje=c{{vVUauc%J?894{~g7(8A5T-G@yGywqS
CVvuzJ

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_depth0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3e8bf0f3f3c91b4731670be8dd42838db15037f
GIT binary patch
literal 722
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!D<ErgLuK5U4b@0iOB&z
zA+8M@7-k+Y9z5v(|Noxe2{l0H8I%P11v4;kx=+-bQ!ztm;mnx%&a=4XbxeJu(#j_n
zFPb|$Xr7hwRMu|x1tH<JHFAPE#%yAn^0FTS^)e=TySo^yyQBLA$l)yTh%9Dc;1&j9
zMuu5)B!Ge+JzX3_EKcv8^jfG%L8L{Mw_jG*Sl4^;o3v$DfA5dYFkK<=w>VuU_1o-N
zizJEWY?EKiGoHyG*tEq=GT2JZ>JZz8QpR&Eg^x0nVxAP43dZqP*gyJdJooB>oL`Y#
zr{}YG8$_*3$`M&VEpP|Nvwz~z`9iap%2+gg&0gmpnzqm>N4u+x=a<=r*y`@;ok{m?
zTPBxsoS5@ZlmECF<MCz_zalH{2Q@)G)(e;xG$u`%Ugo-vVclC_F)oEnnbTQuop0{{
zFgf`6;?Co{Z}>9#utZJy8Xg(o@bg{RjJx+Ys~@vH?6psO=MU4C?_d5N-@LoduIJzv
zCdoHKjd!_(Rsub*TH+c}l9E`GYL#4+3Zxi}3=B<l4NQS3#K_Rfz}U*vLfgQ|%D^Dy
g(53?@8glbfGSez?YY?5!1&TZdPgg&ebxsLQ0EgohZU6uP

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_certify_primary_ok_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ca1572cf0232686725f96b541b8efbbd1a24fd
GIT binary patch
literal 623
zcmV-#0+9WQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-US2=5ID(t_Cx>x0sKis
zK~z}7?Uz4mQ(+Xwe>c(8P#r8%B#7uxun2WHn}bWYd=9~(L$%IM3QobX2!4TXU0pi5
zJ%hz>pb!U1hbpF~NnD=5B~A3+`-Y;>126Zz=Y7vT&-u@V3;LfaBAOA=O!-DF5yK;|
z%5*6aK-<sv=L#Sq05*VSzi$AClFlatR@4Sgz1mfj17sDgUjg0#eY39s&wyT8AhiVR
z`#E;Msu!wO!Dc~TIsm&o|Go(fW?UWkY_9Adb08v+L_{nDH-KwE6S(R9Rp2^s3uw&w
z-Y?(_a0Gk@j)AYhPw&4;`Z3XUCJ7_rIq<+1j=hFelGQW@>Xy%d%fLrToiiaYst&O4
z%R^w4pnPKBC}+gJq)t9G*_^mP1RmR^Sz@;wJ7n)9eV9J1&ywhNyPsRF)+hJ*(E>v7
zTGC<ZMidb%z{^}5%PJoNFC_J<mSGQg>I@#2RDNvPUQ#P|!Yl!Afs=v&mVhU~$=|wT
ztzhe2^Ux_ur@&f~)?Bm|->U%N{vv0=ddVcr?6rjfxHE^}pPGt!y1S@hbbHGBNn<&X
zv@K~HI500?DVb%HJ+Pje4RsHj9Z7q+MBM{+d{+0}fn}2cOkz0%b|t;?w40_QpY8fC
zMe?8sfUvu_0Od+^R=IksEr%sYp@?Wi#A<^4YD6?He&POU`VCTEuj={Yi#h-R002ov
JPDHLkV1kF84le)z

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_depth0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a19eeae90f78856ab60e531dfbdfa0c56ffb5731
GIT binary patch
literal 889
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq8sKd6mGxU^Rn*LA+qju0R{0#P$H6
z5Z8tc3^NZH4=wcn|Nk|%E*?NH*pvkM1v4;+gwM2@)iy(UUM|=Cz|iT_tY$aMunQ}i
zI{GCw=_ORO_AOp8H+_!3IX_cpqK8?0`y!pns;R~`g3>N}J>@@u<}fCCySvyd&q_QG
z<Zu>vL>4nJa0`PlBg3pY5<mqRo-U3d9>?EKxmnd@AmAq4Y2mWCRpVWkcGvH9Z-4I(
z=WdEpFpSy$KX%`HnHfGtjxX%{pA<>5`kvMhnACgzb(P)Z00xbe0~;MV7qW$!cR6r~
zT>UAeY@eu_y3nU7WJ+uQ?u1pJ#P)OF2@+XVAiiMLvFjR~&e=tm)|t;*Teh5gBEwz3
z-B)w2ytTNw`pevd1tw|2>n2B(*d;!`Sn%MB_TG-;8LuX7FI>)H-z!;r{IcY)($Hrj
zDHazhYvkFcOC0D;>9+~aXn48QL{xv8QsPdJy)Pv!tEARhdl*PctPQ&LdfkMSN!M)7
zect+|tU^c6!2j4|-%tF~FEjFm*S4<RvLv?Xvh~Uh{#@0P^&Z);9hIgmK6Ll-#olef
z(>Rt-u#6YjHRteAPbHRMMxW2;#guzl?H4B9ldmsWzdfUN_pj26{tq{9{jy-zbWfgF
zzl7vs4c9z-DqR=*DEwwk*yl5EwQ7uVwcjcwr`&we|6E#%N$R<wp1CtHB2-IUBT7;d
zOH!?pi&B9UgOP!uiLQYu5QP{SS{WEynObNY7+Dz@q#W9G07XM?eoAIqC2kF(^SNq(
P8W=oX{an^LB{Ts5BI;+I

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_certify_primary_ok_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..44754152fb72f046521ccc44eee8a0188d2bc232
GIT binary patch
literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-US2=5fJ6nZ~p)Q0|!Y&
zK~!ko?U+kz6Hye$f77%UtyL^h%0$poON|s4Jqw`}K?NUi={ImASoh+>jR^e$Y7y5i
zMR4V+D^XmWO?Bf!+D(n9P^wi)n}-X}=op)1GMO0@oIhN0lQ}t$d!Bb7MT!(D8bL&|
zB9e_$MqkV}oUzrj2AsCldj^QeEZ_i+?R(Ax1)yrH5SNht7)~Bw92f<*?B`Jt83*2~
zYIl3U6f6LnzMnUNLe$E~Vt|P30;VngJvhL$J?r`$I9GT2elJ|?1q04Dd3LI+4G@u;
z7KLHJXu8$|7l2BW=M|&rJ_AJLAdss|-g-Dd&S)cn)25Pxz;0j<khT4=?GFP70`RN>
zAAl9$6YvGtu>EIXLsd(m4G@vzz$7qa&1e|d3GBBJsQEf<%~q#}=vXxL***h&1iqVr
z?}4wt8&zFu7(ya~5sUz{z?hxx5bzBsSvf5G4CoZzfs~DR$z%<g>@m}2L{*op)Bi%o
z|D{+gdPb=0x(;y6nEy)*08do)q3ISp2SnrqaK%o>Nm%h3umiZSsxKQ6Wtwp)7K^K{
z>%Im~nkSqDmCpe4s`{$qDkLI%fq7q&#jSi5xS^`+QT2g!;F^8LjkaV3GQbk2s;bw4
z<(RzS0Lvz$8g%r|1m*6lP|sY~%>suaDx;nr&sFu#c9kZwPF$B4=YdNRl-WMuk*YpT
zdKP*S(Ur8{cqKQ?SvQ=t?%65Iz+`=gjnx2)(R_>1IVdVXKJ0zDlMp%@Q8jXmSK<cb
zA}pb~q;p`Z!Nol+HjQUu9++qm|K2RKVk^_4XH<-5s1g<i`2dOeKrJ)nXNkGoLS7zt
zoRkNSG#P&vRdo)~KMR-60gFac3&=D2PHY$QTl{|SS+kQ}0q&~mT8sbh1Lo`wUH0iP
z0Nhm7)z~~>&1RymfmMJ7RlN<Y1z@vgv<r24v<2kbZD?&7U?Dwa^Uq)55~LaVXtoQh
zwi{ZQ5V{Av3lc7E@btpURn@Dp-84jG(0er)c6MnJnuy4Zy?aWLBE|oLA9hs+#=YsC
Qxc~qF07*qoM6N<$g3D-#<NyEw

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
index 5552757ef..a6d147cc1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml
@@ -27,12 +27,6 @@
             android:id="@+id/certified"
             android:src="@drawable/key_certify_ok_self" />
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/primary_user_id_icon"
-            android:src="@drawable/ic_action_important_small" />
     </LinearLayout>
 
     <LinearLayout