cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include signature result in fragments

Browse Source
This commit is contained in:
Dominik Schürmann
2014-03-30 21:33:00 +02:00
parent 55a2cbe9c3
commit bb2fb786a8
8 changed files with 245 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml
View File

@@ -6,8 +6,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/decrypt_signature_include" />
<android.support.v4.view.ViewPager
android:id="@+id/decrypt_pager"
android:layout_width="match_parent"

73
OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml
View File

@@ -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"
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" />
<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/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>
android:text="@string/label_delete_after_decryption" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<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" />
</RelativeLayout>
</LinearLayout>

14
OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:fillViewport="true">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="4dp"
@@ -13,6 +13,8 @@
android:paddingRight="10dp"
android:orientation="vertical">
<include layout="@layout/decrypt_signature_include" />
<EditText
android:id="@+id/message"
android:layout_width="match_parent"
@@ -20,16 +22,13 @@
android:gravity="top"
android:inputType="text|textCapSentences|textMultiLine|textLongMessage"
android:scrollHorizontally="true"
android:layout_above="@+id/decrypt_message_section"
android:layout_alignParentStart="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:layout_above="@+id/decrypt_buttons"
android:layout_alignParentEnd="true"
android:id="@+id/decrypt_message_section" />
<LinearLayout
@@ -37,8 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="4dp"
android:layout_alignParentBottom="true">
android:padding="4dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/action_decrypt"
@@ -60,5 +58,5 @@
bootstrapbutton:bb_icon_left="fa-unlock"
bootstrapbutton:bb_type="info" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>