Improve verification result display, close #568

3 files changed, 136 insertions, 103 deletions

diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
index 633c9c832..597652713 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -8,74 +8,86 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
         android:orientation="vertical">
 
-        <include layout="@layout/decrypt_signature_include" />
+        <include layout="@layout/decrypt_result_include" />
+
+        <View
+            android:id="@+id/status_divider"
+            android:layout_height="1dip"
+            android:layout_width="match_parent"
+            android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:paddingTop="4dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
 
-            <EditText
-                android:id="@+id/decrypt_file_filename"
-                android:layout_width="0dip"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="top|left"
-                android:inputType="textMultiLine|textUri"
-                android:lines="4"
-                android:maxLines="10"
-                android:minLines="2"
-                android:scrollbars="vertical" />
+                android:orientation="horizontal">
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/decrypt_file_browse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                bootstrapbutton:bb_icon_left="fa-folder-open"
-                bootstrapbutton:bb_roundedCorners="true"
-                bootstrapbutton:bb_size="default"
-                bootstrapbutton:bb_type="default" />
-        </LinearLayout>
+                <EditText
+                    android:id="@+id/decrypt_file_filename"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="top|left"
+                    android:inputType="textMultiLine|textUri"
+                    android:lines="4"
+                    android:maxLines="10"
+                    android:minLines="2"
+                    android:scrollbars="vertical" />
 
-        <CheckBox
-            android:id="@+id/decrypt_file_delete_after_decryption"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/label_delete_after_decryption" />
+                <com.beardedhen.androidbootstrap.BootstrapButton
+                    android:id="@+id/decrypt_file_browse"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    bootstrapbutton:bb_icon_left="fa-folder-open"
+                    bootstrapbutton:bb_roundedCorners="true"
+                    bootstrapbutton:bb_size="default"
+                    bootstrapbutton:bb_type="default" />
+            </LinearLayout>
 
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                style="@style/SectionHeader"
+            <CheckBox
+                android:id="@+id/decrypt_file_delete_after_decryption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:text="@string/section_decrypt_verify"
-                android:layout_above="@+id/decrypt_file_action_decrypt"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
+                android:text="@string/label_delete_after_decryption" />
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/decrypt_file_action_decrypt"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:text="@string/btn_decrypt_verify"
-                bootstrapbutton:bb_icon_left="fa-unlock"
-                bootstrapbutton:bb_type="info"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true" />
+                android:layout_height="match_parent">
+
+                <TextView
+                    style="@style/SectionHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/section_decrypt_verify"
+                    android:layout_above="@+id/decrypt_file_action_decrypt"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true" />
 
-        </RelativeLayout>
+                <com.beardedhen.androidbootstrap.BootstrapButton
+                    android:id="@+id/decrypt_file_action_decrypt"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:text="@string/btn_decrypt_verify"
+                    bootstrapbutton:bb_icon_left="fa-unlock"
+                    bootstrapbutton:bb_type="info"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true" />
+
+            </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
index dfe1bf64a..831d7e888 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
@@ -8,59 +8,72 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
         android:orientation="vertical">
 
-        <include layout="@layout/decrypt_signature_include" />
+        <include layout="@layout/decrypt_result_include" />
 
-        <EditText
-            android:id="@+id/message"
+        <View
+            android:id="@+id/status_divider"
+            android:layout_height="1dip"
             android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:gravity="top"
-            android:hint="@string/decrypt_content_edit_text_hint"
-            android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
-            android:scrollHorizontally="true"
-            android:layout_weight="1" />
-
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/section_decrypt_verify"
-            android:id="@+id/decrypt_message_section" />
+            android:background="?android:attr/listDivider" />
 
         <LinearLayout
-            android:id="@+id/decrypt_buttons"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:paddingTop="4dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/action_decrypt"
+            <EditText
+                android:id="@+id/message"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginRight="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:text="@string/btn_decrypt_verify"
-                bootstrapbutton:bb_icon_left="fa-unlock"
-                bootstrapbutton:bb_type="info" />
+                android:layout_height="0dip"
+                android:gravity="top"
+                android:hint="@string/decrypt_content_edit_text_hint"
+                android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
+                android:scrollHorizontally="true"
+                android:layout_weight="1" />
+
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/section_decrypt_verify"
+                android:id="@+id/decrypt_message_section" />
 
-            <com.beardedhen.androidbootstrap.BootstrapButton
-                android:id="@+id/action_decrypt_from_clipboard"
+            <LinearLayout
+                android:id="@+id/decrypt_buttons"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_weight="1"
-                android:text="@string/btn_decrypt_verify_clipboard"
-                bootstrapbutton:bb_icon_left="fa-clipboard"
-                bootstrapbutton:bb_type="info" />
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.beardedhen.androidbootstrap.BootstrapButton
+                    android:id="@+id/action_decrypt"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginRight="4dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/btn_decrypt_verify"
+                    bootstrapbutton:bb_icon_left="fa-unlock"
+                    bootstrapbutton:bb_type="info" />
+
+                <com.beardedhen.androidbootstrap.BootstrapButton
+                    android:id="@+id/action_decrypt_from_clipboard"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/btn_decrypt_verify_clipboard"
+                    bootstrapbutton:bb_icon_left="fa-clipboard"
+                    bootstrapbutton:bb_type="info" />
+            </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
index 70faa6e83..6e599807d 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml
@@ -5,16 +5,19 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dp"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:background="@color/result_blue">
 
     <TextView
         android:id="@+id/result_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="result text" />
+        android:text="result text"
+        android:textColor="@color/white" />
 
     <RelativeLayout
         android:id="@+id/result_signature"
@@ -26,7 +29,7 @@
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/relativeLayout">
+            android:id="@+id/result_signature_image">
 
             <ImageView
                 android:id="@+id/ic_signature"
@@ -45,20 +48,24 @@
             android:id="@+id/mainUserId"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
             android:layout_gravity="left"
             android:text="@string/label_main_user_id"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_toRightOf="@+id/relativeLayout" />
+            android:layout_toRightOf="@+id/result_signature_image"
+            android:textColor="@color/white" />
 
         <TextView
             android:id="@+id/mainUserIdRest"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
             android:layout_gravity="left"
             android:text="Main User Id Rest"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:layout_below="@+id/mainUserId"
-            android:layout_toRightOf="@+id/relativeLayout" />
+            android:layout_toRightOf="@+id/result_signature_image"
+            android:textColor="@color/white" />
 
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/lookup_key"
@@ -74,4 +81,5 @@
             android:layout_alignParentEnd="true" />
 
     </RelativeLayout>
+
 </LinearLayout>
\ No newline at end of file