Design fixes for decryption screen

14 files changed, 4 insertions, 3 deletions

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index 95df5ca9d..d34e572fc 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -35,6 +35,7 @@ python copy OpenKeychain navigation grey close 24
 python copy OpenKeychain social grey person 24
 python copy OpenKeychain social grey person_add 24
 python copy OpenKeychain social grey share 24
+python copy OpenKeychain communication grey vpn_key 24
 
 # navigation drawer sections
 python copy OpenKeychain communication black vpn_key 24
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 7d8fd1388..60103f344 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
@@ -243,7 +243,7 @@ public abstract class DecryptFragment extends Fragment {
 
     private void setShowAction(final long signatureKeyId) {
         mSignatureAction.setText(R.string.decrypt_result_action_show);
-        mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_action_accounts, 0);
+        mSignatureAction.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_vpn_key_grey_24dp, 0);
         mSignatureLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
deleted file mode 100644
index 10c77d07d..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png
new file mode 100644
index 000000000..cbc93ca36
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
deleted file mode 100644
index 41b89b5b6..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png
new file mode 100644
index 000000000..7acfab4f4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
deleted file mode 100644
index ee8067c7d..000000000
--- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png
new file mode 100644
index 000000000..49a44704c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
deleted file mode 100644
index d9b5cc007..000000000
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png
new file mode 100644
index 000000000..6e1aa32c4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png
deleted file mode 100644
index be1bc9ef4..000000000
--- a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_accounts.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png
new file mode 100644
index 000000000..2ea2bf77c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_grey_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 7317e7742..9d47009b9 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -118,7 +118,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:text="Show"
-                android:drawableRight="@drawable/ic_action_accounts"
+                android:drawableRight="@drawable/ic_vpn_key_grey_24dp"
                 android:drawablePadding="8dp"
                 android:gravity="center_vertical"
                 style="@style/SelectableItem" />
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 88eb89ec6..207553620 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1002,7 +1002,7 @@
     <string name="msg_dc_error_pgp_exception">"Encountered OpenPGP Exception during operation!"</string>
     <string name="msg_dc_integrity_check_ok">"Integrity check OK!"</string>
     <string name="msg_dc_ok_meta_only">"Only metadata was requested, skipping decryption"</string>
-    <string name="msg_dc_ok">"OK"</string>
+    <string name="msg_dc_ok">"Decryption/Verification finished"</string>
     <string name="msg_dc_pass_cached">"Using passphrase from cache"</string>
     <string name="msg_dc_pending_nfc">"NFC token required, requesting user input…"</string>
     <string name="msg_dc_pending_passphrase">"Passphrase required, requesting user input…"</string>