From 538be96e61f5b6c2c39b02ed2f1550a1a6a9a2c9 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 15 Mar 2015 21:41:04 +0100 Subject: [PATCH] work on certification ui --- .../status_signature_verified_inner.svg | 77 ++++++++++++++++++ Graphics/update-drawables.sh | 6 +- .../keychain/pgp/linked/LinkedResource.java | 3 + .../pgp/linked/resources/DnsResource.java | 7 ++ .../resources/GenericHttpsResource.java | 9 ++ .../pgp/linked/resources/TwitterResource.java | 7 ++ .../keychain/ui/adapter/LinkedIdsAdapter.java | 2 +- .../ui/linked/LinkedIdViewFragment.java | 30 ++++--- OpenKeychain/src/main/res/anim/fade_in_up.xml | 11 +++ .../src/main/res/anim/fade_out_down.xml | 11 +++ .../status_signature_verified_inner_24dp.png | Bin 0 -> 544 bytes .../status_signature_verified_inner_96dp.png | Bin 0 -> 2031 bytes .../status_signature_verified_inner_24dp.png | Bin 0 -> 429 bytes .../status_signature_verified_inner_96dp.png | Bin 0 -> 1437 bytes .../status_signature_verified_inner_24dp.png | Bin 0 -> 717 bytes .../status_signature_verified_inner_96dp.png | Bin 0 -> 3022 bytes .../status_signature_verified_inner_24dp.png | Bin 0 -> 1095 bytes .../status_signature_verified_inner_96dp.png | Bin 0 -> 4214 bytes .../status_signature_verified_inner_24dp.png | Bin 0 -> 1437 bytes .../src/main/res/layout/linked_id_item.xml | 18 ++-- .../res/layout/linked_id_view_fragment.xml | 64 ++++++++------- OpenKeychain/src/main/res/values/strings.xml | 16 ++-- 22 files changed, 205 insertions(+), 56 deletions(-) create mode 100644 Graphics/drawables/status_signature_verified_inner.svg create mode 100644 OpenKeychain/src/main/res/anim/fade_in_up.xml create mode 100644 OpenKeychain/src/main/res/anim/fade_out_down.xml create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png diff --git a/Graphics/drawables/status_signature_verified_inner.svg b/Graphics/drawables/status_signature_verified_inner.svg new file mode 100644 index 000000000..554df0643 --- /dev/null +++ b/Graphics/drawables/status_signature_verified_inner.svg @@ -0,0 +1,77 @@ + + + + + + image/svg+xml + + signature-verified-cutout + + + + + + signature-verified-cutout + Created with Sketch. + + + + + + + diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index 8da894725..a2da5bbfc 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -22,7 +22,7 @@ SRC_DIR=./drawables/ #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg -for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" +for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "status_signature_verified_inner" do echo $NAME inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" @@ -32,7 +32,7 @@ inkscape -w 72 -h 72 -e "$XXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" inkscape -w 96 -h 96 -e "$XXXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" done -for NAME in "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" +for NAME in "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "status_signature_verified_inner" do echo $NAME inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg" @@ -60,4 +60,4 @@ for NAME in "first_time_1" do echo $NAME inkscape -w 512 -h 512 -e "$DRAWABLE_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -done \ No newline at end of file +done diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java index e954a514c..f91a24d57 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java @@ -15,6 +15,8 @@ import java.util.regex.Pattern; import android.content.Context; import android.content.Intent; import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; + public abstract class LinkedResource { @@ -102,6 +104,7 @@ public abstract class LinkedResource { } public abstract @DrawableRes int getDisplayIcon(); + public abstract @StringRes int getVerifiedText(); public abstract String getDisplayTitle(Context context); public abstract String getDisplayComment(Context context); public boolean isViewable() { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java index 253e611a8..21c3a3eef 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java @@ -2,6 +2,7 @@ package org.sufficientlysecure.keychain.pgp.linked.resources; import android.content.Context; import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; @@ -103,6 +104,12 @@ public class DnsResource extends LinkedCookieResource { return magicPattern.matcher(res); } + @Override + public @StringRes + int getVerifiedText() { + return R.string.linked_verified_dns; + } + @Override public @DrawableRes int getDisplayIcon() { return R.drawable.dns; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java index 1e872c6cb..c6d5883ee 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import com.textuality.keybase.lib.Search; @@ -81,6 +82,8 @@ public class GenericHttpsResource extends LinkedCookieResource { log.add(LogType.MSG_LV_FETCH_ERROR_URL, indent); return null; } catch (IOException e) { + Log.e(Constants.TAG, "io error", e); + e.printStackTrace(); log.add(LogType.MSG_LV_FETCH_ERROR_IO, indent); return null; } @@ -109,6 +112,12 @@ public class GenericHttpsResource extends LinkedCookieResource { return R.drawable.ssl_lock; } + @Override + public @StringRes + int getVerifiedText() { + return R.string.linked_verified_https; + } + @Override public String getDisplayTitle(Context context) { return "Website (HTTPS)"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java index 32bf92a99..8bc872f51 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.support.annotation.DrawableRes; +import android.support.annotation.StringRes; import android.util.Log; import com.textuality.keybase.lib.JWalk; @@ -118,6 +119,12 @@ public class TwitterResource extends LinkedCookieResource { return R.drawable.twitter; } + @Override + public @StringRes + int getVerifiedText() { + return R.string.linked_verified_twitter; + } + @Override public String getDisplayTitle(Context context) { return "Twitter"; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java index 9727fab1d..e94ea5189 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/LinkedIdsAdapter.java @@ -201,7 +201,7 @@ public class LinkedIdsAdapter extends UserAttributesAdapter { final public TextView vComment; public ViewHolder(View view) { - vVerified = (ImageView) view.findViewById(R.id.user_id_item_certified); + vVerified = (ImageView) view.findViewById(R.id.linked_id_certified_icon); vIcon = (ImageView) view.findViewById(R.id.linked_id_type_icon); vTitle = (TextView) view.findViewById(R.id.linked_id_title); vComment = (TextView) view.findViewById(R.id.linked_id_comment); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java index c39e40761..502abe8e6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java @@ -7,6 +7,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.database.Cursor; +import android.graphics.PorterDuff; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; @@ -23,6 +24,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.widget.ImageView; import android.widget.TextView; import android.widget.ViewAnimator; @@ -240,6 +242,7 @@ public class LinkedIdViewFragment extends Fragment implements static class ViewHolder { private final View vButtonView; private final ViewAnimator vVerifyingContainer; + private final ViewAnimator vItemCertified; LinkedIdsAdapter.ViewHolder mLinkedIdHolder; private ViewAnimator vButtonSwitcher; @@ -267,6 +270,7 @@ public class LinkedIdViewFragment extends Fragment implements vButtonView = root.findViewById(R.id.button_view); vVerifyingContainer = (ViewAnimator) root.findViewById(R.id.linked_verify_container); + vItemCertified = (ViewAnimator) root.findViewById(R.id.linked_id_certified); vProgress = (ViewAnimator) root.findViewById(R.id.linked_cert_progress); vText = (TextView) root.findViewById(R.id.linked_cert_text); @@ -285,7 +289,6 @@ public class LinkedIdViewFragment extends Fragment implements break; case VERIFY_OK: - vText.setText("Ok"); vProgress.setDisplayedChild(1); if (!isSecret) { showButton(2); @@ -315,7 +318,9 @@ public class LinkedIdViewFragment extends Fragment implements if (vVerifyingContainer.getDisplayedChild() == (show ? 1 : 0)) { return; } + vVerifyingContainer.setDisplayedChild(show ? 1 : 0); + vItemCertified.setDisplayedChild(show ? 1 : 0); } void showButton(int which) { @@ -386,6 +391,15 @@ public class LinkedIdViewFragment extends Fragment implements mViewHolder = new ViewHolder(root); root.setTag(mViewHolder); + ((ImageView) root.findViewById(R.id.status_icon_verified)) + .setColorFilter(mContext.getResources().getColor(R.color.android_green_light), + PorterDuff.Mode.SRC_IN); + ((ImageView) root.findViewById(R.id.status_icon_invalid)) + .setColorFilter(mContext.getResources().getColor(R.color.android_red_light), + PorterDuff.Mode.SRC_IN); + + + mViewHolder.vButtonBack.setClickable(true); mViewHolder.vButtonBack.findViewById(R.id.back_button).setOnClickListener(new OnClickListener() { @Override @@ -459,9 +473,11 @@ public class LinkedIdViewFragment extends Fragment implements return; } if (result.success()) { + mViewHolder.vText.setText(mLinkedResource.getVerifiedText()); mViewHolder.setVerifyingState(VerifyState.VERIFY_OK, mIsSecret); } else { mViewHolder.setVerifyingState(VerifyState.VERIFY_ERROR, mIsSecret); + result.createNotify(getActivity()).show(); } mInProgress = null; } @@ -524,7 +540,7 @@ public class LinkedIdViewFragment extends Fragment implements return; } - mViewHolder.setVerifyingState(VerifyState.CERTIFYING, mIsSecret); + mViewHolder.setVerifyingState(VerifyState.CERTIFYING, false); Bundle data = new Bundle(); { @@ -557,19 +573,11 @@ public class LinkedIdViewFragment extends Fragment implements Bundle data = message.getData(); - if (message.arg1 == MessageStatus.UPDATE_PROGRESS.ordinal()) { - if (data.containsKey(DATA_MESSAGE)) { - mViewHolder.vText.setText(data.getString(DATA_MESSAGE)); - } else if (data.containsKey(DATA_MESSAGE_ID)) { - mViewHolder.vText.setText(data.getString(DATA_MESSAGE_ID)); - } - return; - } - if (message.arg1 == MessageStatus.OKAY.ordinal()) { CertifyResult result = data.getParcelable(CertifyResult.EXTRA_RESULT); result.createNotify(getActivity()).show(); } + } }; diff --git a/OpenKeychain/src/main/res/anim/fade_in_up.xml b/OpenKeychain/src/main/res/anim/fade_in_up.xml new file mode 100644 index 000000000..c190c0f53 --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_in_up.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/anim/fade_out_down.xml b/OpenKeychain/src/main/res/anim/fade_out_down.xml new file mode 100644 index 000000000..523b180af --- /dev/null +++ b/OpenKeychain/src/main/res/anim/fade_out_down.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e9dfc47a4beca539b7828cb5bfbca6173dd3663f GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSc;uILpXq-h9ji|$mcBZh%5#Q z{{dmf!&Ps000kvWTq8&P>lsEGaEY)h$ac%1p~lP0>v*Ey*t}nR!Zpm4Sh=$kW9!B%<~0^^IOKfg)@V z-oI;7XcQ1}QRElUS(7u#XwtcIkHm?3OHL<=wrttw>^0lLDp=wm`v#825GMgaW=&qj zt{852iD}k5H!rr{J>lm=lilg>YOKGX;gL@2S*E$ylez73W6?{8oh1umj`49Ro@o&< zbLQB*m9N9FZ|jEMj{Jyo-})st$0g*wHaAmaI+XlJipjO+sLyJJFNG5h%z5njI-Db# z)91+PYv~;43#T5aSyB4OHd(A-)`6Pi&0&rlH+&QRB`p1BW$M4J>-&rUi=XEny|YK^ zW&70wXCAw6{2{KRQZ?_9QR7X?pI+$(dykmSc@Vksc_3%ZI%S(Z`4<)>N$Y*s_2TD@ zAOG~jq|YX?ZRyy{6>=o;=<|H3`!c3!E85FN&rb`f&FWgos&(*M!L)-i$?HS|GP%EN z8%%$in9mxr;8)(g(8JLdJG7Sxu3)KdoX`5q_>hYuYZj;V%J$UDTt^QDPyYWt{`d+= e5G>;>;njZM`uc3)^QXXwV(@hJb6Mw<&;$U!4C5XE literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_inner_96dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4a3f2b2b5b840d87603f3e3d2184a3cd27a2f64f GIT binary patch literal 2031 zcmcIl`#;l*AO36~a|umhEn1W2vM-y}!DJaCwww?`8`)Yj%WW~uF_+P|i%61FI~}D{ z`@TBeq=-&#AEh(VNmj&nXzBKH4;{m>@B9zv`+mKi_w#z5*Ym^k+fx`C9B8`6Y7GDY zrgWNrn2sf@Fx1!mXH<5lj`Y%Z(IX6Xmu-0Xv`!ldXa~{(U|szxV3#@JPC9d=aCfvY zJT+b@VyAHdkw`@3rzECx*a9vwHI4V{{?cKF000ADy1#EkX2ryn#NycfmhwC;Bd!n7cXbc2_Mw}&!^56#HFFCn zPAEuVJZg*J@Cj{dgB$iZs;%#7BdVe0-rvvE!WZ*T+oR1LeUool4TF{>>UDIstntWy zmX@ohq$4k{{6bMz%}V>nE>*awAN0Pu8`tG2s%#43{wg~dDfE)am|>C*I_zH#h~FzL zuBH8>0)fNeM>1m1anN`lN|Hgd%g7#j$W#{T&At?5DvG`Vd>1U{Bfq&TkwRD5GaAgw zU(uOg3Gcc(-J7dAq@*aZJs%DmCm7NLfd*-8wq$F*wO#Th*YV|E8tn4NBB&EJ|1zF+ zPIiHT?g|Z)=$F>6%Y1hl>s@HuDz@6BsQBdOLn=GCW*m$>JN>tHKA}!6FFBGDCh@^} znLoDn;1-b7;kkC>XE*jN9X3Awd5^sl6*7Wi%cwXyjC1+YPEc>l2wX*JW!LvN+k1Rr z%K#XS0WO(jrm*_r0A3%}44sbZhuixr_NbU`DD6I$-<#*BENluwK%TyQAYRj~lKQ39C#+1%f z8SruDsLHK%n>R}{q>>uz0_SO-2J`E_)k4(`NvVd#boBMAYH;=W9 zI0m{fAQq+PU`JIyekI_*MseV?Ki-92JchxbkGTlyCXVNCv;J)sMd}O4`Qg+CtO@}k z?Q&$T15S9&v~5vKrESVo5z@;{GV{IoQF>$j`uPeO6Ze+|uAmFx>B$GiukKvt;5;Wa zQ{3-Y7n!VN*5tcz`vhCf%A;8Ice`{`n-QTZShcZe{=XlgNM&3lNqwY4QT282dY--- zezW1k;Lh_x1ssPl9%vgrgB0jh`zhSYP@2J815T3E^~@!C0^cdh^`0@w5i*5}>7P)7L_srHuF+iC@IVa@ zjqDjutey{-V@6;Ozb)&M~NA^JJDyw=kE|H#db3=^q{2|MwOZrt`u4YY+w`Y2|Zv<;l@kCVs9w z9`fYFetN9pCu3=$%-oUi;cb$$#^w$+V$hl(pxH z=fxOf>5FT26{gwjmuAc(1gi7#A0Qzv)-d~QH}h#m9hvMQ8>+dh2b2moeLnbf7vaOD za)d0z)%*6!!%wSCylH%+sIJ)ua=exj*z^1p*Ab9R9Itzij4@miw+9aKG*JZPolDLQ zDAEPrpgyC!){VmB6K64NZ$&waVSqlR@IEjEG%Dt{Vvx7U5nCXOvdI42+OebG3vcVu k;%l5;;1|08FC(LcS)DRKms{~fy4?lnyMz6!cCiZn2kM82y#N3J literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..28e37d9f3202bd739196f164d862cfc216955120 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf4nJ zFas4c2QdmTsCWSdB}-f*N`mv#O3D+9QW?t2%k?tzvWt@w3sUv+i_&MmvylQSk_RaY z$t=l9Whl-}&r2*RElSlbOD)Pw%S=ttO)f3TFD;pQN`Mup^uMQzV~9uR+pFunSRF+g zKHl$W66bC53^)_clVot)=aF$t&Ue=wy9VDic5NpU1VtuGxcV&0DAd_)p!56tu5cF_ ziw!d8YVMzz$t<1JvutPDGOz#Qe>xOeHpn?etkvl-^plx!San`uK-6d7gN8{$xA$^x zh;NwxrHpw^YVOI0*CoCv9njGe`k~!6^{eTESe@xl`nlFhUX@$HWOsyHZo}j!-#^Se za9%1uhDrW`Sz}E?kEo5>Pivhrv6M;9dqkr?PN~_Sy!z_wt9uTr<#A22IkvWaQDTx< zK~%&1@>#p4Ew(&$?4z7_EQ=zu$vS~UY|oN=!q=KT`F)E^Eq4F^`VZe(;~$u=3l;4Q RUI`2e22WQ%mvv4FO#s(hrLh12 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_inner_96dp.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7091df03f7e590bff288d8c128a37cfa33a9de GIT binary patch literal 1437 zcmbVM`%_X06utsCMb}Kq$C^fgXyv2Qa!5+i@d0S2rD^S!Xo?xWl54Q3aY4o)EyK(e zZG0r_BipofBSl-$HOs=HkE5neUu$&Y5q%Gjo18qR5C)OLGTv z001nhl%NAfrmv*gDr5bpf=x6MiWNwWHZw+^S(4D$qq8W7Sw=l=B~4uYPyS{ceh&r5 zK?gG#5IZ3|8DO*7o~ap3*71a_WY5g(l&W`o9E>9DiYPi2N=pVHT$LZwk zR7PrYlE?8JC^H9=JX`}Bcg|9S0-`xr^;Kafj>fDj?D22#6V~zd&Z|+{`fG{U@|g#d zO}@I?3(*EK?M5%$bWbGYBTWMdPLy8?5-m@F!KVC3)Gi!f)LI)Cfb)&qY=W1GHLvIs zBcqk~hj!=I^)_nj_%y=#SI`A!+Rke)D+(B&j$PNj zu|}PXBj&+wJT}4U5_IZ(5&NSXd3cS1RjYEh9rEV@R zA9`t4`V`qc_^{9PEqIZp!M6N-aUI}@^0D2+Ud6#5!aKQ=hw~Lk0`0p>H6%UltKCZ; zo>SNe4TGP+`@pbp1iM20WA{y8ChBg`dqWBu8&F?p<%A;-N6^KL)*UhZ2XFR8WL zyy0uSptHt3ujv**CBcofGW#9v&2dZaAs(TZq<(#4@$qf_6%xH@Wcb?C2w3VlNmLmp zXnKoeD1>tJ8}ca%07S8J_`n!G%a*>LM8L`UOfX9{fMT_qaX zudO)zFOuWXHgF2lK}yu?6%+gBV$bMWaRtE(ts57+%>0vwmZ#elAIPzT8YZuXCRp~n z@VWPhIdBtk_6Hnn1?LcEdSY;k@w~a}DOVfvh}ZheO~M+U9-NtVv;OK&?qSb2gWcVH z@@sg?=II|c#F#)u`}1B`8$jo2ue4XShwC>?E?}m(l)=x{GFxDb!V$#otldI?ftf2Q zYg!_y-Z-7{G7+Q~%+gRhxk^NrZ4;L(s!ZWIJ?AyrZpUm|eEkAwYlvD{HTeW{``E|T zq)s>_@=wLI5HrBD6fEosX6Bhgx##Yx#4j0Fr5=LuN0wq*wTaxKnuJV~2}jd*P_wr^ zP`bb#idz&yQK6L~va8SvojD*;V;M3FPMKl%L_w5y?)_+huWm7YOQL^=xNeE!>-kT&-0fCGN|7+pxjH?J6X%z_g2roQ9%u(a~)NmsV} zyh8v=9h2@hbsDlBQ0lV!%eU6+Kk=RShI1-dhl?7cjjmO)wZL+|=!^Z->bD1!)@Rj~ z;S(_qnncu5p(GzU7BWIOa^5wTHLq%Dg&EG4i26mYbLS1rK!Y9xD00d6($_uXe)~G^ z>Dq^E#WKeLyF|tWCS;h&X~l#vV!9EPV(71vi`_l;EfM7LI2(M^<0O-B#G-|l!`pIt TecMsvmjtN65kWTt>HPlz;8uM8 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ea801c45a567c5c488c159810686f9903339c52c GIT binary patch literal 717 zcmV;;0y6!HP)SS~#d$(2iO(&XOUoC^8Dneybx_nZ5iB-{{V^gm}J zHNdFp1X8CHNS#g~bvl96=>(cc2;p`JVKIadYM&fqOuBF$8;E#{*;?l(hTo5$IedS8 z!jWp{b2yB~4CYOjztY%L*#S-io) zf|9qGi!rWM>DTHA<&Vi_#qhsyu_`>;9U&|z9-D|OwR^S*KZo@a_?2P$wz3C82s3z% zBLyWNaWclZTDSL5dmw}`S@V>Kis66D=Ds#O>W`3Y1AfAViuE^?&;8AjMzbdTZoC?} z_+3nv)E~!M3H;-c_f}1Tds{%f#DOhpr|`Z6{xfD;6Tqbsm>-zmRKHwOzb<=OjRap= z0EcBSnX*~#;T8feZ&SO_1bp3J;A#blh-X+WIsSy~@!hIGE^!p^Do7Nquh`oZd~JbT zVhSrm!1r*fN%)}z21Kq^9I5_VY8rkdfn4I)Hjm2wdX9-5Cy+}_<53CxckCMnd?Nw_ zBG>)<*4@Claltn#kV~AvhXH{*ggtnGLpU2_>@|9U&DU#M;BVs)rsJ@m z$aStWE`hePBmNs5C7nR(bONc<38YRZkUD<=FgE1xlfP*r00000NkvXXu0mjfgvvN@ literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_inner_96dp.png new file mode 100644 index 0000000000000000000000000000000000000000..61610df195062c1d742b74569a52ca03b8caec0b GIT binary patch literal 3022 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 W_`X*Afgj|u8jzeliFX_+=l%za2U8LN literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bcd73b09b34530c0147ab2514f13e6c91e70aba9 GIT binary patch literal 1095 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf2?7 z?;y;m>}IA66qGD+jVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw{mw=Ts7M~9C?vBa zCzYW%Gd(Y{q_ikiw=A_NGc7YUMK`&$B)_y|<|zSI1_tJto-U3d6?5Ls^6v->m1v)T zKcj7>fTD|TR-hA4@C+WwExeniUQlA6v>;G%<%$JUFF0v%a5ZrhDYE>XcqOW1HP5XM z)x|Cbjjk`0m{bj1q;!?*_1=k}Ft|Ub_+9zC^7m6eABa6;{(aB$z31nAxBfoIc$06U zg>bI=h0?AC46XqUN*WG=A`3XU0$5lznwUf!88L)+q_TL-z4 zrt%z$Xsqe{y6RB$cYqrEcc+lMdElv=Q(bsZ7QdJ{@=y-X6dZ2Y7P0qx8fMy$xWXl zqnsgr_1E&g73&+n3%&c#Ur{ut$W6>-!WWJY#lD`J*P|a#o9ueQ;ZoFt&umX+*u%Cc zYP^o}x#YL%ZRec-E(L-&GJb#WF zUTD_aS4}bs=S}8+u-d@9^q(4ug5`TaS+eWZWtxW8U5)ja8T+V8Vr!jev} nn|Apv_Yd1mD7C{gfjPsyO|Q=ROnt`;%+Cy-u6{1-oD!M<(RSQN literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_inner_96dp.png new file mode 100644 index 0000000000000000000000000000000000000000..71e563218ff9f13f33dde7efd0930123bb9bc356 GIT binary patch literal 4214 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 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/status_signature_verified_inner_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..cc7091df03f7e590bff288d8c128a37cfa33a9de GIT binary patch literal 1437 zcmbVM`%_X06utsCMb}Kq$C^fgXyv2Qa!5+i@d0S2rD^S!Xo?xWl54Q3aY4o)EyK(e zZG0r_BipofBSl-$HOs=HkE5neUu$&Y5q%Gjo18qR5C)OLGTv z001nhl%NAfrmv*gDr5bpf=x6MiWNwWHZw+^S(4D$qq8W7Sw=l=B~4uYPyS{ceh&r5 zK?gG#5IZ3|8DO*7o~ap3*71a_WY5g(l&W`o9E>9DiYPi2N=pVHT$LZwk zR7PrYlE?8JC^H9=JX`}Bcg|9S0-`xr^;Kafj>fDj?D22#6V~zd&Z|+{`fG{U@|g#d zO}@I?3(*EK?M5%$bWbGYBTWMdPLy8?5-m@F!KVC3)Gi!f)LI)Cfb)&qY=W1GHLvIs zBcqk~hj!=I^)_nj_%y=#SI`A!+Rke)D+(B&j$PNj zu|}PXBj&+wJT}4U5_IZ(5&NSXd3cS1RjYEh9rEV@R zA9`t4`V`qc_^{9PEqIZp!M6N-aUI}@^0D2+Ud6#5!aKQ=hw~Lk0`0p>H6%UltKCZ; zo>SNe4TGP+`@pbp1iM20WA{y8ChBg`dqWBu8&F?p<%A;-N6^KL)*UhZ2XFR8WL zyy0uSptHt3ujv**CBcofGW#9v&2dZaAs(TZq<(#4@$qf_6%xH@Wcb?C2w3VlNmLmp zXnKoeD1>tJ8}ca%07S8J_`n!G%a*>LM8L`UOfX9{fMT_qaX zudO)zFOuWXHgF2lK}yu?6%+gBV$bMWaRtE(ts57+%>0vwmZ#elAIPzT8YZuXCRp~n z@VWPhIdBtk_6Hnn1?LcEdSY;k@w~a}DOVfvh}ZheO~M+U9-NtVv;OK&?qSb2gWcVH z@@sg?=II|c#F#)u`}1B`8$jo2ue4XShwC>?E?}m(l)=x{GFxDb!V$#otldI?ftf2Q zYg!_y-Z-7{G7+Q~%+gRhxk^NrZ4;L(s!ZWIJ?AyrZpUm|eEkAwYlvD{HTeW{``E|T zq)s>_@=wLI5HrBD6fEosX6Bhgx##Yx#4j0Fr5=LuN0wq*wTaxKnuJV~2}jd*P_wr^ zP`bb#idz&yQK6L~va8SvojD*;V;M3FPMKl%L_w5y?)_+huWm7YOQL^=xNeE!>-kT&-0fCGN|7+pxjH?J6X%z_g2roQ9%u(a~)NmsV} zyh8v=9h2@hbsDlBQ0lV!%eU6+Kk=RShI1-dhl?7cjjmO)wZL+|=!^Z->bD1!)@Rj~ z;S(_qnncu5p(GzU7BWIOa^5wTHLq%Dg&EG4i26mYbLS1rK!Y9xD00d6($_uXe)~G^ z>Dq^E#WKeLyF|tWCS;h&X~l#vV!9EPV(71vi`_l;EfM7LI2(M^<0O-B#G-|l!`pIt TecMsvmjtN65kWTt>HPlz;8uM8 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/layout/linked_id_item.xml b/OpenKeychain/src/main/res/layout/linked_id_item.xml index 5fc5e78a8..900d3a5d5 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_item.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_item.xml @@ -1,10 +1,12 @@ + android:singleLine="true" + tools:showIn="@layout/linked_id_view_fragment"> - - + + + diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml index 106d2343f..2fb79a4bf 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -38,6 +38,8 @@ android:id="@+id/linked_verify_container" android:inAnimation="@anim/fade_in" android:outAnimation="@anim/fade_out" + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" > @@ -49,36 +51,6 @@ android:orientation="horizontal" android:singleLine="true"> - - - - - - - - - - + + + + + + + + + + diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 3e46a7328..4902485b0 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1304,6 +1304,16 @@ "More bla:" "After successful verification, press the Finish button to add the Linked Identity to your keyring and finish the process." + "Verify" + Text has been copied to clipboard + "The Website has been fetched and verified." + "The DNS record has been fetched and verified." + "The Tweet has been fetched and verified." + + "There is one more unknown identity type" + "There are %d more unknown identity types" + + "A \'linked identity\' connects your pgp key to a resource on the web." "Please select a type:" "This file claims ownership of the OpenPGP key with long id %2$s.\n\nCookie for proof:\n%1$s" @@ -1315,11 +1325,5 @@ "Add Linked Identity" "Linked Identities" "Finish" - "Verify" - Text has been copied to clipboard - - "There is one more unknown identity type" - "There are %d more unknown identity types" -