Bigger status icon in key view

10 files changed, 34 insertions, 26 deletions

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>