diff options
114 files changed, 97 insertions, 53 deletions
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index d95866dd3..d80f4b7ca 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -48,13 +48,22 @@ inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" done -for NAME in "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_expired" "status_signature_invalid_cutout" "status_signature_invalid" "status_signature_revoked_cutout" "status_signature_revoked" "status_signature_unknown_cutout" "status_signature_unknown" "status_signature_unverified_cutout" "status_signature_unverified" "status_signature_verified_cutout" "status_signature_verified" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" +for NAME in "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" do echo $NAME -inkscape -w 24 -h 24 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 32 -h 32 -e "$HDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 48 -h 48 -e "$XDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" -inkscape -w 64 -h 64 -e "$XXDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" +inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME}_24px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME}_24px.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" +do +echo $NAME +inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 128 -h 128 -e "$HDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" +inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96px.png" "$SRC_DIR/$NAME.svg" done for NAME in "create_key_robot" diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 8ef5d01aa..ac1988d08 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -406,7 +406,7 @@ public class ViewKeyActivity extends BaseActivity implements if (isRevoked) { mStatusText.setText(R.string.view_key_revoked); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_REVOKED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_REVOKED, R.color.icons, true); color = getResources().getColor(R.color.android_red_light); mActionEncryptFile.setVisibility(View.INVISIBLE); @@ -416,7 +416,7 @@ public class ViewKeyActivity extends BaseActivity implements } else if (isExpired) { mStatusText.setText(R.string.view_key_expired); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_EXPIRED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_EXPIRED, R.color.icons, true); color = getResources().getColor(R.color.android_red_light); mActionEncryptFile.setVisibility(View.INVISIBLE); @@ -439,7 +439,7 @@ public class ViewKeyActivity extends BaseActivity implements if (isVerified) { mStatusText.setText(R.string.view_key_verified); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_VERIFIED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_VERIFIED, R.color.icons, true); color = getResources().getColor(R.color.primary); AsyncTask<String, Void, Bitmap> photoTask = @@ -461,7 +461,7 @@ public class ViewKeyActivity extends BaseActivity implements } else { mStatusText.setText(R.string.view_key_unverified); mStatusImage.setVisibility(View.VISIBLE); - KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons); + KeyFormattingUtils.setStatusImage(this, mStatusImage, mStatusText, KeyFormattingUtils.STATE_UNVERIFIED, R.color.icons, true); color = getResources().getColor(R.color.android_orange_light); mActionVerify.setVisibility(View.VISIBLE); @@ -472,6 +472,8 @@ public class ViewKeyActivity extends BaseActivity implements mStatusBar.setBackgroundColor(color); mBigToolbar.setBackgroundColor(color); + mStatusImage.setAlpha(80); + break; } } 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 a3bd4d470..ff5fbb49a 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); + vStatus.setImageResource(R.drawable.status_signature_revoked_cutout_24px); vStatus.setColorFilter( mContext.getResources().getColor(R.color.bg_gray), PorterDuff.Mode.SRC_IN); } else if (isExpired) { - vStatus.setImageResource(R.drawable.status_signature_expired_cutout); + vStatus.setImageResource(R.drawable.status_signature_expired_cutout_24px); 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 1c3dec629..38ed88b9c 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 @@ -395,19 +395,29 @@ public class KeyFormattingUtils { } public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, int state) { - setStatusImage(context, statusIcon, statusText, state, KeyFormattingUtils.DEFAULT_COLOR); + setStatusImage(context, statusIcon, statusText, state, KeyFormattingUtils.DEFAULT_COLOR, false); + } + + public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, + int state, int color) { + setStatusImage(context, statusIcon, statusText, state, color, false); } /** * Sets status image based on constant */ public static void setStatusImage(Context context, ImageView statusIcon, TextView statusText, - int state, int color) { + int state, int color, boolean big) { switch (state) { /** GREEN: everything is good **/ case STATE_VERIFIED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_verified_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_verified_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; } @@ -420,7 +430,7 @@ public class KeyFormattingUtils { } case STATE_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_closed)); + context.getResources().getDrawable(R.drawable.status_lock_closed_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_green_light; } @@ -433,8 +443,13 @@ public class KeyFormattingUtils { } /** ORANGE: mostly bad... **/ case STATE_UNVERIFIED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_unverified_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; } @@ -447,7 +462,7 @@ public class KeyFormattingUtils { } case STATE_UNKNOWN_KEY: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_orange_light; } @@ -460,8 +475,13 @@ public class KeyFormattingUtils { } /** RED: really bad... **/ case STATE_REVOKED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_revoked_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -473,8 +493,13 @@ public class KeyFormattingUtils { break; } case STATE_EXPIRED: { - statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_expired_cutout)); + if (big) { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_96px)); + } else { + statusIcon.setImageDrawable( + context.getResources().getDrawable(R.drawable.status_signature_expired_cutout_24px)); + } if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -487,7 +512,7 @@ public class KeyFormattingUtils { } case STATE_NOT_ENCRYPTED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_lock_open)); + context.getResources().getDrawable(R.drawable.status_lock_open_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -500,7 +525,7 @@ public class KeyFormattingUtils { } case STATE_NOT_SIGNED: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_unknown_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -513,7 +538,7 @@ public class KeyFormattingUtils { } case STATE_INVALID: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.android_red_light; } @@ -527,7 +552,7 @@ public class KeyFormattingUtils { /** special **/ case STATE_UNAVAILABLE: { statusIcon.setImageDrawable( - context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout)); + context.getResources().getDrawable(R.drawable.status_signature_invalid_cutout_24px)); if (color == KeyFormattingUtils.DEFAULT_COLOR) { color = R.color.bg_gray; } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png Binary files differindex 9d4ed6e84..9d4ed6e84 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png Binary files differindex e76393659..e76393659 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png Binary files differindex 3c2f8c09c..3c2f8c09c 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png Binary files differindex 046424643..046424643 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png Binary files differindex a1b090630..a1b090630 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png Binary files differindex e567055aa..e567055aa 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png Binary files differindex 98e32eadc..98e32eadc 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png Binary files differdeleted file mode 100644 index 21e8b536a..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png Binary files differindex 84ac9bec2..84ac9bec2 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png Binary files differnew file mode 100644 index 000000000..63546068f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png Binary files differdeleted file mode 100644 index 9ae2a09ab..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png Binary files differindex 967e00e80..967e00e80 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png Binary files differnew file mode 100644 index 000000000..9957db288 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png Binary files differdeleted file mode 100644 index 16e1d7181..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png Binary files differindex 244dd0708..244dd0708 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png Binary files differnew file mode 100644 index 000000000..1c3a15c07 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png Binary files differdeleted file mode 100644 index 5c3ba866d..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png Binary files differindex 82cc25a4b..82cc25a4b 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png Binary files differnew file mode 100644 index 000000000..ce46c6317 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unknown_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png Binary files differdeleted file mode 100644 index b8b472a5a..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png Binary files differindex e752eaeab..e752eaeab 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..19ee3c241 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_unverified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png Binary files differdeleted file mode 100644 index d8141b47b..000000000 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png Binary files differindex 08a9f464c..08a9f464c 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..ed3db0aca --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/status_signature_verified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png Binary files differindex ed1ba24d2..ed1ba24d2 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png Binary files differindex d54d461fa..d54d461fa 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png Binary files differindex 81c1b3dfa..81c1b3dfa 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png Binary files differindex 9afc43901..9afc43901 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png Binary files differindex cfc39f0e7..cfc39f0e7 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_closed_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png Binary files differindex 824dc2672..824dc2672 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_error_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png Binary files differindex 9bca59ae3..9bca59ae3 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_lock_open_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png Binary files differdeleted file mode 100644 index 81a900147..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png Binary files differindex bc91094b5..bc91094b5 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png Binary files differnew file mode 100644 index 000000000..df385bb1b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_expired_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png Binary files differdeleted file mode 100644 index baa78f795..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png Binary files differindex bc2f56e2a..bc2f56e2a 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png Binary files differnew file mode 100644 index 000000000..aeb899599 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_invalid_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png Binary files differdeleted file mode 100644 index 7cf985274..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png Binary files differindex 2d2593194..2d2593194 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png Binary files differnew file mode 100644 index 000000000..d77c5e1c1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_revoked_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png Binary files differdeleted file mode 100644 index 3d4665320..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png Binary files differindex 0fc74d07e..0fc74d07e 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png Binary files differnew file mode 100644 index 000000000..ee0661234 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unknown_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png Binary files differdeleted file mode 100644 index 8348b32b3..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png Binary files differindex 96a2d1413..96a2d1413 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..1602747f1 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_unverified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png Binary files differdeleted file mode 100644 index 02e53ac8a..000000000 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png Binary files differindex 9f7cf837c..9f7cf837c 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..61c23f749 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/status_signature_verified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png Binary files differindex 8d36d7202..8d36d7202 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png Binary files differindex 01a74bcc0..01a74bcc0 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png Binary files differindex ff07bd0a4..ff07bd0a4 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png Binary files differindex b8002162a..b8002162a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png Binary files differindex 7c6bb2d18..7c6bb2d18 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_closed_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png Binary files differindex da4a5d89a..da4a5d89a 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_error_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png Binary files differindex cd02fc1e4..cd02fc1e4 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_lock_open_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png Binary files differdeleted file mode 100644 index f5105c1ae..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png Binary files differindex 83f6fde35..83f6fde35 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png Binary files differnew file mode 100644 index 000000000..568b48c43 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png Binary files differdeleted file mode 100644 index 67880d6db..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png Binary files differindex 29830f5ba..29830f5ba 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png Binary files differnew file mode 100644 index 000000000..89f899212 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_invalid_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png Binary files differdeleted file mode 100644 index 2ed67419b..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png Binary files differindex 2f7695043..2f7695043 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png Binary files differnew file mode 100644 index 000000000..3db663e2e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_revoked_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png Binary files differdeleted file mode 100644 index a6f1f2792..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png Binary files differindex 2ce28c7ca..2ce28c7ca 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png Binary files differnew file mode 100644 index 000000000..4e0e04375 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unknown_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png Binary files differdeleted file mode 100644 index c25a84b4d..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png Binary files differindex 442c55eee..442c55eee 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..0b2ccc9f7 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_unverified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png Binary files differdeleted file mode 100644 index 6f435a85e..000000000 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png Binary files differindex 160ec7cbe..160ec7cbe 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..471e5e513 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_verified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png Binary files differindex d786dc72f..d786dc72f 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png Binary files differindex 4bb97f992..4bb97f992 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png Binary files differindex fe0c8e41b..fe0c8e41b 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png Binary files differindex 51ab367a9..51ab367a9 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png Binary files differindex 5a9664d59..5a9664d59 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_closed_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png Binary files differindex 608f065af..608f065af 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_error_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png Binary files differindex ee34dd396..ee34dd396 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_lock_open_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png Binary files differdeleted file mode 100644 index f475c9d84..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png Binary files differindex 33a3efed1..33a3efed1 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png Binary files differnew file mode 100644 index 000000000..ba7e8c2f4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_expired_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png Binary files differdeleted file mode 100644 index f21c2cf52..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png Binary files differindex bc39d3496..bc39d3496 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png Binary files differnew file mode 100644 index 000000000..1fbf5ceb2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_invalid_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png Binary files differdeleted file mode 100644 index be1a1d9dc..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png Binary files differindex 58929661f..58929661f 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png Binary files differnew file mode 100644 index 000000000..338c696ac --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_revoked_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png Binary files differdeleted file mode 100644 index 841cfa958..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png Binary files differindex 3020357a4..3020357a4 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png Binary files differnew file mode 100644 index 000000000..2690310a6 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unknown_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png Binary files differdeleted file mode 100644 index 525d1cf6b..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png Binary files differindex 3829bb3a0..3829bb3a0 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..e559faf9d --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_unverified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png Binary files differdeleted file mode 100644 index 54eee5ba0..000000000 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified.png +++ /dev/null diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png Binary files differindex 3548ee2b6..3548ee2b6 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_24px.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png Binary files differnew file mode 100644 index 000000000..79e4ec4a9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/status_signature_verified_cutout_96px.png diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index a55a8ea0c..2df3755a4 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 9140ad07b..659d1c207 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -24,7 +24,7 @@ android:id="@+id/result_encryption_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/status_lock_open" + android:src="@drawable/status_lock_open_24px" android:layout_gravity="center_vertical" /> <TextView @@ -47,7 +47,7 @@ android:id="@+id/result_signature_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/status_signature_unverified_cutout" + android:src="@drawable/status_signature_unverified_cutout_24px" android:layout_gravity="center_vertical" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml index a97e81abe..bf9d33852 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_list_item.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_list_item.xml @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:padding="16dp" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index df69e4237..5a3a97358 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:padding="16dp" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml index b75bb808e..757dae5be 100644 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml index c7fa882cb..13f63d2ee 100644 --- a/OpenKeychain/src/main/res/layout/select_key_item.xml +++ b/OpenKeychain/src/main/res/layout/select_key_item.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="16dp" android:paddingRight="16dp" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index ad46a8d62..9b055d322 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -53,19 +53,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - <ImageView - android:id="@+id/view_key_status_image" - android:layout_width="24dp" - android:visibility="invisible" - android:src="@drawable/status_signature_unverified_cutout" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginLeft="2dp" /> - <LinearLayout android:orientation="vertical" - android:layout_marginLeft="8dp" - android:layout_marginStart="8dp" + android:layout_marginLeft="32dp" + android:layout_marginStart="32dp" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -98,12 +89,15 @@ android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_marginLeft="32dp"> + android:layout_marginLeft="32dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"> <ImageButton android:id="@+id/view_key_action_encrypt_files" android:layout_width="64dp" android:layout_height="64dp" + android:visibility="invisible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_action_encrypt_file" /> @@ -111,6 +105,7 @@ android:id="@+id/view_key_action_encrypt_text" android:layout_width="64dp" android:layout_height="64dp" + android:visibility="invisible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_action_encrypt_text" /> @@ -123,6 +118,18 @@ android:src="@drawable/ic_action_verified_cutout" /> </LinearLayout> + <ImageView + android:id="@+id/view_key_status_image" + android:layout_width="96dp" + android:visibility="invisible" + android:src="@drawable/status_signature_unverified_cutout_96px" + android:layout_height="96dp" + android:layout_gravity="center_vertical" + android:layout_above="@+id/toolbar2" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="16dp" /> + </RelativeLayout> <LinearLayout @@ -161,6 +168,7 @@ android:layout_marginBottom="-40dp" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:visibility="invisible" android:elevation="4dp" fab:fab_icon="@drawable/ic_qrcode_white_24dp" fab:fab_colorNormal="@color/fab" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml index 691ee357d..6d0ed3298 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_main_fragment.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml index b2875b9e6..f41109d84 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:src="@drawable/status_signature_revoked_cutout" + android:src="@drawable/status_signature_revoked_cutout_24px" android:paddingLeft="8dp" android:layout_centerVertical="true" android:layout_alignParentStart="true" /> @@ -71,7 +71,7 @@ android:id="@+id/subkey_item_ic_certify" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_certify" + android:src="@drawable/key_flag_certify_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -79,7 +79,7 @@ android:id="@+id/subkey_item_ic_sign" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_sign" + android:src="@drawable/key_flag_sign_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -87,7 +87,7 @@ android:id="@+id/subkey_item_ic_encrypt" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_encrypt" + android:src="@drawable/key_flag_encrypt_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> @@ -95,7 +95,7 @@ android:id="@+id/subkey_item_ic_authenticate" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/key_flag_authenticate" + android:src="@drawable/key_flag_authenticate_24px" android:layout_marginLeft="8dp" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index fadad0e56..790d4143e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/status_signature_verified_cutout" + android:src="@drawable/status_signature_verified_cutout_24px" android:layout_gravity="center_vertical" /> </LinearLayout> |