diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout')
3 files changed, 207 insertions, 141 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml index f48d4401b..4ba379c2e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml @@ -8,7 +8,7 @@ <android.support.v4.view.ViewPager android:id="@+id/decrypt_pager" android:layout_width="match_parent" - android:layout_height="220dp"> + android:layout_height="match_parent"> <android.support.v4.view.PagerTabStrip android:id="@+id/decrypt_pager_tab_strip" @@ -38,128 +38,107 @@ <include layout="@layout/decrypt_signature_include" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/sourceLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/source" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <LinearLayout - android:id="@+id/sourceMessage" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <EditText - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:scrollHorizontally="true" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/sourceFile" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <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" /> - - <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> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/deleteAfterDecryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_decryption" /> - </LinearLayout> - </LinearLayout> - </ViewFlipper> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:text="@string/section_decrypt_verify" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/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" /> - </LinearLayout> + <!--<LinearLayout--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="wrap_content"--> + <!--android:orientation="horizontal">--> + + <!--<ImageView--> + <!--android:id="@+id/sourcePrevious"--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:src="@drawable/ic_previous" />--> + + <!--<TextView--> + <!--android:id="@+id/sourceLabel"--> + <!--style="@style/SectionHeader"--> + <!--android:layout_width="0dip"--> + <!--android:layout_height="match_parent"--> + <!--android:layout_weight="1"--> + <!--android:gravity="center_horizontal|center_vertical"--> + <!--android:text="@string/label_message"--> + <!--android:textAppearance="?android:attr/textAppearanceMedium" />--> + + <!--<ImageView--> + <!--android:id="@+id/sourceNext"--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:src="@drawable/ic_next" />--> + <!--</LinearLayout>--> + + <!--<ViewFlipper--> + <!--android:id="@+id/source"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="0dip"--> + <!--android:layout_weight="1">--> + + <!--<LinearLayout--> + <!--android:id="@+id/sourceMessage"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="match_parent"--> + <!--android:orientation="vertical"--> + <!--android:padding="4dp">--> + + <!--<EditText--> + <!--android:id="@+id/message"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="match_parent"--> + <!--android:gravity="top"--> + <!--android:inputType="text|textCapSentences|textMultiLine|textLongMessage"--> + <!--android:scrollHorizontally="true" />--> + <!--</LinearLayout>--> + + <!--<LinearLayout--> + <!--android:id="@+id/sourceFile"--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="match_parent"--> + <!--android:orientation="vertical"--> + <!--android:padding="4dp">--> + + <!--<LinearLayout--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="wrap_content"--> + <!--android:orientation="horizontal">--> + + <!--<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" />--> + + <!--<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>--> + + <!--<LinearLayout--> + <!--android:layout_width="match_parent"--> + <!--android:layout_height="wrap_content"--> + <!--android:orientation="horizontal">--> + + <!--<CheckBox--> + <!--android:id="@+id/deleteAfterDecryption"--> + <!--android:layout_width="wrap_content"--> + <!--android:layout_height="wrap_content"--> + <!--android:layout_gravity="center_vertical"--> + <!--android:text="@string/label_delete_after_decryption" />--> + <!--</LinearLayout>--> + <!--</LinearLayout>--> + <!--</ViewFlipper>--> + + </LinearLayout> </ScrollView> </LinearLayout>
\ No newline at end of file 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 f221ff8de..7347d222c 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml @@ -1,14 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout 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:paddingTop="4dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" android:orientation="vertical"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_alignParentTop="true" + android:id="@+id/linearLayout"> <EditText android:id="@+id/filename" @@ -38,11 +43,44 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - <CheckBox - android:id="@+id/deleteAfterDecryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_decryption" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_decrypt_verify" + android:layout_above="@+id/action_decrypt" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp"> + + </LinearLayout> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/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/deleteAfterDecryption" + 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 diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml index 3deee0eca..f11f79c1e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml @@ -1,15 +1,64 @@ <?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="wrap_content" - android:orientation="vertical"> + android:layout_height="match_parent" + android:fillViewport="true"> - <EditText - android:id="@+id/message" + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:scrollHorizontally="true" /> -</LinearLayout> + android:paddingTop="4dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:orientation="vertical"> + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:scrollHorizontally="true" + android:layout_above="@+id/decrypt_message_section" + android:layout_alignParentStart="true" /> + + <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_buttons" + android:layout_alignParentEnd="true" + android:id="@+id/decrypt_message_section" /> + + <LinearLayout + android:id="@+id/decrypt_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp" + android:layout_alignParentBottom="true"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_decrypt" + android:layout_width="match_parent" + android:layout_height="60dp" + android:layout_weight="1" + android:padding="4dp" + 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="60dp" + android:layout_weight="1" + android:padding="4dp" + android:text="@string/btn_decrypt_verify_clipboard" + bootstrapbutton:bb_icon_left="fa-unlock" + bootstrapbutton:bb_type="info" /> + </LinearLayout> + </RelativeLayout> +</ScrollView> |