New key view design, using Android flat buttons and Android icons

3 files changed, 33 insertions, 19 deletions

diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml
index 0f0b2a600..728aefdd8 100644
--- a/OpenKeychain/src/main/res/values/colors.xml
+++ b/OpenKeychain/src/main/res/values/colors.xml
@@ -3,9 +3,13 @@
 
     <color name="emphasis">#31b6e7</color>
     <color name="bg_gray">#cecbce</color>
+    <color name="tertiary_text_light">#808080</color>
 
-    <color name="result_red">#FF4444</color>
-    <color name="result_orange">#FFBB33</color>
-    <color name="result_green">#99CC00</color>
-    <color name="result_blue">#33B5E5</color>
+    <color name="holo_gray_light">#33999999</color>
+    <color name="holo_gray_bright">#33CCCCCC</color>
+
+    <color name="result_red">#ffff4444</color>
+    <color name="result_orange">#ffffbb33</color>
+    <color name="result_green">#ff99cc00</color>
+    <color name="result_blue">#ff33b5e5</color>
 </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 330bc349d..2a1a045ef 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -14,7 +14,8 @@
     <string name="title_key_server_preference">Keyserver Preference</string>
     <string name="title_change_passphrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
-    <string name="title_share_with">Share with…</string>
+    <string name="title_share_fingerprint_with">Share fingerprint with…</string>
+    <string name="title_share_key_with">Share key with…</string>
     <string name="title_share_file">Share file with…</string>
     <string name="title_encrypt_to_file">Encrypt To File</string>
     <string name="title_decrypt_to_file">Decrypt To File</string>
@@ -28,19 +29,21 @@
     <string name="title_help">Help</string>
 
     <!-- section -->
-    <string name="section_user_ids">User IDs</string>
+    <string name="section_user_ids">Identities</string>
     <string name="section_keys">Keys</string>
     <string name="section_general">General</string>
     <string name="section_defaults">Defaults</string>
     <string name="section_advanced">Advanced</string>
     <string name="section_master_key">Master Key</string>
-    <string name="section_master_user_id">Master User ID</string>
+    <string name="section_master_user_id">Primary Identity</string>
     <string name="section_actions">Actions</string>
+    <string name="section_share_key">Share key</string>
     <string name="section_certification_key">Your Key used for certification</string>
     <string name="section_upload_key">Upload Key</string>
     <string name="section_key_server">Keyserver</string>
     <string name="section_encrypt_and_or_sign">Encrypt and/or Sign</string>
     <string name="section_decrypt_verify">Decrypt and Verify</string>
+    <string name="section_fingerprint">Fingerprint</string>
 
     <!-- button -->
     <string name="btn_certify">Certify</string>
@@ -121,7 +124,7 @@
     <string name="label_expiry">Expiry</string>
     <string name="label_usage">Usage</string>
     <string name="label_key_size">Key Size</string>
-    <string name="label_main_user_id">Main User ID</string>
+    <string name="label_main_user_id">Primary identity</string>
     <string name="label_name">Name</string>
     <string name="label_comment">Comment</string>
     <string name="label_email">Email</string>
@@ -207,7 +210,7 @@
     <string name="key_deletion_confirmation_multi">Do you really want to delete all selected public keys?\nYou can\'t undo this!</string>
     <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string>
     <string name="ask_save_changed_key">You have made changes to the keyring, would you like to save it?</string>
-    <string name="ask_empty_id_ok">You have added an empty user ID, are you sure you want to continue?</string>
+    <string name="ask_empty_id_ok">You have added an empty identity, are you sure you want to continue?</string>
     <string name="public_key_deletetion_confirmation">Do you really want to delete the public key \'%s\'?\nYou can\'t undo this!</string>
     <string name="also_export_secret_keys">Also export secret keys?</string>
 
@@ -251,6 +254,7 @@
     <string name="list_empty">This list is empty!</string>
     <string name="nfc_successful">Successfully sent key with NFC Beam!</string>
     <string name="key_copied_to_clipboard">Key has been copied to the clipboard!</string>
+    <string name="fingerprint_copied_to_clipboard">Fingerprint has been copied to the clipboard!</string>
     <string name="key_has_already_been_certified">Key has already been certified!</string>
     <string name="select_key_to_sign">Please select a key to be used for signing!</string>
     <string name="key_too_big_for_sharing">Key is too big to be shared this way!</string>
@@ -268,8 +272,8 @@
     <string name="error_master_key_must_not_be_el_gamal">the master key cannot be an ElGamal key</string>
     <string name="error_unknown_algorithm_choice">unknown algorithm choice</string>
     <string name="error_user_id_no_email">no email found</string>
-    <string name="error_key_needs_a_user_id">need at least one user id</string>
-    <string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string>
+    <string name="error_key_needs_a_user_id">need at least one identity</string>
+    <string name="error_main_user_id_must_not_be_empty">primary identity must not be empty</string>
     <string name="error_key_needs_master_key">need at least a master key</string>
     <string name="error_no_signature_passphrase">no passphrase given</string>
     <string name="error_no_signature_key">no signature key given</string>
@@ -422,8 +426,8 @@
     <string name="api_register_allow">Allow access</string>
     <string name="api_register_disallow">Disallow access</string>
     <string name="api_register_error_select_key">Please select a key!</string>
-    <string name="api_select_pub_keys_missing_text">No public keys were found for these user ids:</string>
-    <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these user ids:</string>
+    <string name="api_select_pub_keys_missing_text">No public keys were found for these identities:</string>
+    <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these identities:</string>
     <string name="api_select_pub_keys_text">Please review the list of recipients!</string>
     <string name="api_error_wrong_signature">Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenKeychain and then register the app again.</string>
 
@@ -447,10 +451,14 @@
     <string name="key_list_empty_button_import">importing keys.</string>
 
     <!-- Key view -->
-    <string name="key_view_action_edit">Edit this key</string>
+    <string name="key_view_action_edit">Edit key</string>
     <string name="key_view_action_encrypt">Encrypt with this key</string>
-    <string name="key_view_action_certify">Certify this key</string>
-    <string name="key_view_tab_main">Info</string>
+    <string name="key_view_action_certify">Certify identities</string>
+    <string name="key_view_action_share_with">with…</string>
+    <string name="key_view_action_share_nfc">over NFC by holding the devices back to back</string>
+    <string name="key_view_tab_main">Main Info</string>
+    <string name="key_view_tab_share">Share</string>
+    <string name="key_view_tab_keys_details">Key Details</string>
     <string name="key_view_tab_certs">Certifications</string>
 
     <!-- Navigation Drawer -->
@@ -485,10 +493,10 @@
     <!-- unsorted -->
     <string name="section_signer_id">Signer</string>
     <string name="section_cert">Certificate Details</string>
-    <string name="label_user_id">User ID</string>
+    <string name="label_user_id">Identity</string>
     <string name="unknown_uid">&lt;unknown&gt;</string>
     <string name="empty_certs">No certificates for this key</string>
-    <string name="section_uids_to_sign">User IDs to sign</string>
+    <string name="section_uids_to_sign">Identities to sign</string>
     <string name="label_revocation">Revocation Reason</string>
     <string name="label_verify_status">Verification Status</string>
     <string name="label_cert_type">Type</string>
diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml
index f03d72605..4a3fa0f8f 100644
--- a/OpenKeychain/src/main/res/values/styles.xml
+++ b/OpenKeychain/src/main/res/values/styles.xml
@@ -2,7 +2,6 @@
 <resources>
     <!-- Used in Android < 4 -->
 
-
     <style name="KeychainTheme" parent="@style/Theme.AppCompat.Light">
         <item name="android:alertDialogStyle">@style/CustomDialogTheme</item>
     </style>
@@ -30,5 +29,8 @@
         <item name="android:textSize">14sp</item>
     </style>
 
+    <style name="SelectableItem">
+        <item name="android:background">@drawable/selector_transparent_button</item>
+    </style>
 
 </resources>
\ No newline at end of file