diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-02 00:34:21 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-02 00:34:21 +0200 |
commit | 93eae114eac566a9ed2da6275c147b66ca480305 (patch) | |
tree | fed3c5614807522dc7a5ddce9bea40c061444fee /OpenKeychain/src/main/res/layout | |
parent | 35647734104471a6d35bc26a77682dd5531dd5e3 (diff) | |
download | open-keychain-93eae114eac566a9ed2da6275c147b66ca480305.tar.gz open-keychain-93eae114eac566a9ed2da6275c147b66ca480305.tar.bz2 open-keychain-93eae114eac566a9ed2da6275c147b66ca480305.zip |
Encrypt/Decrypt UI work
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 108 insertions, 79 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index 098aaaea1..6ff827894 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -26,32 +26,41 @@ android:orientation="vertical"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <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" /> + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" - <ImageButton android:id="@+id/decrypt_file_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:src="@drawable/ic_action_collection" - android:background="@drawable/button_rounded" - android:layout_gravity="center_vertical"/> + android:clickable="true" + style="@style/SelectableItem"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_file_colon" + android:gravity="center_vertical"/> + + <TextView + android:id="@+id/decrypt_file_filename" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:hint="@string/filemanager_title_open" + android:drawableRight="@drawable/ic_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical"/> </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp"/> + <CheckBox android:id="@+id/decrypt_file_delete_after_decryption" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml index ac990653a..8394fd4fe 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml @@ -41,19 +41,6 @@ android:orientation="horizontal"> <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> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox android:id="@+id/asciiArmor" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index 4142b3de6..c97069e67 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <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" @@ -9,38 +8,46 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="4dp" android:paddingLeft="16dp" android:paddingRight="16dp" android:orientation="vertical"> <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" /> - - <ImageButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:layout_gravity="center_vertical" - android:src="@drawable/ic_action_collection" - android:background="@drawable/button_rounded"/> + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + + android:id="@+id/btn_browse" + android:clickable="true" + style="@style/SelectableItem"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_file_colon" + android:gravity="center_vertical"/> + + <TextView + android:id="@+id/filename" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:hint="@string/filemanager_title_open" + android:drawableRight="@drawable/ic_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical"/> </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp"/> + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -57,30 +64,56 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <TextView - android:id="@+id/action_encrypt_file" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:text="@string/btn_encrypt_file" - android:clickable="true" - style="@style/SelectableItem" - android:drawableRight="@drawable/ic_action_save" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_marginBottom="8dp" /> + + <LinearLayout + android:id="@+id/action_encrypt_share" + android:paddingLeft="8dp" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginBottom="8dp" + android:clickable="true" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="@string/btn_encrypt_share_file" + android:layout_weight="1" + android:drawableRight="@drawable/ic_action_share" + android:drawablePadding="8dp" + android:gravity="center_vertical"/> + + <View + android:layout_width="1dip" + android:layout_height="match_parent" + android:gravity="right" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="?android:attr/listDivider"/> + + <ImageButton + android:id="@+id/action_encrypt_file" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_save" + android:layout_gravity="center_vertical" + style="@style/SelectableItem"/> + + </LinearLayout> <View android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" - android:layout_above="@+id/action_encrypt_file" /> + android:layout_above="@+id/action_encrypt_share"/> </RelativeLayout> </LinearLayout> |