diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 53 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors_keychaintheme.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 53 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles_keychaintheme.xml | 39 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 38 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes_keychaintheme.xml | 43 |
7 files changed, 217 insertions, 15 deletions
diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index a21f949d1..353e33058 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -1,8 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="emphasis">#aa66cc</color> - <color name="emphasis_dark">#9933cc</color> + <!--<color name="colorPrimary">@color/material_deep_teal_500</color>--> + <!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>--> + + <!-- TODO: --> + + <color name="colorSecondary">@color/material_deep_teal_200</color> + <color name="colorSecondaryDark">@color/material_deep_teal_500</color> + <!--<color name="windowBackgroundColor">#333333</color>--> + <color name="black_translucent">#80000000</color> + + <!-- Palette generated by Material Palette materialpalette.com/green/indigo --> + <color name="colorPrimary">#4CAF50</color> + <color name="colorPrimaryDark">#388E3C</color> + + <!-- TODO: --> + <color name="primary">#4CAF50</color> + <color name="primary_dark">#388E3C</color> + <color name="primary_light">#C8E6C9</color> + <color name="accent">#536DFE</color> + <color name="primary_text">#212121</color> + <color name="secondary_text">#727272</color> + <color name="icons">#FFFFFF</color> + <color name="divider">#B6B6B6</color> + + + <!-- set to text colors --> + <color name="emphasis">#212121</color> + <color name="emphasis_dark">#727272</color> + <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> <color name="alert">#ffdd3333</color> @@ -10,14 +37,18 @@ <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> - <!-- http://developer.android.com/design/style/color.html --> - <color name="android_red_light">#ffff4444</color> - <color name="android_red_dark">#ffCC0000</color> - <color name="android_orange_light">#ffffbb33</color> - <color name="android_orange_dark">#ffFF8800</color> - <color name="android_green_light">#ff99cc00</color> - <color name="android_green_dark">#ff669900</color> - <color name="android_purple_light">#ffaa66cc</color> - <color name="android_purple_dark">#ff9933CC</color> + <!-- + http://www.google.com/design/spec/style/color.html#color-color-palette + light = normal color + dark = 900 + --> + <color name="android_red_light">#f44336</color> + <color name="android_red_dark">#b71c1c</color> + <color name="android_orange_light">#ff9800</color> + <color name="android_orange_dark">#e65100</color> + <color name="android_green_light">#4caf50</color> + <color name="android_green_dark">#1b5e20</color> + <color name="android_purple_light">#673ab7</color> + <color name="android_purple_dark">#311b92</color> </resources> diff --git a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml new file mode 100644 index 000000000..e9b8c9350 --- /dev/null +++ b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="keychaintheme_color">#4caf50</color> +</resources> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 301de0be1..459bdf99c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -17,10 +17,10 @@ <string name="title_unlock">"Unlock Key"</string> <string name="title_add_subkey">"Add subkey"</string> <string name="title_edit_key">"Edit Key"</string> - <string name="title_preferences">"Preferences"</string> + <string name="title_preferences">"Settings"</string> <string name="title_cloud_search_preferences">"Cloud Search Preferences"</string> <string name="title_api_registered_apps">"Apps"</string> - <string name="title_key_server_preference">"Keyserver Preference"</string> + <string name="title_key_server_preference">"Keyservers"</string> <string name="title_change_passphrase">"Change Passphrase"</string> <string name="title_share_fingerprint_with">"Share fingerprint with…"</string> <string name="title_share_key">"Share key with…"</string> @@ -98,6 +98,7 @@ <string name="menu_encrypt_to">"Encrypt to…"</string> <string name="menu_select_all">"Select all"</string> <string name="menu_add_keys">"Add keys"</string> + <string name="menu_search_cloud">"Search cloud"</string> <string name="menu_export_all_keys">"Export all keys"</string> <string name="menu_advanced">"Show advanced info"</string> @@ -309,6 +310,7 @@ <string name="progress_modify_unlock">"unlocking keyring…"</string> <string name="progress_modify_adduid">"adding user IDs…"</string> + <string name="progress_modify_adduat">"adding user attributes…"</string> <string name="progress_modify_revokeuid">"revoking user IDs…"</string> <string name="progress_modify_primaryuid">"changing primary user ID…"</string> <string name="progress_modify_subkeychange">"modifying subkeys…"</string> @@ -393,6 +395,7 @@ <string name="import_qr_code_wrong">"QR Code malformed! Please try again!"</string> <string name="import_qr_code_too_short_fingerprint">"Fingerprint is too short (< 16 characters)"</string> <string name="import_qr_code_button">"Scan QR Code"</string> + <string name="import_qr_code_text">"Place your camera over the QR Code!"</string> <!-- Generic result toast --> <string name="view_log">"View Log"</string> @@ -682,6 +685,23 @@ <string name="msg_ip_uid_reorder">"Re-ordering user IDs"</string> <string name="msg_ip_uid_processing">"Processing user ID %s"</string> <string name="msg_ip_uid_revoked">"User ID is revoked"</string> + + <string name="msg_ip_uat_processing_image">"Processing user attribute of type image"</string> + <string name="msg_ip_uat_processing_unknown">"Processing user attribute of unknown type"</string> + <string name="msg_ip_uat_cert_bad">"Encountered bad certificate!"</string> + <string name="msg_ip_uat_cert_error">"Error processing certificate!"</string> + <string name="msg_ip_uat_cert_nonrevoke">"Already have a non-revokable certificate, skipping."</string> + <string name="msg_ip_uat_cert_old">"Certificate is older than previous, skipping."</string> + <string name="msg_ip_uat_cert_new">"Certificate is more recent, replacing previous."</string> + <string name="msg_ip_uat_cert_good">"Found good certificate by %1$s"</string> + <string name="msg_ip_uat_cert_good_revoke">"Found good certificate revocation by %1$s"</string> + <plurals name="msg_ip_uat_certs_unknown"> + <item quantity="one">"Ignoring one certificate issued by an unknown public key"</item> + <item quantity="other">"Ignoring %s certificates issued by unknown public keys"</item> + </plurals> + <string name="msg_ip_uat_classifying">"Classifying user attributes"</string> + <string name="msg_ip_uat_revoked">"User attribute is revoked"</string> + <string name="msg_is_bad_type_public">"Tried to import public keyring as secret. This is a bug, please file a report!"</string> <string name="msg_is_bad_type_uncanon">"Tried to import a keyring without canonicalization. This is a bug, please file a report!"</string> @@ -760,8 +780,23 @@ <string name="msg_kc_uid_revoke_old">"Removing outdated revocation certificate for user ID '%s'"</string> <string name="msg_kc_uid_no_cert">"No valid self-certificate found for user ID '%s', removing from ring"</string> <string name="msg_kc_uid_remove">"Removing invalid user ID '%s'"</string> - <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The secret key contained two of them. This may result in missing certificates!"</string> + <string name="msg_kc_uid_dup">"Removing duplicate user ID '%s'. The keyring contained two of them. This may result in missing certificates!"</string> <string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string> + <string name="msg_kc_uat_jpeg">"Processing user attribute of type JPEG"</string> + <string name="msg_kc_uat_unknown">"Processing user attribute of unknown type"</string> + <string name="msg_kc_uat_bad_err">"Removing bad self certificate for user attribute"</string> + <string name="msg_kc_uat_bad_local">"Removing user attribute certificate with 'local' flag"</string> + <string name="msg_kc_uat_bad_time">"Removing user attribute with future timestamp"</string> + <string name="msg_kc_uat_bad_type">"Removing user attribute certificate of unknown type (%s)"</string> + <string name="msg_kc_uat_bad">"Removing bad self certificate for user attribute"</string> + <string name="msg_kc_uat_cert_dup">"Removing outdated self certificate for user attribute"</string> + <string name="msg_kc_uat_dup">"Removing duplicate user attribute. The keyring contained two of them. This may result in missing certificates!"</string> + <string name="msg_kc_uat_foreign">"Removing foreign user attribute certificate by"</string> + <string name="msg_kc_uat_revoke_dup">"Removing redundant revocation certificate for user attribute"</string> + <string name="msg_kc_uat_revoke_old">"Removing outdated revocation certificate for user attribute"</string> + <string name="msg_kc_uat_no_cert">"No valid self-certificate found for user attribute, removing from ring"</string> + <string name="msg_kc_uat_remove">"Removing invalid user attribute"</string> + <string name="msg_kc_uat_warn_encoding">"User id does not verify as UTF-8!"</string> <!-- Keyring merging log entries --> <string name="msg_mg_error_secret_dummy">"New public subkey found, but secret subkey dummy generation is not supported!"</string> @@ -791,6 +826,7 @@ <!-- modifySecretKeyRing --> <string name="msg_mr">"Modifying keyring %s"</string> + <string name="msg_mf_error_divert_serial">"The serial number of a divert-to-card key must be 16 bytes! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_encode">"Encoding exception!"</string> <string name="msg_mf_error_fingerprint">"Actual key fingerprint does not match the expected one!"</string> <string name="msg_mf_error_keyid">"No key ID. This is an internal error, please file a bug report!"</string> @@ -798,6 +834,7 @@ <string name="msg_mf_error_master_none">"No master certificate found to operate on! (All revoked?)"</string> <string name="msg_mf_error_noexist_primary">"Bad primary user ID specified!"</string> <string name="msg_mf_error_noexist_revoke">"Bad user ID for revocation specified!"</string> + <string name="msg_mf_error_restricted">"Tried to execute restricted operation without passphrase! This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_revoked_primary">"Revoked user IDs cannot be primary!"</string> <string name="msg_mf_error_null_expiry">"Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!"</string> <string name="msg_mf_error_passphrase_master">"Fatal error decrypting master key! This is likely a programming error, please file a bug report!"</string> @@ -824,6 +861,9 @@ <string name="msg_mf_uid_primary">"Changing primary user ID to %s"</string> <string name="msg_mf_uid_revoke">"Revoking user ID %s"</string> <string name="msg_mf_uid_error_empty">"User ID must not be empty!"</string> + <string name="msg_mf_uat_error_empty">"User attribute must not be empty!"</string> + <string name="msg_mf_uat_add_image">"Adding user attribute of type image"</string> + <string name="msg_mf_uat_add_unknown">"Adding user attribute of unknown type"</string> <string name="msg_mf_unlock_error">"Error unlocking keyring!"</string> <string name="msg_mf_unlock">"Unlocking keyring"</string> @@ -867,6 +907,13 @@ <string name="msg_ed_fetching">"Fetching key to modify (%s)"</string> <string name="msg_ed_success">"Key operation successful"</string> + <!-- Promote key --> + <string name="msg_pr">"Promoting public key to secret key"</string> + <string name="msg_pr_error_already_secret">"Key is already a secret key!"</string> + <string name="msg_pr_error_key_not_found">"Key not found!"</string> + <string name="msg_pr_fetching">"Fetching key to modify (%s)"</string> + <string name="msg_pr_success">"Key successfully promoted"</string> + <!-- Other messages used in OperationLogs --> <string name="msg_ek_error_divert">"Editing of NFC keys is not (yet) supported!"</string> <string name="msg_ek_error_dummy">"Cannot edit keyring with stripped master key!"</string> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 27cd1546a..3844ccb29 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ <resources> <!-- Used in Android < 4 --> - <style name="KeychainTheme" parent="@style/Theme.AppCompat.Light"> + <style name="KeychainThemeOLD" parent="@style/Theme.AppCompat.Light"> <item name="android:alertDialogStyle">@style/CustomDialogTheme</item> </style> diff --git a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml new file mode 100644 index 000000000..2913ad4c1 --- /dev/null +++ b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- Generated with http://android-holo-colors.com --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="AutoCompleteTextViewKeychainTheme" parent="android:Widget.Holo.Light.AutoCompleteTextView"> + <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item> + <item name="android:background">@drawable/keychaintheme_edit_text_holo_light</item> + </style> + + <style name="ButtonKeychainTheme" parent="android:Widget.Holo.Light.Button"> + <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> + </style> + + <style name="ImageButtonKeychainTheme" parent="android:Widget.Holo.Light.ImageButton"> + <item name="android:background">@drawable/keychaintheme_btn_default_holo_light</item> + </style> + + <style name="SpinnerKeychainTheme" parent="android:Widget.Holo.Light.Spinner"> + <item name="android:background">@drawable/keychaintheme_spinner_background_holo_light</item> + <item name="android:dropDownSelector">@drawable/keychaintheme_list_selector_holo_light</item> + </style> + + <style name="ProgressBarKeychainTheme" parent="android:Widget.Holo.Light.ProgressBar.Horizontal"> + <item name="android:progressDrawable">@drawable/keychaintheme_progress_horizontal_holo_light</item> + <item name="android:indeterminateDrawable">@drawable/keychaintheme_progress_indeterminate_horizontal_holo_light</item> + </style> + + <style name="SeekBarKeychainTheme" parent="android:Widget.Holo.Light.SeekBar"> + <item name="android:progressDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item> + <item name="android:indeterminateDrawable">@drawable/keychaintheme_scrubber_progress_horizontal_holo_light</item> + <item name="android:thumb">@drawable/keychaintheme_scrubber_control_selector_holo_light</item> + </style> + + <style name="ToggleKeychainTheme" parent="android:Widget.Holo.Light.Button.Toggle"> + <item name="android:background">@drawable/keychaintheme_btn_toggle_holo_light</item> + </style> + +</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml new file mode 100644 index 000000000..5b9e43c3a --- /dev/null +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="KeychainTheme" parent="KeychainTheme.Base" /> + + <style name="KeychainTheme.Base" parent="HoloKeychainTheme"> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="android:windowNoTitle">true</item> + <item name="windowActionBar">false</item> + <item name="searchViewStyle">@style/MySearchViewStyle</item> + <item name="colorAccent">@color/accent</item> + + <!-- Navigation Drawer library --> + <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> + <item name="multipaneSupport">true</item> + </style> + + <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> + <style name="MySearchViewStyle" parent="Widget.AppCompat.SearchView"> + <!-- Background for the search query section (e.g. EditText) --> + <!--<item name="queryBackground">...</item>--> + <!-- Background for the actions section (e.g. voice, submit) --> + <!--<item name="submitBackground">...</item>--> + <!-- Close button icon --> + <item name="closeIcon">@drawable/ic_close_white_24dp</item> + <!-- Search button icon --> + <!--<item name="searchIcon">...</item>--> + <!-- Go/commit button icon --> + <!--<item name="goIcon">...</item>--> + <!-- Voice search button icon --> + <!--<item name="voiceIcon">...</item>--> + <!-- Commit icon shown in the query suggestion row --> + <!--<item name="commitIcon">...</item>--> + <!-- Layout for query suggestion rows --> + <!--<item name="suggestionRowLayout">...</item>--> + </style> +</resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml new file mode 100644 index 000000000..ce6922ba0 --- /dev/null +++ b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- Generated with http://android-holo-colors.com --> +<resources xmlns:android="http://schemas.android.com/apk/res/android"> + + <style name="HoloKeychainTheme" parent="@style/_KeychainTheme"/> + + <style name="_KeychainTheme" parent="Base.Theme.AppCompat.Light"> + + <item name="android:editTextBackground">@drawable/keychaintheme_edit_text_holo_light</item> + + <item name="android:textColorHighlight">#994caf50</item> + <item name="android:textSelectHandleLeft">@drawable/keychaintheme_text_select_handle_left</item> + <item name="android:textSelectHandleRight">@drawable/keychaintheme_text_select_handle_right</item> + <item name="android:textSelectHandle">@drawable/keychaintheme_text_select_handle_middle</item> + + <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewKeychainTheme</item> + + <item name="android:listChoiceIndicatorMultiple">@drawable/keychaintheme_btn_check_holo_light</item> + + <item name="android:listChoiceIndicatorSingle">@drawable/keychaintheme_btn_radio_holo_light</item> + + <item name="android:buttonStyle">@style/ButtonKeychainTheme</item> + + <item name="android:imageButtonStyle">@style/ImageButtonKeychainTheme</item> + + <item name="android:dropDownSpinnerStyle">@style/SpinnerKeychainTheme</item> + + <item name="android:progressBarStyleHorizontal">@style/ProgressBarKeychainTheme</item> + + <item name="android:seekBarStyle">@style/SeekBarKeychainTheme</item> + + <item name="android:buttonStyleToggle">@style/ToggleKeychainTheme</item> + + <item name="android:listChoiceBackgroundIndicator">@drawable/keychaintheme_list_selector_holo_light</item> + + <item name="android:activatedBackgroundIndicator">@drawable/keychaintheme_activated_background_holo_light</item> + + <item name="android:fastScrollThumbDrawable">@drawable/keychaintheme_fastscroll_thumb_holo</item> + + </style> + +</resources>
\ No newline at end of file |