aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-01 15:33:56 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-01 15:33:56 +0200
commitba81869038eb3b408ef0f925ebd674bd703211f7 (patch)
tree57af5b7683f0e6cd2b7ac05926add866bb6e8ed6
parentab8031fb527f767b254cc7a7c61a2ac4d60455f0 (diff)
downloadopen-keychain-ba81869038eb3b408ef0f925ebd674bd703211f7.tar.gz
open-keychain-ba81869038eb3b408ef0f925ebd674bd703211f7.tar.bz2
open-keychain-ba81869038eb3b408ef0f925ebd674bd703211f7.zip
More layout fixes
-rw-r--r--OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml118
1 files changed, 62 insertions, 56 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 040a05dc3..633c9c832 100644
--- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
@@ -1,75 +1,81 @@
<?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"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="4dp"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:orientation="vertical">
-
- <include layout="@layout/decrypt_signature_include" />
+ 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/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" />
+ <include layout="@layout/decrypt_signature_include" />
- <com.beardedhen.androidbootstrap.BootstrapButton
- android:id="@+id/decrypt_file_browse"
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:layout_width="match_parent"
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>
+ android:orientation="horizontal">
- <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" />
+ <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" />
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+ <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>
- <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>
-</LinearLayout> \ No newline at end of file
+ <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>
+</ScrollView> \ No newline at end of file