diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_content.xml | 56 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml | 6 |
2 files changed, 46 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml index 1fa6ea848..7cd066b5b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_content.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_content.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="Files" /> + android:text="@string/section_decrypt_files" /> <TextView @@ -34,7 +34,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" style="@style/SelectableItem" - android:text="Decrypt files" + android:text="@string/btn_decrypt_files" android:drawableRight="@drawable/ic_action_collection" android:drawablePadding="8dp" android:gravity="center_vertical" /> @@ -50,22 +50,51 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" - android:text="Text" /> + android:text="@string/section_decrypt_text" /> - <TextView + <LinearLayout 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:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" + android:paddingRight="4dp" style="@style/SelectableItem" - android:text="Decrypt from clipboard" - android:drawableRight="@drawable/ic_action_paste" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> + android:orientation="horizontal"> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingRight="4dp" + android:gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/btn_decrypt_clipboard" /> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/tertiary_text_light" + android:text="@string/btn_decrypt_and_verify" + android:gravity="center_vertical" /> + + </LinearLayout> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_paste" + android:layout_gravity="center_vertical" /> + + </LinearLayout> <View android:layout_width="match_parent" @@ -75,4 +104,5 @@ </LinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index f6cc892d7..1c6097495 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -43,7 +43,7 @@ <LinearLayout - android:id="@+id/action_encrypt_share_plaintext" + android:id="@+id/action_decrypt_share_plaintext" android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" @@ -57,7 +57,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" - android:text="Share plaintext" + android:text="@string/btn_add_share_decrypted_text" android:drawableRight="@drawable/ic_action_share" android:drawablePadding="8dp" android:gravity="center_vertical" @@ -72,7 +72,7 @@ android:background="?android:attr/listDivider" /> <ImageButton - android:id="@+id/action_copy_plaintext" + android:id="@+id/action_decrypt_copy_plaintext" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" |