diff options
Diffstat (limited to 'OpenKeychain/src')
8 files changed, 46 insertions, 33 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index b43991ff1..b5fd1fcc0 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -65,16 +65,6 @@ android:layout_height="match_parent"> <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="@string/section_decrypt_verify" - android:layout_above="@+id/decrypt_file_action_decrypt" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <TextView android:id="@+id/decrypt_file_action_decrypt" android:paddingLeft="8dp" android:paddingRight="8dp" @@ -83,12 +73,21 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:text="@string/btn_decrypt_verify" + 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_alignParentStart="true" + android:layout_marginBottom="8dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_above="@+id/decrypt_file_action_decrypt" /> </RelativeLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml index 6c1eb3bdd..e54edd0d1 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml @@ -37,19 +37,25 @@ android:scrollHorizontally="true" android:layout_weight="1" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <LinearLayout android:id="@+id/action_decrypt" android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_marginBottom="8dp"> <TextView android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:text="@string/btn_decrypt_verify" diff --git a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml index c7047b822..c8aaf77b8 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml @@ -59,16 +59,6 @@ android:layout_height="match_parent"> <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="@string/section_encrypt_and_or_sign" - android:layout_above="@+id/action_encrypt_file" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <TextView android:id="@+id/action_encrypt_file" android:paddingLeft="8dp" android:paddingRight="8dp" @@ -77,12 +67,21 @@ 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_alignParentStart="true" + android:layout_marginBottom="8dp" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_above="@+id/action_encrypt_file" /> </RelativeLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml index 24e604398..fab983fa5 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml @@ -21,19 +21,25 @@ android:hint="@string/encrypt_content_edit_text_hint" android:layout_weight="1" /> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + <LinearLayout android:id="@+id/action_encrypt_share" android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_marginBottom="8dp"> <TextView android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:text="@string/btn_share_encrypted_signed" diff --git a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml index 84386074f..1b15c7363 100644 --- a/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_keys_fragment.xml @@ -19,13 +19,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" + android:layout_marginTop="8dp" android:text="@string/section_keys" /> <org.sufficientlysecure.keychain.ui.widget.FixedListView android:id="@+id/keys" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index d90c4cd17..7d0f714a0 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" + android:layout_marginTop="8dp" android:text="@string/section_user_ids" android:layout_weight="1" /> @@ -109,6 +109,7 @@ android:id="@+id/view_key_action_encrypt" android:paddingLeft="8dp" android:paddingRight="8dp" + android:layout_marginBottom="8dp" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml index ae6b750b2..48730587d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_share_fragment.xml @@ -19,7 +19,7 @@ style="@style/SectionHeader" android:layout_width="wrap_content" android:layout_height="0dp" - android:layout_marginTop="14dp" + android:layout_marginTop="8dp" android:text="@string/section_fingerprint" android:layout_weight="1" /> @@ -141,7 +141,8 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" style="@style/SelectableItem" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_marginBottom="8dp"> <TextView android:paddingLeft="8dp" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 29c804fcb..e82bc2a8f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -48,9 +48,9 @@ <!-- button --> <string name="btn_certify">Certify</string> - <string name="btn_decrypt_verify">Decrypt and Verify</string> + <string name="btn_decrypt_verify">Verify and save decrypted file</string> <string name="btn_decrypt_verify_clipboard">From Clipboard</string> - <string name="btn_encrypt_file">Encrypt File</string> + <string name="btn_encrypt_file">Save encrypt file</string> <string name="btn_save">Save</string> <string name="btn_do_not_save">Cancel</string> <string name="btn_delete">Delete</string> |