diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_activity.xml | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_content.xml | 78 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_files_activity.xml | 14 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_activity.xml | 14 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml (renamed from OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml) | 23 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_file_content.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/encrypt_text_content.xml | 2 |
7 files changed, 132 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml new file mode 100644 index 000000000..bb0e463b3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/decrypt_content"/> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.FixedDrawerLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml new file mode 100644 index 000000000..1fa6ea848 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="Files" /> + + + <TextView + android:id="@+id/decrypt_files" + 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:clickable="true" + style="@style/SelectableItem" + android:text="Decrypt files" + android:drawableRight="@drawable/ic_action_collection" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="32dp" + android:text="Text" /> + + <TextView + android:id="@+id/decrypt_from_clipboard" + 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:clickable="true" + style="@style/SelectableItem" + android:text="Decrypt from clipboard" + android:drawableRight="@drawable/ic_action_paste" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml new file mode 100644 index 000000000..0380787db --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> + + <FrameLayout + android:id="@+id/decrypt_files_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml new file mode 100644 index 000000000..e08ecb39e --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <include layout="@layout/notify_area" /> + + <FrameLayout + android:id="@+id/decrypt_text_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 3b4eba3ef..5e9189fd3 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -25,24 +25,25 @@ android:paddingRight="16dp" android:orientation="vertical"> - - <EditText - android:id="@+id/message" + <TextView + android:id="@+id/decrypt_text_plaintext" + android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="0dip" android:gravity="top" - android:hint="@string/decrypt_content_edit_text_hint" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage|textNoSuggestions" + android:hint="" android:scrollHorizontally="true" - android:layout_weight="1" /> + android:layout_weight="1" + android:textIsSelectable="true" /> <View android:layout_width="match_parent" android:layout_height="1dip" android:background="?android:attr/listDivider" /> + <LinearLayout - android:id="@+id/action_decrypt" + android:id="@+id/action_encrypt_share_plaintext" android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" @@ -57,7 +58,9 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:text="@string/btn_decrypt_verify_message" + android:text="Share plaintext" + android:drawableRight="@drawable/ic_action_share" + android:drawablePadding="8dp" android:gravity="center_vertical" android:layout_weight="1" /> @@ -70,11 +73,11 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/action_decrypt_from_clipboard" + android:id="@+id/action_copy_plaintext" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_paste" + android:src="@drawable/ic_action_copy" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml index 34f6eadda..5bf652780 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_content.xml @@ -16,7 +16,7 @@ android:orientation="vertical" /> <fragment - android:id="@+id/certify_key_fragment" + android:id="@+id/encrypt_file_fragment" android:name="org.sufficientlysecure.keychain.ui.EncryptFileFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml index ee87b8a7e..809f00204 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_content.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_content.xml @@ -16,7 +16,7 @@ android:orientation="vertical" /> <fragment - android:id="@+id/certify_key_fragment" + android:id="@+id/encrypt_text_fragment" android:name="org.sufficientlysecure.keychain.ui.EncryptTextFragment" android:layout_width="match_parent" android:layout_height="match_parent" /> |