diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml | 116 |
1 files changed, 18 insertions, 98 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml index d6a05f0d4..1dba66cfa 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + xmlns:custom="http://schemas.android.com/apk/res-auto" + android:id="@+id/content_frame" android:layout_marginLeft="@dimen/drawer_content_padding" android:layout_width="match_parent" android:layout_height="match_parent" @@ -71,7 +72,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="16dp"> + android:paddingLeft="16dp" + android:paddingRight="4dip"> <TextView android:id="@+id/mainUserId" @@ -215,7 +217,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage"/> + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:hint="@string/encrypt_content_edit_text_hint"/> </LinearLayout> <LinearLayout @@ -253,101 +256,18 @@ bootstrapbutton:bb_type="default"/> </LinearLayout> - <LinearLayout - android:id="@+id/advancedSettingsControl" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:clickable="true"> - - <com.beardedhen.androidbootstrap.FontAwesomeText - android:id="@+id/advancedSettingsIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="10dp" - android:textSize="12sp" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - fontawesometext:fa_icon="fa-chevron-right"/> - - <TextView - android:id="@+id/advancedSettings" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/btn_encryption_advanced_settings_show" - android:paddingTop="@dimen/padding_medium" - android:paddingBottom="@dimen/padding_medium" - android:textColor="@color/emphasis"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/fileAdvancedSettingsContainer" + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/label_fileCompression" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_file_compression" - android:textAppearance="?android:attr/textAppearanceSmall"/> - - <Spinner - android:id="@+id/fileCompression" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/deleteAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_encryption"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + android:layout_height="match_parent" + 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"> - <CheckBox - android:id="@+id/shareAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_share_after_encryption"/> - </LinearLayout> + <include layout="@layout/encrypt_content_adv_settings"/> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> - <CheckBox - android:id="@+id/asciiArmour" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_ascii_armor"/> - </LinearLayout> - </LinearLayout> </LinearLayout> </ViewFlipper> @@ -371,7 +291,7 @@ android:padding="4dp" android:layout_weight="1" android:text="@string/btn_share" - bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_icon_left="fa-share-square" bootstrapbutton:bb_type="info"/> <com.beardedhen.androidbootstrap.BootstrapButton @@ -381,7 +301,7 @@ android:padding="4dp" android:layout_weight="1" android:text="@string/btn_clipboard" - bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_icon_left="fa-clipboard" bootstrapbutton:bb_type="info"/> <com.beardedhen.androidbootstrap.BootstrapButton @@ -395,4 +315,4 @@ bootstrapbutton:bb_type="info"/> </LinearLayout> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> |