diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
40 files changed, 200 insertions, 64 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png Binary files differnew file mode 100644 index 000000000..56c0a8c94 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_email_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png Binary files differnew file mode 100644 index 000000000..b971cd9fd --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_email_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png Binary files differnew file mode 100644 index 000000000..6d7dd4fc9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_email_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png Binary files differnew file mode 100644 index 000000000..c50ea840a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_email_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png Binary files differnew file mode 100644 index 000000000..9420d8205 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_email_grey_24dp.png diff --git a/OpenKeychain/src/main/res/layout/add_email_dialog.xml b/OpenKeychain/src/main/res/layout/add_email_dialog.xml new file mode 100644 index 000000000..68d895145 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/add_email_dialog.xml @@ -0,0 +1,26 @@ +<?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="wrap_content" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:paddingLeft="24dp" + android:paddingRight="24dp"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/create_key_add_email_text" + android:textAppearance="?android:textAppearanceMedium" /> + + <org.sufficientlysecure.keychain.ui.widget.EmailEditText + android:id="@+id/add_email_address" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:hint="@string/label_email" + android:imeOptions="actionNext" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml index f9a8e9933..88b96284f 100644 --- a/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml +++ b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml @@ -72,7 +72,7 @@ <TextView android:id="@+id/api_account_settings_create_key" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index c1227f906..23685ce15 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -77,7 +77,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView diff --git a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml index a24d1a2ee..17cfe54ac 100644 --- a/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_email_fragment.xml @@ -4,6 +4,7 @@ android:layout_height="match_parent"> <ScrollView + android:layout_alignParentTop="true" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" @@ -34,6 +35,12 @@ android:hint="@string/label_email" android:ems="10" /> + <android.support.v7.widget.RecyclerView + android:id="@+id/create_key_emails" + android:scrollbars="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml new file mode 100644 index 000000000..3e58d40e5 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_email_list_footer.xml @@ -0,0 +1,23 @@ +<?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="wrap_content" + android:minHeight="16dp" + android:orientation="horizontal" + android:singleLine="true"> + + <Button + android:id="@+id/create_key_add_email" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/btn_add_email" + style="?android:attr/borderlessButtonStyle" + android:drawableLeft="@drawable/ic_email_grey_24dp" + android:drawablePadding="8dp" + android:gravity="left|center_vertical" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml new file mode 100644 index 000000000..0968f3a63 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/create_key_email_list_item.xml @@ -0,0 +1,28 @@ +<?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="wrap_content" + android:minHeight="16dp" + android:orientation="horizontal" + android:singleLine="true"> + + <TextView + android:id="@+id/create_key_email_item_email" + android:layout_width="0dp" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:layout_weight="1" + android:text="alice@example.com" + android:textAppearance="?android:attr/textAppearanceMedium" + android:paddingLeft="8dp" /> + + <ImageButton + android:id="@+id/create_key_email_item_delete_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_close_grey_24dp" + android:layout_gravity="center_vertical" + android:background="?android:selectableItemBackground" /> + +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 830f039f7..e085fcb09 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -113,7 +113,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml index a5646dc26..2ef411eaf 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml @@ -32,7 +32,7 @@ android:id="@+id/decrypt_file_browse" android:clickable="true" - style="@style/SelectableItem"> + android:background="?android:selectableItemBackground"> <TextView android:layout_width="wrap_content" @@ -81,7 +81,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:text="@string/btn_decrypt_verify_file" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:drawableRight="@drawable/ic_save_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 9d47009b9..debc1106f 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -75,7 +75,7 @@ android:clickable="true" android:layout_marginLeft="32dp" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <LinearLayout @@ -121,7 +121,7 @@ android:drawableRight="@drawable/ic_vpn_key_grey_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 0f341b2d6..fb01a5ef0 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -48,7 +48,7 @@ android:layout_marginLeft="16dp" android:layout_marginRight="16dp" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView @@ -79,7 +79,7 @@ android:padding="8dp" android:src="@drawable/ic_content_copy_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/file_list_entry.xml b/OpenKeychain/src/main/res/layout/file_list_entry.xml index fafdd1713..ca78ad161 100644 --- a/OpenKeychain/src/main/res/layout/file_list_entry.xml +++ b/OpenKeychain/src/main/res/layout/file_list_entry.xml @@ -56,5 +56,5 @@ android:src="@drawable/ic_close_grey_24dp" android:clickable="true" android:layout_centerVertical="true" - style="@style/SelectableItem"/> + android:background="?android:selectableItemBackground"/> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/first_time_activity.xml b/OpenKeychain/src/main/res/layout/first_time_activity.xml index bab9e2e27..9b37766e9 100644 --- a/OpenKeychain/src/main/res/layout/first_time_activity.xml +++ b/OpenKeychain/src/main/res/layout/first_time_activity.xml @@ -43,7 +43,7 @@ android:gravity="center_vertical" android:layout_gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> <View android:layout_width="1dp" @@ -67,7 +67,7 @@ android:gravity="center_vertical" android:layout_gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> @@ -87,7 +87,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_horizontal" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 6ac0b468c..2cba78f37 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -77,7 +77,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml index a7234d848..1fc8cfdcb 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml @@ -31,7 +31,7 @@ android:padding="8dp" android:src="@drawable/ic_search_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> <View android:layout_width="1dip" @@ -48,7 +48,7 @@ android:padding="8dp" android:src="@drawable/ic_settings_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml index bde4dafc0..c1b9eb276 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView @@ -40,7 +40,7 @@ android:padding="8dp" android:src="@drawable/ic_content_paste_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 9007d2149..80e59ad18 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView @@ -40,7 +40,7 @@ android:padding="8dp" android:src="@drawable/ic_nfc_white_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 595dcd77b..db0462c6d 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -60,7 +60,7 @@ android:layout_gravity="center" android:src="@drawable/ic_repeat_grey_24dp" android:padding="12dp" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml index 9665f3e80..aeda03f5d 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml @@ -111,7 +111,7 @@ android:layout_weight="1" android:text="@string/btn_back" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -137,7 +137,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml index af5937067..33b7a6fb0 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml @@ -155,7 +155,7 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -180,7 +180,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml index 799de2997..6122eb6df 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml @@ -106,7 +106,7 @@ android:layout_weight="1" android:text="@string/btn_back" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -132,7 +132,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index e726c48be..72cce7310 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -159,7 +159,7 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -184,7 +184,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index 33db6ed5f..d4df74e37 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml @@ -99,7 +99,7 @@ android:text="@string/btn_back" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:gravity="center_vertical" android:layout_gravity="center_vertical" /> @@ -124,7 +124,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml index 3ae871f5a..fb2f5344f 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml @@ -114,7 +114,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> <View @@ -138,7 +138,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml index a37cf01cf..c5adac4b0 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml @@ -164,7 +164,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> <View @@ -188,7 +188,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:layout_gravity="center_vertical" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml index deaa9098d..308eb60f5 100644 --- a/OpenKeychain/src/main/res/layout/linked_select_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml @@ -49,7 +49,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <!-- separate ImageView required for recoloring --> @@ -84,7 +84,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <!-- separate ImageView required for recoloring --> @@ -119,7 +119,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <!-- separate ImageView required for recoloring --> diff --git a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml index 42baa6a0d..d509fbeec 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_wizard_fragment_select_methods.xml @@ -33,7 +33,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:clickable="true" android:onClick="noPassphrase" - style="@style/SelectableItem"/> + android:background="?android:selectableItemBackground"/> <View android:layout_width="match_parent" @@ -51,7 +51,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:clickable="true" android:onClick="passphrase" - style="@style/SelectableItem"/> + android:background="?android:selectableItemBackground"/> <View android:layout_width="match_parent" android:layout_height="1dip" @@ -67,7 +67,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:clickable="true" android:onClick="startLockpattern" - style="@style/SelectableItem"/> + android:background="?android:selectableItemBackground"/> <View android:layout_width="match_parent" android:layout_height="1dip" @@ -83,7 +83,7 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:clickable="true" android:onClick="NFC" - style="@style/SelectableItem"/> + android:background="?android:selectableItemBackground"/> </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index bafad173b..eb8547ade 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -51,7 +51,7 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" android:paddingRight="4dp" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml index 6b7390b27..6a0be9ce5 100644 --- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -63,7 +63,7 @@ android:drawablePadding="8dp" android:gravity="center_vertical" android:clickable="true" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml index 08be4ab05..789c7c774 100644 --- a/OpenKeychain/src/main/res/layout/view_cert_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_cert_activity.xml @@ -211,7 +211,7 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:text="@string/btn_view_cert_key" android:layout_weight="1" android:drawableRight="@drawable/ic_person_grey_24dp" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index ec26b4a76..6a21e0dc1 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView @@ -59,7 +59,7 @@ android:padding="8dp" android:src="@drawable/ic_content_copy_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> @@ -103,7 +103,7 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView @@ -133,7 +133,7 @@ android:padding="8dp" android:src="@drawable/ic_content_copy_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> <View android:layout_width="1dip" @@ -150,7 +150,7 @@ android:padding="8dp" android:src="@drawable/ic_repeat_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:clickable="true" - style="@style/SelectableItem" + android:background="?android:selectableItemBackground" android:text="@string/key_view_action_upload" android:layout_weight="1" android:drawableRight="@drawable/ic_file_upload_grey_24dp" diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml index 28eef58a4..c9eb37f5e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_subkey_item.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:padding="8dp" android:src="@drawable/ic_close_grey_24dp" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml index cd7a79663..1c55a1446 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_user_id_item.xml @@ -75,6 +75,6 @@ android:padding="8dp" android:src="@drawable/ic_close_grey_24dp" android:layout_gravity="center_vertical" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index a3d7250f9..f842f764d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -1,7 +1,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:card_view="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" @@ -31,14 +31,15 @@ style="@style/CardViewHeader" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/section_user_ids" /> + android:text="@string/section_user_ids"/> <org.sufficientlysecure.keychain.ui.widget.FixedListView android:id="@+id/view_key_user_ids" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" /> + android:layout_marginBottom="4dp"/> </LinearLayout> + </android.support.v7.widget.CardView> <android.support.v7.widget.CardView @@ -86,8 +87,57 @@ android:text="%d more unknown identity types" android:paddingLeft="8dp" android:paddingRight="8dp" - style="@style/SelectableItem" /> + android:background="?android:selectableItemBackground" /> + + </LinearLayout> + + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/linked_system_contact_card" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" + card_view:cardBackgroundColor="@android:color/white" + card_view:cardElevation="2dp" + card_view:cardUseCompatPadding="true" + card_view:cardCornerRadius="4dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + style="@style/CardViewHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/section_linked_system_contact"/> + + <LinearLayout + android:id='@+id/system_contact_layout' + android:clickable="true" + android:background="?android:selectableItemBackground" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/system_contact_picture" + android:layout_margin="6dp" + android:layout_width="48dp" + android:layout_height="48dp" + android:scaleType="centerCrop" + android:src="@drawable/ic_person_grey_48dp"/> + <TextView + android:id="@+id/system_contact_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/view_key_fragment_no_system_contact"/> + </LinearLayout> </LinearLayout> </android.support.v7.widget.CardView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 72ba98ed9..36ce308de 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -48,6 +48,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> + <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> <string name="section_cloud_evidence">"Proofs from the cloud"</string> @@ -99,6 +100,7 @@ <string name="btn_decrypt_files">"Decrypt files"</string> <string name="btn_encrypt_files">"Encrypt files"</string> <string name="btn_encrypt_text">"Encrypt text"</string> + <string name="btn_add_email">"Add additional email address"</string> <!-- menu --> <string name="menu_preferences">"Settings"</string> @@ -629,10 +631,12 @@ <string name="create_key_rsa">"(3 subkeys, RSA, 4096 bit)"</string> <string name="create_key_custom">"(custom key configuration)"</string> <string name="create_key_name_text">"Choose a name associated with this key. This can be a full name, e.g., 'John Doe', or a nickname, e.g., 'Johnny'."</string> - <string name="create_key_email_text">"Choose the email address used for encrypted communication."</string> + <string name="create_key_email_text">"Enter your main email address used for secure communication."</string> <string name="create_key_passphrase_text">"Choose a strong passphrase. It protects your key when your device gets stolen."</string> <string name="create_key_hint_full_name">"Full Name or Nickname"</string> <string name="create_key_edit">"Change key configuration"</string> + <string name="create_key_add_email">"Add email address"</string> + <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> @@ -642,6 +646,8 @@ <string name="view_key_verified">"Confirmed Key"</string> <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string> + <string name="view_key_fragment_no_system_contact">"<none>"</string> + <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 8d8797bf0..9ac60c397 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -21,10 +21,6 @@ <item name="android:textSize">14sp</item> </style> - <style name="SelectableItem"> - <item name="android:background">@drawable/selector_transparent_button</item> - </style> - <style name="FabMenuStyle"> <item name="android:background">@drawable/fab_label_background</item> <item name="android:textColor">@color/white</item> |
