Include signature result in fragments

1 files changed, 32 insertions, 35 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
index 7d3ebbc06..132313ca8 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:paddingTop="4dp"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
     android:orientation="vertical">
 
+    <include layout="@layout/decrypt_signature_include" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:layout_alignParentTop="true"
         android:id="@+id/linearLayout">
 
         <EditText
@@ -45,42 +46,38 @@
 
     </LinearLayout>
 
-    <TextView
-        style="@style/SectionHeader"
+    <CheckBox
+        android:id="@+id/decrypt_file_delete_after_decryption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/section_decrypt_verify"
-        android:layout_above="@+id/decrypt_file_action_decrypt"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
+        android:text="@string/label_delete_after_decryption" />
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="4dp">
+        android:layout_height="match_parent">
 
-    </LinearLayout>
+        <TextView
+            style="@style/SectionHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/section_decrypt_verify"
+            android:layout_above="@+id/decrypt_file_action_decrypt"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true" />
 
-    <com.beardedhen.androidbootstrap.BootstrapButton
-        android:id="@+id/decrypt_file_action_decrypt"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:padding="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" />
+        <com.beardedhen.androidbootstrap.BootstrapButton
+            android:id="@+id/decrypt_file_action_decrypt"
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:padding="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" />
 
-    <CheckBox
-        android:id="@+id/decrypt_file_delete_after_decryption"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/label_delete_after_decryption"
-        android:layout_below="@+id/linearLayout"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-</RelativeLayout>
\ No newline at end of file
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file