From b573afe2359653d0ddeb9f35075ca22af40b0ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 8 Oct 2014 17:32:32 +0200 Subject: [PATCH] New decryption screen UI with modernPGP icons --- .../keychain/ui/DecryptFragment.java | 168 +++++++------- .../ui/dialog/UserIdInfoDialogFragment.java | 8 +- .../keychain/ui/util/KeyFormattingUtils.java | 141 +++++++++--- .../res/drawable-hdpi/encrypted_small.png | Bin 2187 -> 0 bytes .../main/res/drawable-hdpi/overlay_error.png | Bin 1986 -> 0 bytes .../src/main/res/drawable-hdpi/overlay_ok.png | Bin 1702 -> 0 bytes .../res/drawable-hdpi/revoked_key_small.png | Bin 2509 -> 0 bytes .../main/res/drawable-hdpi/signed_large.png | Bin 5928 -> 0 bytes .../main/res/drawable-ldpi/overlay_error.png | Bin 1192 -> 0 bytes .../src/main/res/drawable-ldpi/overlay_ok.png | Bin 1038 -> 0 bytes .../main/res/drawable-ldpi/signed_large.png | Bin 2611 -> 0 bytes .../main/res/drawable-mdpi/overlay_error.png | Bin 1539 -> 0 bytes .../src/main/res/drawable-mdpi/overlay_ok.png | Bin 1305 -> 0 bytes .../main/res/drawable-mdpi/signed_large.png | Bin 3858 -> 0 bytes .../main/res/drawable-mdpi/signed_small.png | Bin 1576 -> 0 bytes .../src/main/res/drawable/overlay_error.png | Bin 1539 -> 0 bytes .../src/main/res/drawable/overlay_ok.png | Bin 1305 -> 0 bytes .../src/main/res/drawable/signed_large.png | Bin 3858 -> 0 bytes .../res/layout/decrypt_result_include.xml | 211 +++++++++++------- .../src/main/res/values-cs/strings.xml | 8 +- .../src/main/res/values-de/strings.xml | 8 +- .../src/main/res/values-es/strings.xml | 8 +- .../src/main/res/values-fr/strings.xml | 8 +- .../src/main/res/values-it/strings.xml | 8 +- .../src/main/res/values-ja/strings.xml | 8 +- .../src/main/res/values-ru/strings.xml | 6 +- .../src/main/res/values-sl/strings.xml | 6 +- .../src/main/res/values-sr/strings.xml | 8 +- .../src/main/res/values-tr/strings.xml | 8 +- .../src/main/res/values-uk/strings.xml | 8 +- OpenKeychain/src/main/res/values/strings.xml | 21 +- 31 files changed, 391 insertions(+), 242 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/overlay_error.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/overlay_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/revoked_key_small.png delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/signed_large.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-ldpi/signed_large.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/signed_large.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/signed_small.png delete mode 100644 OpenKeychain/src/main/res/drawable/overlay_error.png delete mode 100644 OpenKeychain/src/main/res/drawable/overlay_ok.png delete mode 100644 OpenKeychain/src/main/res/drawable/signed_large.png 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 6f521efa2..60874de63 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -21,16 +21,14 @@ import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.RelativeLayout; import android.widget.TextView; import org.openintents.openpgp.OpenPgpSignatureResult; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; +import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.service.results.DecryptVerifyResult; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; @@ -43,14 +41,19 @@ public abstract class DecryptFragment extends Fragment { protected long mSignatureKeyId = 0; protected LinearLayout mResultLayout; - protected RelativeLayout mSignatureLayout; - protected TextView mResultText; - protected ImageView mSignatureStatusImage; - protected TextView mUserId; - protected TextView mUserIdRest; + protected ImageView mEncryptionIcon; + protected TextView mEncryptionText; + protected ImageView mSignatureIcon; + protected TextView mSignatureText; + + protected View mSignatureLayout; + protected View mSignatureDivider1; + protected View mSignatureDivider2; + protected TextView mSignatureName; + protected TextView mSignatureEmail; + protected TextView mSignatureAction; - protected Button mLookupKey; // State protected String mPassphrase; @@ -60,20 +63,20 @@ public abstract class DecryptFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - mResultLayout = (LinearLayout) getView().findViewById(R.id.result); - mResultText = (TextView) getView().findViewById(R.id.result_text); - mSignatureLayout = (RelativeLayout) getView().findViewById(R.id.result_signature); - mSignatureStatusImage = (ImageView) getView().findViewById(R.id.ic_signature_status); - mUserId = (TextView) getView().findViewById(R.id.mainUserId); - mUserIdRest = (TextView) getView().findViewById(R.id.mainUserIdRest); - mLookupKey = (Button) getView().findViewById(R.id.lookup_key); - mLookupKey.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - lookupUnknownKey(mSignatureKeyId); - } - }); + mResultLayout = (LinearLayout) getView().findViewById(R.id.result_main_layout); mResultLayout.setVisibility(View.GONE); + + mEncryptionIcon = (ImageView) getView().findViewById(R.id.result_encryption_icon); + mEncryptionText = (TextView) getView().findViewById(R.id.result_encryption_text); + mSignatureIcon = (ImageView) getView().findViewById(R.id.result_signature_icon); + mSignatureText = (TextView) getView().findViewById(R.id.result_signature_text); + mSignatureLayout = getView().findViewById(R.id.result_signature_layout); + mSignatureDivider1 = getView().findViewById(R.id.result_signature_divider1); + mSignatureDivider2 = getView().findViewById(R.id.result_signature_divider2); + mSignatureName = (TextView) getView().findViewById(R.id.result_signature_name); + mSignatureEmail = (TextView) getView().findViewById(R.id.result_signature_email); + mSignatureAction = (TextView) getView().findViewById(R.id.result_signature_action); + } private void lookupUnknownKey(long unknownKeyId) { @@ -103,101 +106,114 @@ public abstract class DecryptFragment extends Fragment { } protected void onResult(DecryptVerifyResult decryptVerifyResult) { - OpenPgpSignatureResult signatureResult = decryptVerifyResult.getSignatureResult(); + final OpenPgpSignatureResult signatureResult = decryptVerifyResult.getSignatureResult(); mSignatureKeyId = 0; mResultLayout.setVisibility(View.VISIBLE); if (signatureResult != null) { - mSignatureStatusImage.setVisibility(View.VISIBLE); - mSignatureKeyId = signatureResult.getKeyId(); String userId = signatureResult.getPrimaryUserId(); String[] userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit[0] != null) { - mUserId.setText(userIdSplit[0]); + mSignatureName.setText(userIdSplit[0]); } else { - mUserId.setText(R.string.user_id_no_name); + mSignatureName.setText(R.string.user_id_no_name); } if (userIdSplit[1] != null) { - mUserIdRest.setText(userIdSplit[1]); + mSignatureEmail.setText(userIdSplit[1]); } else { - mUserIdRest.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), mSignatureKeyId)); + mSignatureEmail.setText(KeyFormattingUtils.beautifyKeyIdWithPrefix(getActivity(), mSignatureKeyId)); + } + + if (signatureResult.isSignatureOnly()) { + mEncryptionText.setText(R.string.decrypt_result_not_encrypted); + KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_NOT_ENCRYPTED); + } else { + mEncryptionText.setText(R.string.decrypt_result_encrypted); + KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_ENCRYPTED); } switch (signatureResult.getStatus()) { case OpenPgpSignatureResult.SIGNATURE_SUCCESS_CERTIFIED: { - if (signatureResult.isSignatureOnly()) { - mResultText.setText(R.string.decrypt_result_signature_certified); - } else { - mResultText.setText(R.string.decrypt_result_decrypted_and_signature_certified); - } + mSignatureText.setText(R.string.decrypt_result_signature_certified); + KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_VERIFIED); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_green_light)); - mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); - mSignatureLayout.setVisibility(View.VISIBLE); - mLookupKey.setVisibility(View.GONE); + setSignatureLayoutVisibility(View.VISIBLE); + mSignatureAction.setText(R.string.decrypt_result_action_show); + mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_accounts, 0); + mSignatureLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent viewKeyIntent = new Intent(getActivity(), ViewKeyActivity.class); + viewKeyIntent.setData(KeychainContract.KeyRings + .buildGenericKeyRingUri(mSignatureKeyId)); + startActivity(viewKeyIntent); + } + }); break; } case OpenPgpSignatureResult.SIGNATURE_SUCCESS_UNCERTIFIED: { - if (signatureResult.isSignatureOnly()) { - mResultText.setText(R.string.decrypt_result_signature_uncertified); - } else { - mResultText.setText(R.string.decrypt_result_decrypted_and_signature_uncertified); - } + mSignatureText.setText(R.string.decrypt_result_signature_uncertified); + KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_UNVERIFIED); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_orange_light)); - mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); - mSignatureLayout.setVisibility(View.VISIBLE); - mLookupKey.setVisibility(View.GONE); + setSignatureLayoutVisibility(View.VISIBLE); + mSignatureAction.setText(R.string.decrypt_result_action_show); + mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_accounts, 0); + mSignatureLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent viewKeyIntent = new Intent(getActivity(), ViewKeyActivity.class); + viewKeyIntent.setData(KeychainContract.KeyRings + .buildGenericKeyRingUri(mSignatureKeyId)); + startActivity(viewKeyIntent); + } + }); break; } case OpenPgpSignatureResult.SIGNATURE_KEY_MISSING: { - if (signatureResult.isSignatureOnly()) { - mResultText.setText(R.string.decrypt_result_signature_unknown_pub_key); - } else { - mResultText.setText(R.string.decrypt_result_decrypted_unknown_pub_key); - } + mSignatureText.setText(R.string.decrypt_result_signature_unknown_pub_key); + KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_UNKNOWN_KEY); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_orange_light)); - mSignatureStatusImage.setImageResource(R.drawable.overlay_error); - mSignatureLayout.setVisibility(View.VISIBLE); - mLookupKey.setVisibility(View.VISIBLE); + setSignatureLayoutVisibility(View.VISIBLE); + mSignatureAction.setText(R.string.decrypt_result_action_Lookup); + mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_download, 0); + mSignatureLayout.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + lookupUnknownKey(mSignatureKeyId); + } + }); break; } + // TODO: Maybe this should be part of the Result parcel, it is an error, not a valid status! case OpenPgpSignatureResult.SIGNATURE_ERROR: { - mResultText.setText(R.string.decrypt_result_invalid_signature); + mSignatureText.setText(R.string.decrypt_result_invalid_signature); + KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_INVALID); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_red_light)); - mSignatureStatusImage.setImageResource(R.drawable.overlay_error); - mSignatureLayout.setVisibility(View.GONE); - mLookupKey.setVisibility(View.GONE); - break; - } - - default: { - mResultText.setText(R.string.error); - - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_red_light)); - mSignatureStatusImage.setImageResource(R.drawable.overlay_error); - mSignatureLayout.setVisibility(View.GONE); - mLookupKey.setVisibility(View.GONE); + setSignatureLayoutVisibility(View.GONE); break; } } } else { - mSignatureLayout.setVisibility(View.GONE); - mLookupKey.setVisibility(View.GONE); + setSignatureLayoutVisibility(View.GONE); - // successful decryption-only - mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_purple_light)); - mResultText.setText(R.string.decrypt_result_decrypted); + mSignatureText.setText(R.string.decrypt_result_no_signature); + KeyFormattingUtils.setStatusImage(getActivity(), mSignatureIcon, mSignatureText, KeyFormattingUtils.STATE_NOT_SIGNED); + mEncryptionText.setText(R.string.decrypt_result_encrypted); + KeyFormattingUtils.setStatusImage(getActivity(), mEncryptionIcon, mEncryptionText, KeyFormattingUtils.STATE_ENCRYPTED); } } + private void setSignatureLayoutVisibility(int visibility) { + mSignatureLayout.setVisibility(visibility); + mSignatureDivider1.setVisibility(visibility); + mSignatureDivider2.setVisibility(visibility); + } + /** * Should be overridden by MessageFragment and FileFragment to start actual decryption */ diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/UserIdInfoDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/UserIdInfoDialogFragment.java index 968b2429b..57b171eb9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/UserIdInfoDialogFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/UserIdInfoDialogFragment.java @@ -64,12 +64,12 @@ public class UserIdInfoDialogFragment extends DialogFragment { } else { switch (isVerified) { case KeychainContract.Certs.VERIFIED_SECRET: - title = getString(R.string.user_id_info_verified_title); - message = getString(R.string.user_id_info_verified_text); + title = getString(R.string.user_id_info_certified_title); + message = getString(R.string.user_id_info_certified_text); break; case KeychainContract.Certs.VERIFIED_SELF: - title = getString(R.string.user_id_info_not_verified_title); - message = getString(R.string.user_id_info_not_verified_text); + title = getString(R.string.user_id_info_uncertified_title); + message = getString(R.string.user_id_info_uncertified_text); break; default: title = getString(R.string.user_id_info_invalid_title); 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 5c2bc76d0..a59cb175f 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 @@ -19,18 +19,13 @@ package org.sufficientlysecure.keychain.ui.util; import android.content.Context; -import android.database.Cursor; import android.graphics.Color; import android.graphics.PorterDuff; -import android.graphics.Typeface; import android.text.Spannable; -import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; -import android.text.style.StyleSpan; -import android.text.style.TypefaceSpan; -import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import org.spongycastle.asn1.ASN1ObjectIdentifier; import org.spongycastle.asn1.nist.NISTNamedCurves; @@ -386,36 +381,126 @@ public class KeyFormattingUtils { public static final int STATE_EXPIRED = 2; public static final int STATE_VERIFIED = 3; public static final int STATE_UNAVAILABLE = 4; + public static final int STATE_ENCRYPTED = 5; + public static final int STATE_NOT_ENCRYPTED = 6; + public static final int STATE_UNVERIFIED = 7; + public static final int STATE_UNKNOWN_KEY = 8; + public static final int STATE_INVALID = 9; + public static final int STATE_NOT_SIGNED = 10; + + public static void setStatusImage(Context context, ImageView statusIcon, int state) { + setStatusImage(context, statusIcon, null, state); + } /** * Sets status image based on constant */ - public static void setStatusImage(Context context, ImageView statusView, int state) { + public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, int state) { switch (state) { - case STATE_REVOKED: - statusView.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); - statusView.setColorFilter(context.getResources().getColor(R.color.android_red_dark), - PorterDuff.Mode.SRC_ATOP); - break; - case STATE_EXPIRED: - statusView.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_expired_cutout)); - statusView.setColorFilter(context.getResources().getColor(R.color.android_orange_dark), - PorterDuff.Mode.SRC_ATOP); - break; - case STATE_UNAVAILABLE: - statusView.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); - statusView.setColorFilter(context.getResources().getColor(R.color.bg_gray), - PorterDuff.Mode.SRC_ATOP); - break; - case STATE_VERIFIED: - statusView.setImageDrawable( + /** GREEN: everything is good **/ + case STATE_VERIFIED: { + statusIcon.setImageDrawable( context.getResources().getDrawable(R.drawable.status_signature_verified_cutout)); - statusView.setColorFilter(context.getResources().getColor(R.color.android_green_dark), + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_green_dark), PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_green_dark)); + } break; + } + case STATE_ENCRYPTED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_lock_closed)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_green_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_green_dark)); + } + break; + } + /** ORANGE: mostly bad... **/ + case STATE_UNVERIFIED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_orange_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_orange_dark)); + } + break; + } + case STATE_EXPIRED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_orange_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_orange_dark)); + } + break; + } + case STATE_UNKNOWN_KEY: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_orange_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_orange_dark)); + } + break; + } + /** RED: really bad... **/ + case STATE_REVOKED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_red_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_red_dark)); + } + break; + } + case STATE_NOT_ENCRYPTED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_lock_open)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_red_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_red_dark)); + } + break; + } + case STATE_NOT_SIGNED: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_red_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_red_dark)); + } + break; + } + case STATE_INVALID: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.android_red_dark), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.android_red_dark)); + } + break; + } + /** special **/ + case STATE_UNAVAILABLE: { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + statusIcon.setColorFilter(context.getResources().getColor(R.color.bg_gray), + PorterDuff.Mode.SRC_ATOP); + if (statusText != null) { + statusText.setTextColor(context.getResources().getColor(R.color.bg_gray)); + } + break; + } } } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png deleted file mode 100644 index 3ff8e9b97844dd04a32e1609a7ebab4e72145549..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2187 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 wtn=9Jt{+MfC;-4$1OV8x1OPxE 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 Gk^ceg`e~m4 diff --git a/OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png deleted file mode 100644 index e5a88e18f321072360ad296a085715611b9223e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1192 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijWi-X*q z7}lMWc?skwBzpw;GB8xBF)%c=FfjZA3N^f7U???UV0e|lz+eS5K)hhiu0R{01Y44~ zy9wy$!fk$L90|U1(2s1Lwnj--cEGuwK2hw1NFjTNh_cJgsCwsa$hD02G zd)d3gLl~#Pg>_AhoLTwx+?hvU~NqYHT#Nh)91>zIRYF;;a7SOBVz*t792^6)wI1X!Y(@AZr=B znL8i*nmHAWpFc88dmvgfrJQlfw43h@^%Vq|wtu}Lw?lsU?7I06n3ipnI{$dtk?k_& zZF&itq84&nsuyqh)YsE~|M2x6GRFdqY5%V6p z>Lll$JJ)k`?Md%Fy?f^}tX-2kX|sL$8pc=G-!7VS*7$|}*I9pKPDgYx~Sx?x>Z!QgqcE%hij6+1d^L%;sJGMf*cQady3r*kts$^Tc)KsPWsdG-um@ORUqAP4Uw)mFRI3Yje&D+F}0lj{rURgf;XE@lzTti+~KB!1|E;=PVE-7&C5zarJVmC#0 zZsfI`@_ydq2TS|P)g9ao*Xxz}9}S+E*{gNdaD9*)-`SO}vkla8Z!X;ONqNo5n^A_l z8DIYV{q%ZUl%?A>`8S{6iAecQo|Ei)l3O%EK9`t`4lDp%}n|;nP;iar5 zP2DYB?%rlRx2F{OpZsO?*Pr+1wiORfem-Mk5V_!stWGko-0Bmz4OYtPRy8QIxShaut^V1)rPUdsTY2L73a^>O){>f}!&Br$C zUk&38`&WH%+U`pGM^UB6yL+aYUdec69``Zm$?wDkr+>*wt(5(ej@)Wnk1 z6ovB4k_-iRPv3y>Mm}+%B2|#06rhw_^bc` diff --git a/OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png deleted file mode 100644 index 63374d47f52803a615e5058d5b9c364753cde75c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1038 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 VFfc?&jluu`002ovPDHLkV1mFhpDq9Z diff --git a/OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png deleted file mode 100644 index 5fe01743397074f190ca172e047de7852dc1f4d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1539 zcmZ9Mdpy&77{`BZAw-msf#a^ooGl4DaYXe+FEJ>e zr0G$rCRUYHaL)vlA8n&*`^|=3rE^{E@zbk?rcyD12DO1|!&J66!l{UtQt&cu2o?K0 zC_QQv{SbnjAdJ*ze}^sTHgCkmWg!E)v$nUHxhqYIyA-@x0>9JR2iWX)Q7!-A8H#wJ ztcqIM7F7JXWQvbevJZTM3{AI`cEYBjv`;VAy;mCE&BaW0TIJG7?Msckx*Rh9fy@57t3z&lNOAG&K<%pU7J|&6 z?N0W(BbjikQjHebSdYtYph#aMLx-ZNQp-nGo+ByD2I1OlBu5uBB4c=9$f&iiHsZ3u zG-uL4!XjVBNE%UX9_wW&pP_1D@R4Y<)kLP1>VUtnh}jo{WG9kxiN|z z6~(qXUie0dqi_mFU)AvHIl4@mwBW4#Bo>nAVk5L7l#~{IaWw{l)4kpN;kJ$MKl^g> zBrD*H3~#C)Du>!(bjh+cyjds8L-Y?~tmtcBEmS&xy*4e(KqU77HFY7I1%-sd5S|a)|Kg>YFNj=1 zH!s!RU#N%s2|Us;*&8?|dBH*L5gy%p^s5JVR=fNje)MpMJ2KZoW~~S|{WO~Cj|zw!i!>fLcRzy-aJr-Nk@jQX&sCJ*!Was} zc4AAhOSMjf?7hvCp))7(d5>78OBzNzyDBZ5d8esuYvtUlG-HP>{0zp~By_t`?A=A} znQF|`*4B--610#pX=IPj6Zz8DYvDmh)XS@3q1Quj%Fghhi0b~8xvuNUFS%d1)v%G- z4Ax+AO5S)Em%@I+C}>Ad)(n#t5^*MkP=^vP!FQSd){{+Ky%}{cgd+37-2rr_5{!qP z=TGuAGt_g&u+1-VFRWf_7*wRy?bn%?;$)>mG2d;!M(J`X35Zn6qX_q!+8+2)yC$LmR zo7yIh5=TrZI_umtEpK#m=3nMNtaJbX diff --git a/OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png deleted file mode 100644 index b4f332260fd83fbaea1798356597c6ea11b00deb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1305 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-33Sk!B6Mi^+1ZVz$3Dlfq`2Xgc%uT&5-~JmK8Xr18J~B7|y-x31?tnzT)ZP7?N@C z?G5ja*`XrrAMSfD+nR9HeRW95(hli^XU{CyF=3XYAZuYT%i4e(CA$xtUAr_`KQ@Yq z>@Iw?xho(iwnMK=R-U8D*K1;s;F5rqi$b-IHuYWhT-UAt@`|Ccr?I3u^XK^1n&)@k z|KI<-@ciG1LqgLww5Xn8+<1Xym+ML+rsq$@W_g4^S*_d>dWgH*&tavNQX$*CBWAqe9)09HA%FbYKEZ%BBAZG$UKa$j>sc@P5_g}YgF|z6sob>Q z)0-bEZ0q>3TA#(Fs!s0v!!EODra8SG%$iGE-#bZfUcInm2U~gBgHNp6mQI<{evIb~ z`^uoD7yejIn4vPIy=?oIv#gy{4=P98O?zp-fpx#S=I8gOKa;j9wC?GUcHJW(`20A} z*JoZk4XmEUSMMtPi_KF>uhhga@E zm)ZIsfzy5queAG`?ynTEMvQ}bhn)3CiF3JY{s-87Y8B`TUb!?vHuK)5JoC4cjF|8J z*&TL!dVt(Kuj7_;kLZ@|ZTTEEqptbujrH?-`1(`lyX_E>fBea8y;Z~P!ih;6Q)k$ zuQ!BF(|cQBy3PCL(vBOU>#v4A?&JHj>IUD_ga6Am?G*bMSEDbz&+1@mg`|7R%j!hw z-@=d%&F|#@#67nau4mVDMi-Wp6topDxjpr?b8<@iNjaOY_-dazrc{}^ zncttQFt|zA+AjU&zRBs|=60ri(@IwyOFP@#;BzETaA%A8hpwC(v$WNuU(c11eCF#A z+@ka3{K>qa;-hhA@5;-}zPcfObAa;^Lz~7^GSgO_w!8PwEc)H|7zUHLiU2dOKUba_ z-GAtucK&arV1S&Ivg+yZIbSX39jg#O{idVi@Z0Zoax4d4T$s`M@o~^6v2Amg{XTzV zW>8k;tAF}T8D(mZD~`RqdRSd^X}-0`-=Crkyh8RT?9Rx&K9CwS&2Dn(SH3gPBON|- z%?!HLy4||qX8-yJUl;m|$1$7@>GIs8wma}_+j*r&8M~Xat^P5teW8+&zrlDOFtbaR zxJHyX=jZ08=9Mrw7o{eaq^2m8XO?6rxO@5rgg5eu0~M))6r}*AtdhYh7>o=I4Rj5R zbqy^-3@ofnfXGPOz|hLTp#GoeaTE=?`6-!cm1r7_ff|e<8XDhk_5o^O@O1TaS?83{ F1OQIlJdpqZ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/signed_large.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_large.png deleted file mode 100644 index ab9495e7bdf962801f31599ff1d04e672df56988..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3858 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 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_small.png deleted file mode 100644 index 4202c3f97247bb130d6242d88512e45d83e54c3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 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 diff --git a/OpenKeychain/src/main/res/drawable/overlay_ok.png b/OpenKeychain/src/main/res/drawable/overlay_ok.png deleted file mode 100644 index 2f0005898af015f4f321b77aeca8f97db6184584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1305 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmUKs7M+SzC{oH>NS%G}U;vjb? zhIQv;UIIA^$sR$z3=CCj3=9n|3=F@3LJcn%7)pVryh>nTu$sZZAYL$MSD+10f-TA0 z-33Sk!B6Mi^+1ZVz$3Dlfq`2Xgc%uT&5-~JmK8Xr18J~B7|y-x31?tnzT)ZP7?N@C z?G5ja*`XrrAMSfD+nR9HeRW95(hli^XU{CyF=3XYAZuYT%i4e(CA$xtUAr_`KQ@Yq z>@Iw?xho(iwnMK=R-U8D*K1;s;F5rqi$b-IHuYWhT-UAt@`|Ccr?I3u^XK^1n&)@k z|KI<-@ciG1LqgLww5Xn8+<1Xym+ML+rsq$@W_g4^S*_d>dWgH*&tavNQX$*CBWAqe9)09HA%FbYKEZ%BBAZG$UKa$j>sc@P5_g}YgF|z6sob>Q z)0-bEZ0q>3TA#(Fs!s0v!!EODra8SG%$iGE-#bZfUcInm2U~gBgHNp6mQI<{evIb~ z`^uoD7yejIn4vPIy=?oIv#gy{4=P98O?zp-fpx#S=I8gOKa;j9wC?GUcHJW(`20A} z*JoZk4XmEUSMMtPi_KF>uhhga@E zm)ZIsfzy5queAG`?ynTEMvQ}bhn)3CiF3JY{s-87Y8B`TUb!?vHuK)5JoC4cjF|8J z*&TL!dVt(Kuj7_;kLZ@|ZTTEEqptbujrH?-`1(`lyX_E>fBea8y;Z~P!ih;6Q)k$ zuQ!BF(|cQBy3PCL(vBOU>#v4A?&JHj>IUD_ga6Am?G*bMSEDbz&+1@mg`|7R%j!hw z-@=d%&F|#@#67nau4mVDMi-Wp6topDxjpr?b8<@iNjaOY_-dazrc{}^ zncttQFt|zA+AjU&zRBs|=60ri(@IwyOFP@#;BzETaA%A8hpwC(v$WNuU(c11eCF#A z+@ka3{K>qa;-hhA@5;-}zPcfObAa;^Lz~7^GSgO_w!8PwEc)H|7zUHLiU2dOKUba_ z-GAtucK&arV1S&Ivg+yZIbSX39jg#O{idVi@Z0Zoax4d4T$s`M@o~^6v2Amg{XTzV zW>8k;tAF}T8D(mZD~`RqdRSd^X}-0`-=Crkyh8RT?9Rx&K9CwS&2Dn(SH3gPBON|- z%?!HLy4||qX8-yJUl;m|$1$7@>GIs8wma}_+j*r&8M~Xat^P5teW8+&zrlDOFtbaR zxJHyX=jZ08=9Mrw7o{eaq^2m8XO?6rxO@5rgg5eu0~M))6eWWtbyI*U7>o=I4Rj5R zbqy^-3@ofnfXGPOz|hLTK;|eP6HG&HeoAIqB{mJlKn=za4QDLU7=aoXJYD@<);T3K F0RZ9(Itu^* diff --git a/OpenKeychain/src/main/res/drawable/signed_large.png b/OpenKeychain/src/main/res/drawable/signed_large.png deleted file mode 100644 index 92e64dc51fa0435c0a499d4d55588a0fbc541eb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3858 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 UFbSVnj{pDw07*qoM6N<$f?Wesh5!Hn diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index fcad91df3..8a0519872 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -1,97 +1,144 @@ + android:background="@color/holo_gray_bright"> - - - + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -