diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-hdpi/ic_change_grey_24dp.png | bin | 0 -> 923 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-mdpi/ic_change_grey_24dp.png | bin | 0 -> 623 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xhdpi/ic_change_grey_24dp.png | bin | 0 -> 1066 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxhdpi/ic_change_grey_24dp.png | bin | 0 -> 1612 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable-xxxhdpi/ic_change_grey_24dp.png | bin | 0 -> 2223 bytes | |||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/add_subkey_dialog.xml | 163 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/certify_item.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/certify_key_fragment.xml | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml | 32 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/upload_key_activity.xml | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 34 |
13 files changed, 111 insertions, 138 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_change_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_change_grey_24dp.png Binary files differnew file mode 100644 index 000000000..f625ba425 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_change_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_change_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_change_grey_24dp.png Binary files differnew file mode 100644 index 000000000..6cf9d044a --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_change_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_change_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_change_grey_24dp.png Binary files differnew file mode 100644 index 000000000..1c30b6f22 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_change_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_change_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_change_grey_24dp.png Binary files differnew file mode 100644 index 000000000..672a9c96c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_change_grey_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_change_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_change_grey_24dp.png Binary files differnew file mode 100644 index 000000000..5be101001 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_change_grey_24dp.png diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml index 4b5058a81..b232ed423 100644 --- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml @@ -13,147 +13,68 @@ android:paddingRight="24dp" android:stretchColumns="1"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginBottom="4dp" - android:text="@string/key_creation_el_gamal_info" /> - <TableRow> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/label_algorithm" /> + android:paddingRight="10dp" + android:text="@string/label_key_type" /> - <Spinner - android:id="@+id/add_subkey_algorithm" + <!-- custom spinner for fixing focus on first item in list at all times --> + <org.sufficientlysecure.keychain.ui.util.spinner.FocusFirstItemSpinner + android:id="@+id/add_subkey_type" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="4dp" /> - </TableRow> - - <TableRow android:id="@+id/add_subkey_row_size"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_key_size" /> - - <Spinner - android:id="@+id/add_subkey_size" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="right" + android:dropDownWidth="wrap_content" android:padding="4dp" /> </TableRow> <TableRow - android:id="@+id/add_subkey_row_curve" - android:visibility="gone"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_ecc_curve"/> - - <Spinner - android:id="@+id/add_subkey_curve" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="right" - android:padding="4dp"/> - </TableRow> - - <TextView - android:id="@+id/add_subkey_custom_key_size_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/key_size_custom_info" - android:visibility="gone" /> - - <EditText - android:id="@+id/add_subkey_custom_key_size_input" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="number" - android:visibility="gone" /> - - <TextView - android:id="@+id/add_subkey_custom_key_size_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - - <TableRow> + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"> <TextView android:id="@+id/label_usage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" + android:layout_gravity="center_vertical|top" + android:paddingRight="10dp" android:text="@string/label_usage" /> - - <CheckBox - android:id="@+id/add_subkey_flag_certify" - android:enabled="false" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_certify" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_sign" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_encrypt" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_encrypt" /> + <RadioGroup + android:id="@+id/add_subkey_usage_group" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content"> + + <RadioButton + android:id="@+id/add_subkey_usage_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:text="@string/usage_none" /> + + <RadioButton + android:id="@+id/add_subkey_usage_sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_sign" /> + + <RadioButton + android:id="@+id/add_subkey_usage_encrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_encrypt" /> + + <RadioButton + android:id="@+id/add_subkey_usage_sign_and_encrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_sign_and_encrypt" /> + </RadioGroup> </TableRow> - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_authenticate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_authenticate" /> - </TableRow> <TableRow android:layout_marginTop="8dp" @@ -164,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip" + android:paddingRight="10dp" android:text="@string/label_expiry" /> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/certify_item.xml b/OpenKeychain/src/main/res/layout/certify_item.xml index 71838c2fc..8aff5823e 100644 --- a/OpenKeychain/src/main/res/layout/certify_item.xml +++ b/OpenKeychain/src/main/res/layout/certify_item.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:clickable="true" - android:layout_marginLeft="8dip" android:layout_marginTop="8dip"/> <LinearLayout android:id="@+id/user_id_body" @@ -21,7 +20,6 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:singleLine="true" - android:layout_marginLeft="8dip" android:layout_marginTop="4dip"> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index 23685ce15..01837240b 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -22,8 +22,9 @@ android:id="@+id/textView" android:layout_weight="1" /> - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_user_ids" + <fragment + android:id="@+id/multi_user_ids_fragment" + android:name="org.sufficientlysecure.keychain.ui.MultiUserIdsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml b/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml new file mode 100644 index 000000000..560934f50 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<org.sufficientlysecure.keychain.ui.widget.FixedListView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/view_key_user_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml new file mode 100644 index 000000000..ae325eaab --- /dev/null +++ b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml @@ -0,0 +1,32 @@ +<?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" + android:paddingLeft="10dp" + android:paddingTop="6dp" + android:paddingRight="10dp" + android:paddingBottom="6dp" + android:background="?android:attr/selectableItemBackground"> + + <TextView android:id="@android:id/text1" + style="?android:attr/spinnerDropDownItemStyle" + android:textStyle="bold" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="6dp" + android:paddingRight="6dp" /> + + <TextView android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="6dp" + android:paddingRight="6dp" + android:paddingTop="2dp" /> + +</LinearLayout> + + + + diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml index 6a0be9ce5..6acb22c3a 100644 --- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -41,6 +41,12 @@ android:layout_marginBottom="4dp" android:layout_marginTop="4dp" /> + <fragment + android:id="@+id/multi_user_ids_fragment" + android:name="org.sufficientlysecure.keychain.ui.MultiUserIdsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView style="@style/SectionHeader" android:layout_width="wrap_content" diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 93cf126f7..d9075b587 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -35,5 +35,6 @@ <!-- linked ID view --> <color name="card_view_button">#7bad45</color> + <color name="toolbar_photo_tint">#1E7bad45</color> </resources> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f9838ba72..18007c53f 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ <string name="title_encrypt_files">"Encrypt"</string> <string name="title_decrypt">"Decrypt"</string> <string name="title_add_subkey">"Add subkey"</string> + <string name="title_change_master_key">Change master key</string> <string name="title_edit_key">"Edit Key"</string> <string name="title_linked_create">"Create a Linked Identity"</string> <string name="title_preferences">"Settings"</string> @@ -40,6 +41,7 @@ <string name="title_advanced_key_info">"Advanced"</string> <string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string> <string name="title_manage_my_keys">"Manage my keys"</string> + <string name="title_alert_strip">"Strip this subkey"</string> <!-- section --> <string name="section_user_ids">"Identities"</string> @@ -165,6 +167,7 @@ <string name="label_keyservers">"Select OpenPGP keyservers"</string> <string name="label_key_id">"Key ID"</string> <string name="label_key_created">"Key created %s"</string> + <string name="label_key_type">"Type"</string> <string name="label_creation">"Creation"</string> <string name="label_expiry">"Expiry"</string> <string name="label_usage">"Usage"</string> @@ -282,22 +285,26 @@ <string name="choice_8hours">"8 hours"</string> <string name="choice_forever">"forever"</string> <string name="choice_select_cert">"Select a Key"</string> - <string name="dsa">"DSA"</string> - <string name="elgamal">"ElGamal"</string> - <string name="rsa">"RSA"</string> - <string name="ecdh">"ECDH"</string> - <string name="ecdsa">"ECDSA"</string> <string name="filemanager_title_open">"Open…"</string> + <string name="rsa_2048">"RSA 2048"</string> + <string name="rsa_2048_description_html">"smaller filesize, considered secure until 2030"</string> + <string name="rsa_3072">"RSA 3072"</string> + <string name="rsa_3072_description_html">"recommended, considered secure until 2040"</string> + <string name="rsa_4096">"RSA 4096"</string> + <string name="rsa_4096_description_html">"larger file size, considered secure until 2040+"</string> + <string name="ecc_p256">"ECC P-256"</string> + <string name="ecc_p256_description_html">"very tiny filesize, considered secure until 2040 <br/> <u>experimental and not supported by all implementations</u>"</string> + <string name="ecc_p521">"ECC P-521"</string> + <string name="ecc_p521_description_html">"tiny filesize, considered secure until 2040+ <br/> <u>experimental and not supported by all implementations"</u></string> + <string name="usage_none">"None (subkey binding only)"</string> + <string name="usage_sign">"Sign"</string> + <string name="usage_encrypt">"Encrypt"</string> + <string name="usage_sign_and_encrypt">"Sign & Encrypt"</string> <string name="error">"Error"</string> <string name="error_message">"Error: %s"</string> <string name="theme_dark">"Dark"</string> <string name="theme_light">"Light"</string> - - <!-- key flags --> - <string name="flag_certify">"Certify"</string> - <string name="flag_sign">"Sign"</string> - <string name="flag_encrypt">"Encrypt"</string> - <string name="flag_authenticate">"Authenticate"</string> + <string name="strip">"Strip it"</string> <!-- sentences --> <string name="wrong_passphrase">"Wrong password."</string> @@ -332,6 +339,7 @@ <string name="public_key_deletetion_confirmation">"Delete key '%s'?"</string> <string name="also_export_secret_keys">"Also export secret keys"</string> <string name="reinstall_openkeychain">"You encountered a known bug with Android. Please reinstall OpenKeychain if you want to link your contacts with keys."</string> + <string name="alert_strip">"Stripping this subkey will make it unusable on this device!"</string> <string name="key_exported">"Successfully exported 1 key."</string> <string name="keys_exported">"Successfully exported %d keys."</string> @@ -748,7 +756,7 @@ <item>"Move Subkey to Security Token"</item> </string-array> <string name="edit_key_new_subkey">"new subkey"</string> - <string name="edit_key_select_flag">"Please select at least one flag!"</string> + <string name="edit_key_select_usage">"Please select key usage!"</string> <string name="edit_key_error_add_identity">"Add at least one identity!"</string> <string name="edit_key_error_add_subkey">"Add at least one subkey!"</string> <string name="edit_key_error_bad_security_token_algo">"Algorithm not supported by Security Token!"</string> @@ -1546,7 +1554,7 @@ <string name="snack_security_token_import">"Import"</string> <string name="button_bind_key">"Bind Key"</string> <string name="security_token_serial_no">"Serial No: %s"</string> - <string name="security_token_key_holder">"Key holder: "</string> + <string name="security_token_key_holder">"Key holder: %s"</string> <string name="security_token_key_holder_not_set"><![CDATA[Key holder: <not set>]]></string> <string name="security_token_status_bound">"Security Token matches and is bound to key"</string> <string name="security_token_status_unbound">"Security Token matches, can be bound to key"</string> |
