New key flags icons, subkey adapter redesign, support authanticate flag in database

28 files changed, 18 insertions, 7 deletions

diff --git a/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png
deleted file mode 100644
index 9e54464ed..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..9d4ed6e84
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
new file mode 100644
index 000000000..e76393659
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..3c2f8c09c
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
new file mode 100644
index 000000000..046424643
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png
deleted file mode 100644
index 54c4906e8..000000000
--- a/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png
deleted file mode 100644
index 5e7294a4b..000000000
--- a/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png b/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png
deleted file mode 100644
index 19d45f8da..000000000
--- a/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png
deleted file mode 100644
index 575b2d866..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png
deleted file mode 100644
index bcd8cfc8e..000000000
--- a/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..ed1ba24d2
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_authenticate.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
new file mode 100644
index 000000000..d54d461fa
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_certify.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..81c1b3dfa
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_encrypt.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
new file mode 100644
index 000000000..9afc43901
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/key_flag_sign.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..8d36d7202
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_authenticate.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
new file mode 100644
index 000000000..01a74bcc0
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_certify.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..ff07bd0a4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_encrypt.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
new file mode 100644
index 000000000..b8002162a
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/key_flag_sign.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
new file mode 100644
index 000000000..d786dc72f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_authenticate.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
new file mode 100644
index 000000000..4bb97f992
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_certify.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
new file mode 100644
index 000000000..fe0c8e41b
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_encrypt.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
new file mode 100644
index 000000000..51ab367a9
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/key_flag_sign.png
diff --git a/OpenKeychain/src/main/res/drawable/certify_small.png b/OpenKeychain/src/main/res/drawable/certify_small.png
deleted file mode 100644
index 575b2d866..000000000
--- a/OpenKeychain/src/main/res/drawable/certify_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable/encrypted_small.png b/OpenKeychain/src/main/res/drawable/encrypted_small.png
deleted file mode 100644
index 7f4ab803f..000000000
--- a/OpenKeychain/src/main/res/drawable/encrypted_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable/key_small.png b/OpenKeychain/src/main/res/drawable/key_small.png
deleted file mode 100644
index 121803508..000000000
--- a/OpenKeychain/src/main/res/drawable/key_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable/revoked_key_small.png b/OpenKeychain/src/main/res/drawable/revoked_key_small.png
deleted file mode 100644
index f9ed0596f..000000000
--- a/OpenKeychain/src/main/res/drawable/revoked_key_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/drawable/signed_small.png b/OpenKeychain/src/main/res/drawable/signed_small.png
deleted file mode 100644
index 590220281..000000000
--- a/OpenKeychain/src/main/res/drawable/signed_small.png
+++ /dev/null
diff --git a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
index cf4b82078..b2875b9e6 100644
--- a/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_subkey_item.xml
@@ -6,6 +6,16 @@
     android:orientation="horizontal"
     android:singleLine="true">
 
+    <ImageView
+        android:id="@+id/subkey_item_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:src="@drawable/status_signature_revoked_cutout"
+        android:paddingLeft="8dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true" />
+
     <FrameLayout
         android:id="@+id/subkey_item_buttons"
         android:layout_width="wrap_content"
@@ -34,6 +44,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_toLeftOf="@id/subkey_item_buttons"
+        android:layout_toRightOf="@id/subkey_item_status"
         android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -60,31 +71,31 @@
                 android:id="@+id/subkey_item_ic_certify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/certify_small"
+                android:src="@drawable/key_flag_certify"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/subkey_item_ic_encrypt"
+                android:id="@+id/subkey_item_ic_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/encrypted_small"
+                android:src="@drawable/key_flag_sign"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/subkey_item_ic_sign"
+                android:id="@+id/subkey_item_ic_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/signed_small"
+                android:src="@drawable/key_flag_encrypt"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/subkey_item_ic_revoked"
+                android:id="@+id/subkey_item_ic_authenticate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/revoked_key_small"
+                android:src="@drawable/key_flag_authenticate"
                 android:layout_marginLeft="8dp"
                 android:layout_gravity="center_vertical" />