Use icons in key view

3 files changed, 25 insertions, 21 deletions

diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml
index 057902505..8d600464c 100644
--- a/OpenKeychain/src/main/res/layout/key_list_item.xml
+++ b/OpenKeychain/src/main/res/layout/key_list_item.xml
@@ -43,7 +43,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/status_image"
         android:layout_gravity="center"
-        android:src="@drawable/status_signature_verified_cutout"
+        android:src="@drawable/status_signature_revoked_cutout"
         android:padding="16dp" />
 
 </LinearLayout>
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 481b1ddf5..27078c9e4 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -10,36 +10,36 @@
         android:layout_height="wrap_content"
         android:orientation="vertical" />
 
-    <TextView
-        android:layout_width="match_parent"
+    <LinearLayout
+        android:id="@+id/view_key_status_layout"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="This key is expired!"
-        android:id="@+id/view_key_expired"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
+        android:layout_gravity="center"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:visibility="gone" />
+        android:orientation="horizontal">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="This key has been revoked!"
-        android:id="@+id/view_key_revoked"
-        android:textColor="@color/alert"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:gravity="center_vertical|center_horizontal"
-        android:visibility="gone"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp" />
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_image" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/view_key_status_text"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="8dp"/>
+
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dip"
         android:background="?android:attr/listDivider"
         android:visibility="gone"
-        android:id="@+id/status_divider" />
+        android:id="@+id/view_key_status_divider" />
 
     <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout
         android:id="@+id/view_key_sliding_tab_layout"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index dd8ae0ac1..f6648ca3d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -492,6 +492,10 @@
     <string name="create_key_upload">Upload key to keyserver</string>
     <string name="create_key_empty">This field is required</string>
 
+    <!-- View key -->
+    <string name="view_key_revoked">This key has been revoked!</string>
+    <string name="view_key_expired">This key is expired!</string>
+
     <!-- Navigation Drawer -->
     <string name="nav_keys">Keys</string>
     <string name="nav_encrypt">Sign and Encrypt</string>