From 9586d6b9b8193d3b7d990578eb97fab35c3e11eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 17 Sep 2014 23:06:49 +0200
Subject: Use key icons in spinners

---
 .../src/main/res/layout/keyspinner_item.xml        | 82 ++++++++++------------
 1 file changed, 39 insertions(+), 43 deletions(-)

(limited to 'OpenKeychain/src/main/res/layout/keyspinner_item.xml')

diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index c519a92cc..e231664f3 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
@@ -1,63 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:padding="4dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:minHeight="24dp"
-    android:layout_height="wrap_content">
+    android:gravity="center_vertical"
+    android:singleLine="true"
+    android:orientation="horizontal"
+    android:descendantFocusability="blocksDescendants"
+    android:focusable="false">
 
-    <TextView
-        android:id="@+id/keyspinner_key_name"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="18sp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end" />
-
-    <TextView
-        android:id="@+id/keyspinner_key_email"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="14sp"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="0dip"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:layout_marginTop="-4dip"
-        android:text="alice@example.com" />
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:focusable="true"
+        android:orientation="vertical"
+        android:paddingLeft="8dp"
+        android:paddingRight="4dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:orientation="horizontal"
-                  android:layout_width="match_parent"
-                  android:padding="4dp"
-                  android:minHeight="24dp"
-                  android:layout_height="wrap_content"
-                  android:id="@+id/keyspinner_key_row">
+        <TextView
+            android:id="@+id/keyspinner_key_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/label_main_user_id"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
-            android:id="@+id/keyspinner_key_id"
-            android:textColor="?android:attr/textColorTertiary"
-            android:textSize="14sp"
-            android:layout_width="0dip"
+            android:id="@+id/keyspinner_key_email"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
-            android:typeface="monospace"
-            android:layout_marginTop="-4dip"
-            android:layout_weight="1"/>
+            android:text="user@example.com"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/keyspinner_key_status"
-            android:textColor="#e00"
-            android:textSize="12sp"
+            android:id="@+id/keyspinner_key_id"
+            android:text="12345"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:ellipsize="end"
-            android:layout_gravity="right"
-            android:text="status"
-            android:visibility="gone"/>
-
+            android:typeface="monospace"
+            android:textAppearance="?android:attr/textAppearanceSmall"/>
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/keyspinner_key_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/status_signature_revoked_cutout"
+        android:padding="16dp" />
+
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3