More layout fixes

2 files changed, 108 insertions, 97 deletions

diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
index fe0b28a27..efc4b4641 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml
@@ -1,80 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="4dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:orientation="vertical">
+    android:fillViewport="true">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:paddingTop="4dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/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/btn_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/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" />
 
-    <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
-        custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
-        custom:foldedIcon="fa-chevron-right"
-        custom:unFoldedIcon="fa-chevron-down">
-
-        <include layout="@layout/encrypt_content_adv_settings" />
+            <com.beardedhen.androidbootstrap.BootstrapButton
+                android:id="@+id/btn_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>
 
-    </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
+        <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            custom:foldedLabel="@string/btn_encryption_advanced_settings_show"
+            custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide"
+            custom:foldedIcon="fa-chevron-right"
+            custom:unFoldedIcon="fa-chevron-down">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            <include layout="@layout/encrypt_content_adv_settings" />
 
-        <TextView
-            style="@style/SectionHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="@string/section_encrypt_and_or_sign"
-            android:layout_above="@+id/action_encrypt_file"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
+        </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout>
 
-        <com.beardedhen.androidbootstrap.BootstrapButton
-            android:id="@+id/action_encrypt_file"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/btn_encrypt_file"
-            bootstrapbutton:bb_icon_left="fa-lock"
-            bootstrapbutton:bb_type="info"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
+            android:layout_height="match_parent">
 
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+            <TextView
+                style="@style/SectionHeader"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:text="@string/section_encrypt_and_or_sign"
+                android:layout_above="@+id/action_encrypt_file"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true" />
+
+            <com.beardedhen.androidbootstrap.BootstrapButton
+                android:id="@+id/action_encrypt_file"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
+                android:text="@string/btn_encrypt_file"
+                bootstrapbutton:bb_icon_left="fa-lock"
+                bootstrapbutton:bb_type="info"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true" />
+
+        </RelativeLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index 0d07e9e72..89381e499 100644
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -1,47 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/modeSymmetric"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:paddingRight="16dp"
     android:paddingLeft="16dp"
-    android:stretchColumns="1">
+    android:paddingRight="16dp"
+    android:orientation="vertical">
+
+    <TableLayout
+        android:id="@+id/modeSymmetric"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1"
+        android:layout_centerVertical="true">
 
-    <TableRow>
+        <TableRow>
 
-        <TextView
-            android:id="@+id/label_passphrase"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingRight="8dp"
-            android:text="@string/label_passphrase"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            <TextView
+                android:id="@+id/label_passphrase"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="8dp"
+                android:text="@string/label_passphrase"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <EditText
-            android:id="@+id/passphrase"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword" />
-    </TableRow>
+            <EditText
+                android:id="@+id/passphrase"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword" />
+        </TableRow>
 
-    <TableRow>
+        <TableRow>
 
-        <TextView
-            android:id="@+id/label_passphraseAgain"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingRight="8dp"
-            android:text="@string/label_passphrase_again"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            <TextView
+                android:id="@+id/label_passphraseAgain"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingRight="8dp"
+                android:text="@string/label_passphrase_again"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <EditText
-            android:id="@+id/passphraseAgain"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword" />
-    </TableRow>
-</TableLayout>
\ No newline at end of file
+            <EditText
+                android:id="@+id/passphraseAgain"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword" />
+        </TableRow>
+    </TableLayout>
+</RelativeLayout>
\ No newline at end of file