Much more usable sign activity

3 files changed, 46 insertions, 28 deletions

diff --git a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
index 7557a2830..11429ea05 100644
--- a/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
+++ b/OpenPGP-Keychain/res/layout/select_secret_key_layout_fragment.xml
@@ -22,12 +22,16 @@
         android:orientation="vertical"
         android:paddingLeft="16dp" >
 
+        <!-- Has been made focusable to display error messages with setError -->
+
         <TextView
             android:id="@+id/select_secret_key_user_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
             android:ellipsize="end"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:singleLine="true"
             android:text="@string/api_settings_no_key"
             android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/OpenPGP-Keychain/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/res/layout/sign_key_activity.xml
index ada4572ca..1bb2e6bab 100644
--- a/OpenPGP-Keychain/res/layout/sign_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/sign_key_activity.xml
@@ -1,51 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="10dp" >
+    android:padding="16dp" >
 
-    <include layout="@layout/select_secret_key_layout_fragment" />
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="@string/section_signing_key" />
 
-    <LinearLayout
+    <fragment
+        android:id="@+id/sign_key_select_key_fragment"
+        android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
+        tools:layout="@layout/select_secret_key_layout_fragment" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_send_key"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+    <TextView
+        style="@style/SectionHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="14dp"
+        android:text="@string/section_upload_key" />
 
-        <CheckBox
-            android:id="@+id/sign_key_upload_checkbox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:checked="true"
-            android:text="" />
-    </LinearLayout>
+    <CheckBox
+        android:id="@+id/sign_key_upload_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
+        android:checked="false"
+        android:text="@string/label_send_key" />
 
-    <LinearLayout
+    <Spinner
+        android:id="@+id/sign_key_keyserver"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <Spinner
-            android:id="@+id/sign_key_keyserver"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-    </LinearLayout>
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
+        android:enabled="false" />
 
     <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/sign_key_sign_button"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:padding="4dp"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="14dp"
         android:text="@string/btn_sign"
-        bootstrapbutton:bb_icon_left="fa-lock"
+        bootstrapbutton:bb_icon_left="fa-pencil"
         bootstrapbutton:bb_type="info" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 190dcfa53..21b834f47 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -57,6 +57,8 @@
     <string name="section_master_key">Master Key</string>
     <string name="section_master_user_id">Master User ID</string>
     <string name="section_actions">Actions</string>
+    <string name="section_signing_key">Your Key used for Signing</string>
+    <string name="section_upload_key">Upload Key</string>
 
     <!-- button -->
     <string name="btn_sign_to_clipboard">Sign (Clipboard)</string>
@@ -137,7 +139,7 @@
     <string name="label_name">Name</string>
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
-    <string name="label_send_key">Send Key to Server?</string>
+    <string name="label_send_key">Upload key to selected keyserver after signing</string>
     <string name="label_fingerprint">Fingerprint</string>
     <string name="no_keys_selected">Select</string>
     <string name="one_key_selected">1 Selected</string>
@@ -222,6 +224,8 @@
     <string name="list_empty">This list is empty!</string>
     <string name="nfc_successfull">Successfully sent key with NFC Beam!</string>
     <string name="key_copied_to_clipboard">Key has been copied to the clipboard!</string>
+    <string name="key_has_already_been_signed">Key has already been signed!</string>
+    <string name="select_key_to_sign">Please select a key to be used for signing!</string>
 
     <!--
          errors