diff options
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/attr.xml | 9 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 49 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors_keychaintheme.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/dimens.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 20 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles.xml | 27 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/styles_keychaintheme.xml | 39 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes.xml | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/themes_keychaintheme.xml | 43 |
9 files changed, 67 insertions, 139 deletions
diff --git a/OpenKeychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml index 5dfa03987..98ce1c364 100644 --- a/OpenKeychain/src/main/res/values/attr.xml +++ b/OpenKeychain/src/main/res/values/attr.xml @@ -6,4 +6,13 @@ <attr name="unFoldedLabel" format="string" /> </declare-styleable> + <declare-styleable name="AspectRatioImageView"> + <attr name="aspectRatio" format="float" /> + <attr name="aspectRatioEnabled" format="boolean" /> + <attr name="dominantMeasurement"> + <enum name="width" value="0" /> + <enum name="height" value="1" /> + </attr> + </declare-styleable> + </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 4bce321ec..c49e06b4b 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -1,35 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!--<color name="colorPrimary">@color/material_deep_teal_500</color>--> - <!--<color name="colorPrimaryDark">@color/material_blue_grey_900</color>--> + <!-- Main theme colors --> - <!-- TODO: --> + <!-- green colors from OpenKeychain logo bottom right --> + <!-- your app branding color for the app bar --> + <color name="primary">#7bad45</color> + <!-- darker variant for the status bar and contextual app bars --> + <color name="primary_dark">#6c983d</color> + <!-- theme UI controls like checkboxes and text fields --> + <color name="accent">#2196F3</color> - <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> + <!-- Other colors --> - <!-- Palette generated by Material Palette materialpalette.com/green/indigo --> - <color name="colorPrimary">#8bc34a</color> - <color name="colorPrimaryDark">#558b2f</color> - - <!-- TODO: --> - <color name="primary">#8bc34a</color> - <color name="primary_dark">#558b2f</color> <color name="primary_light">#C8E6C9</color> - <color name="accent">#00BCD4</color> - <color name="fab">#00BCD4</color> - <color name="fab_pressed">#0097A7</color> + <color name="fab">@color/accent</color> + <color name="fab_pressed">#1976D2</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="header_text">#212121</color> + <!-- item selection, search highlight --> + <color name="emphasis">@color/accent</color> <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> @@ -38,27 +32,32 @@ <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> + <!-- tabs --> + <color name="tab_text">#70FFFFFF</color> + <color name="tab_text_selected">#FFFFFF</color> + <color name="tab_indicator">#FFFFFF</color> + - <!-- FAB --> + <!-- floating action buttons --> <color name="black_semi_transparent">#B2000000</color> <color name="background">#e5e5e5</color> <color name="half_black">#808080</color> <color name="white">#fafafa</color> <color name="white_pressed">#f1f1f1</color> - <color name="pink">#e91e63</color> - <color name="pink_pressed">#ec407a</color> <!-- http://www.google.com/design/spec/style/color.html#color-color-palette light = normal color dark = 900 + + exception: green --> <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_green_light">@color/primary</color> + <color name="android_green_dark">@color/primary_dark</color> <color name="android_purple_light">#673ab7</color> <color name="android_purple_dark">#311b92</color> diff --git a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml b/OpenKeychain/src/main/res/values/colors_keychaintheme.xml deleted file mode 100644 index e9b8c9350..000000000 --- a/OpenKeychain/src/main/res/values/colors_keychaintheme.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <color name="keychaintheme_color">#4caf50</color> -</resources> diff --git a/OpenKeychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml index 21ef110ea..434a0a171 100644 --- a/OpenKeychain/src/main/res/values/dimens.xml +++ b/OpenKeychain/src/main/res/values/dimens.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="statusbar_margin">0dp</dimen> + <!-- on Android < 5, we do not color the status bar, thus 0dp! --> + <dimen name="statusbar_height">0dp</dimen> <dimen name="big_toolbar">120dp</dimen> + <dimen name="huge_toolbar">222dp</dimen> </resources>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9d980500d..700f1d167 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -79,6 +79,8 @@ <string name="btn_export_to_server">"Upload To Keyserver"</string> <string name="btn_next">"Next"</string> <string name="btn_back">"Back"</string> + <string name="btn_no">"No"</string> + <string name="btn_match">"Fingerprints are matching"</string> <string name="btn_lookup_key">"Lookup key"</string> <string name="btn_share_encrypted_signed">"Encrypt and share message"</string> <string name="btn_view_cert_key">"View certification key"</string> @@ -99,6 +101,7 @@ <string name="menu_create_key">"Create my key"</string> <string name="menu_import_existing_key">"Import from file"</string> <string name="menu_search">"Search"</string> + <string name="menu_nfc_preferences">"NFC settings"</string> <string name="menu_beam_preferences">"Beam settings"</string> <string name="menu_key_edit_cancel">"Cancel"</string> <string name="menu_encrypt_to">"Encrypt to…"</string> @@ -108,6 +111,7 @@ <string name="menu_export_all_keys">"Export all keys"</string> <string name="menu_advanced">"Show advanced info"</string> <string name="menu_export_log">"Export Log"</string> + <string name="menu_certify_fingerprint">"Verify via fingerprint comparison"</string> <!-- label --> <string name="label_message">"Message"</string> @@ -276,7 +280,8 @@ <!-- errors without preceeding Error: --> <string name="error_jelly_bean_needed">"You need Android 4.1 to use Android's NFC Beam feature!"</string> - <string name="error_nfc_needed">"NFC is not available on your device!"</string> + <string name="error_nfc_needed">"NFC must be enabled!"</string> + <string name="error_beam_needed">"Beam must be enabled!"</string> <string name="error_nothing_import">"No keys found!"</string> <string name="error_contacts_key_id_missing">"Retrieving the key ID from contacts failed!"</string> <string name="error_generic_report_bug">"A generic error occurred, please create a new bug report for OpenKeychain."</string> @@ -480,7 +485,6 @@ <string name="intent_send_decrypt">"Decrypt with OpenKeychain"</string> <!-- Remote API --> - <string name="api_no_apps">"No registered apps!\n\nA list of supported third-party applications can be found in 'Help'!"</string> <string name="api_settings_show_info">"Show advanced information"</string> <string name="api_settings_hide_info">"Hide advanced information"</string> <string name="api_settings_show_advanced">"Show advanced settings"</string> @@ -587,8 +591,12 @@ <string name="create_key_edit">"Change key configuration"</string> <!-- View key --> - <string name="view_key_revoked">"This key has been revoked!"</string> - <string name="view_key_expired">"This key is expired!"</string> + <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> + <string name="view_key_expired">"Expired: The contact needs to extend the keys validity!"</string> + <string name="view_key_expired_secret">"Expired: You can extend the keys validity by editing it!"</string> + <string name="view_key_my_key">"My Key"</string> + <string name="view_key_verified">"Verified Key"</string> + <string name="view_key_unverified">"Unverified: Scan QR Code to verify key!"</string> <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> @@ -939,6 +947,7 @@ <string name="msg_dc_clear_meta_file">"Filename: %s"</string> <string name="msg_dc_clear_meta_mime">"MIME type: %s"</string> <string name="msg_dc_clear_meta_size">"Filesize: %s"</string> + <string name="msg_dc_clear_meta_size_unknown">"Filesize is unknown"</string> <string name="msg_dc_clear_meta_time">"Modification time: %s"</string> <string name="msg_dc_clear_signature_bad">"Signature check NOT OK!"</string> <string name="msg_dc_clear_signature_check">"Verifying signature data"</string> @@ -1122,6 +1131,8 @@ <string name="certs_text">"Only validated self-certificates and validated certificates created with your keys are displayed here."</string> <string name="section_uids_to_certify">"Identities for "</string> <string name="certify_text">"The keys you are importing contain “identities”: names and emails. Select exactly those for certification which match what you expected."</string> + <string name="certify_fingerprint_text">"Compare the displayed fingerprint, character by character, with the one displayed on your partners device."</string> + <string name="certify_fingerprint_text2">"Do the displayed fingerprints match?"</string> <string name="label_revocation">"Revocation Reason"</string> <string name="label_verify_status">"Verification Status"</string> <string name="label_cert_type">"Type"</string> @@ -1143,6 +1154,7 @@ <string name="error_multi_not_supported">"Saving of multiple files not supported. This is a limitation on current Android."</string> <string name="key_colon">"Key:"</string> <string name="exchange_description">"To start a key exchange, choose the number of participants on the right side, then hit the “Start exchange” button.\n\nYou will be asked two more questions to make sure only the right participants are in the exchange and their fingerprints are correct."</string> + <string name="btn_start_exchange">"Start exchange"</string> <string name="user_id_none"><![CDATA[<none>]]></string> <!-- Passphrase wizard --> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 03ccce85e..8d8797bf0 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -1,23 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- Used in Android < 4 --> - <style name="KeychainThemeOLD" parent="@style/Theme.AppCompat.Light"> - <item name="android:alertDialogStyle">@style/CustomDialogTheme</item> - </style> - - <!-- Ugly fix to make content background of Dialogs on Android < 4 white not black! --> - <style name="CustomDialogTheme" parent="@android:style/Theme.Dialog"> - <item name="android:fullDark">@drawable/popup_full_bright</item> - <!--<item name="android:topDark">@android:drawable/popup_full_dark</item>--> - <item name="android:centerDark">@drawable/popup_center_bright</item> - <!--<item name="android:bottomDark">@android:drawable/popup_bottom_dark</item>--> - <!--<item name="fullBright">@android:drawable/popup_full_bright</item>--> - <!--<item name="topBright">@android:drawable/popup_top_bright</item>--> - <!--<item name="centerBright">@android:drawable/popup_center_bright</item>--> - <!--<item name="bottomBright">@android:drawable/popup_bottom_bright</item>--> - <!--<item name="bottomMedium">@android:drawable/popup_bottom_medium</item>--> - <!--<item name="centerMedium">@android:drawable/popup_center_medium</item>--> + <style name="CardViewHeader"> + <item name="android:drawableBottom">@drawable/cardview_header</item> + <item name="android:drawablePadding">16dp</item> + <item name="android:layout_marginTop">16dp</item> + <item name="android:paddingLeft">16dp</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">@color/header_text</item> + <item name="android:textSize">17sp</item> </style> <style name="SectionHeader"> @@ -26,7 +17,7 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:paddingLeft">8dp</item> <item name="android:textStyle">bold</item> - <item name="android:textColor">@color/emphasis</item> + <item name="android:textColor">@color/header_text</item> <item name="android:textSize">14sp</item> </style> diff --git a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values/styles_keychaintheme.xml deleted file mode 100644 index 2913ad4c1..000000000 --- a/OpenKeychain/src/main/res/values/styles_keychaintheme.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?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 index f1d1ea490..c87895c01 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -3,21 +3,22 @@ <style name="KeychainTheme" parent="KeychainTheme.Base" /> - <!--<style name="KeychainTheme.Base" parent="HoloKeychainTheme">--> - <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="colorPrimary">@color/colorPrimary</item> - <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <style name="KeychainTheme.Base" parent="Theme.AppCompat.Light"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> <item name="android:windowNoTitle">true</item> <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> + <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> + <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> <!-- Navigation Drawer library --> <item name="drawerType">@integer/DRAWERTYPE_IMAGE</item> <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> + <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> <!-- ...but light popup menu (white background) --> <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> <item name="drawerColor">#fafafa</item> diff --git a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml b/OpenKeychain/src/main/res/values/themes_keychaintheme.xml deleted file mode 100644 index ce6922ba0..000000000 --- a/OpenKeychain/src/main/res/values/themes_keychaintheme.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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 |