More UI rework

5 files changed, 148 insertions, 101 deletions

diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
index 0da4d7f36..cd74255c7 100644
--- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
@@ -41,19 +41,29 @@
         android:layout_height="wrap_content"
         android:text="@string/api_settings_settings" />
 
-    <TextView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/api_settings_key"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:padding="0dp"
+        android:layout_margin="0dp">
 
-    <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
-        android:id="@+id/api_account_settings_key_spinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_gravity="center_vertical" />
+        <TextView
+            android:paddingLeft="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/api_settings_key"
+            android:paddingRight="8dp" />
+
+        <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
+            android:id="@+id/api_account_settings_key_spinner"
+            android:minHeight="56dip"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+
+    </LinearLayout>
 
     <View
         android:layout_width="match_parent"
@@ -67,9 +77,8 @@
         android:paddingRight="8dp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:text="@string/api_settings_create_key"
-        android:minHeight="48dp"
+        android:layout_height="?android:attr/listPreferredItemHeight"
         android:drawableRight="@drawable/ic_action_new_account"
         android:drawablePadding="8dp"
         android:gravity="center_vertical"
@@ -87,38 +96,71 @@
         custom:foldedLabel="@string/api_settings_show_advanced"
         custom:unFoldedLabel="@string/api_settings_hide_advanced">
 
-        <TextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/label_encryption_algorithm"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Spinner
-            android:id="@+id/api_account_settings_encryption_algorithm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView
+            android:padding="0dp"
+            android:layout_margin="0dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/label_encryption_algorithm"
+                android:paddingRight="8dp" />
+
+            <Spinner
+                android:id="@+id/api_account_settings_encryption_algorithm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/label_hash_algorithm"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Spinner
-            android:id="@+id/api_account_settings_hash_algorithm"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <TextView
+            android:padding="0dp"
+            android:layout_margin="0dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/label_hash_algorithm"
+                android:paddingRight="8dp" />
+
+            <Spinner
+                android:id="@+id/api_account_settings_hash_algorithm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/label_message_compression"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <Spinner
-            android:id="@+id/api_account_settings_compression"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:padding="0dp"
+            android:layout_margin="0dp">
+
+            <TextView
+                android:paddingLeft="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/label_message_compression"
+                android:paddingRight="8dp" />
+
+            <Spinner
+                android:id="@+id/api_account_settings_compression"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
 
     </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
 
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 5eecaac2a..51891155c 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -22,8 +22,6 @@
 
         <TextView
             android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -32,6 +30,7 @@
 
         <org.sufficientlysecure.keychain.ui.widget.SignKeySpinner
             android:id="@+id/sign"
+            android:minHeight="56dip"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical" />
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_key.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
index 346d09113..346d09113 100644
--- a/OpenKeychain/src/main/res/layout/keyspinner_key.xml
+++ b/OpenKeychain/src/main/res/layout/keyspinner_item.xml
diff --git a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
index 72a0bee48..ab7e5c54f 100644
--- a/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
+++ b/OpenKeychain/src/main/res/layout/recipient_box_entry.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/attachment_bg_holo">
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="horizontal"
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/attachment_bg_holo">
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@android:id/text1"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"/>
+        android:id="@android:id/text1"
+        android:layout_gravity="center_vertical"
+        android:padding="4dp" />
 
     <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_marginLeft="12dip"
-            android:cropToPadding="true"
-            android:background="#ccc"
-            android:scaleType="centerCrop"/>
+        android:id="@android:id/icon"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginLeft="12dip"
+        android:cropToPadding="true"
+        android:background="#ccc"
+        android:scaleType="centerCrop" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
index 9d2d1e9a9..85ed92ef7 100644
--- a/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
+++ b/OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml
@@ -1,51 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dip"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dip"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
     <LinearLayout
-            android:layout_width="0dip"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@android:id/title"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="18sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="8dip"
+            android:singleLine="true"
+            android:ellipsize="end" />
+
+        <TextView
+            android:id="@android:id/text1"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="16dip"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_marginTop="-4dip" />
+
+        <TextView
+            android:id="@android:id/text2"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:layout_weight="1">
-        <TextView android:id="@android:id/title"
-                  android:textColor="?android:attr/textColorSecondary"
-                  android:textSize="18sp"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="8dip"
-                  android:singleLine="true"
-                  android:ellipsize="end"/>
-        <TextView android:id="@android:id/text1"
-                  android:textColor="?android:attr/textColorTertiary"
-                  android:textSize="14sp"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="16dip"
-                  android:singleLine="true"
-                  android:ellipsize="end"
-                  android:layout_marginTop="-4dip"/>
-        <TextView android:id="@android:id/text2"
-                  android:textColor="?android:attr/textColorTertiary"
-                  android:textSize="14sp"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="16dip"
-                  android:singleLine="true"
-                  android:ellipsize="end"
-                  android:layout_marginTop="-4dip"/>
+            android:paddingLeft="16dip"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:typeface="monospace"
+            android:layout_marginTop="-4dip" />
     </LinearLayout>
+
     <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="56dip"
-            android:layout_height="56dip"
-            android:layout_marginLeft="12dip"
-            android:cropToPadding="true"
-            android:background="#ccc"
-            android:scaleType="centerCrop"/>
+        android:id="@android:id/icon"
+        android:layout_width="56dip"
+        android:layout_height="56dip"
+        android:layout_marginLeft="12dip"
+        android:cropToPadding="true"
+        android:background="#ccc"
+        android:scaleType="centerCrop" />
 </LinearLayout>
\ No newline at end of file