From b16a550fbb038e6509f7f65e0dcb7a944682c6fe Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Mon, 6 Oct 2014 15:41:15 +0200
Subject: [PATCH] multicertify: move key spinner to the bottom

---
 .../src/main/res/layout/add_keys_activity.xml |  6 +-
 .../main/res/layout/log_display_fragment.xml  | 11 ----
 .../res/layout/multi_certify_key_fragment.xml | 60 +++++++++----------
 OpenKeychain/src/main/res/values/strings.xml  |  1 +
 4 files changed, 33 insertions(+), 45 deletions(-)
 delete mode 100644 OpenKeychain/src/main/res/layout/log_display_fragment.xml

diff --git a/OpenKeychain/src/main/res/layout/add_keys_activity.xml b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
index a5f5dd71a..c703efbf3 100644
--- a/OpenKeychain/src/main/res/layout/add_keys_activity.xml
+++ b/OpenKeychain/src/main/res/layout/add_keys_activity.xml
@@ -29,9 +29,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="0dp"
-                android:layout_margin="0dp">
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:paddingLeft="8dp"
@@ -136,5 +134,7 @@
                 android:layout_marginBottom="8dp" />
 
         </LinearLayout>
+
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/log_display_fragment.xml b/OpenKeychain/src/main/res/layout/log_display_fragment.xml
deleted file mode 100644
index 442e72d09..000000000
--- a/OpenKeychain/src/main/res/layout/log_display_fragment.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/log_text" />
-</LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
index f65327089..24af7e518 100644
--- a/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/multi_certify_key_fragment.xml
@@ -16,35 +16,6 @@
             android:paddingRight="16dp"
             android:orientation="vertical">
 
-            <TextView
-                style="@style/SectionHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="14dp"
-                android:text="@string/section_certification_key" />
-
-            <LinearLayout
-                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/key_colon"
-                    android:paddingRight="8dp" />
-
-                <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
-                    android:id="@+id/certify_key_spinner"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </LinearLayout>
-
             <TextView
                 style="@style/SectionHeader"
                 android:layout_width="wrap_content"
@@ -79,16 +50,38 @@
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_marginTop="14dp"
-                android:text="@string/section_actions"
+                android:text="@string/section_certify"
                 android:layout_weight="1" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <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/add_keys_my_key"
+                    android:paddingRight="8dp" />
+
+                <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
+                    android:id="@+id/certify_key_spinner"
+                    android:minHeight="56dip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical" />
+
+            </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/certify_key_certify_button"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/listPreferredItemHeight"
                 android:clickable="true"
                 android:paddingRight="4dp"
-                android:layout_marginBottom="8dp"
                 style="@style/SelectableItem"
                 android:orientation="horizontal">
 
@@ -111,6 +104,11 @@
 
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dip"
+                android:background="?android:attr/listDivider"/>
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 3454988c0..874ece8a0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <string name="section_general">"General"</string>
     <string name="section_defaults">"Defaults"</string>
     <string name="section_advanced">"Advanced"</string>
+    <string name="section_certify">"Certify"</string>
     <string name="section_actions">"Actions"</string>
     <string name="section_share_key">"Whole key"</string>
     <string name="section_certification_key">"Your Key used for certification"</string>