diff options
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/arrays.xml | 70 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 20 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 68 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 21 |
6 files changed, 136 insertions, 50 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 4acc9e62..c413a3c4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,39 +1,43 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="resources"> - <item>Mobile</item> - <item>Phone</item> - <item>Tablet</item> - <item>Conversations</item> - <item>Android</item> - </string-array> - <string-array name="filesizes"> - <item>never</item> - <item>256 KB</item> - <item>512 KB</item> - <item>1 MB</item> - </string-array> - <string-array name="filesizes_values"> - <item>0</item> - <item>262144</item> - <item>524288</item> - <item>1048576</item> - </string-array> - <string-array name="mute_options_descriptions"> - <item>30 minutes</item> - <item>1 hour</item> - <item>2 hours</item> - <item>8 hours</item> - <item>until further notice</item> - </string-array> + <string-array name="resources"> + <item>Mobile</item> + <item>Phone</item> + <item>Tablet</item> + <item>Conversations</item> + <item>Android</item> + </string-array> + <string-array name="filesizes"> + <item>@string/never</item> + <item>256 KiB</item> + <item>512 KiB</item> + <item>1 MiB</item> + <item>5 MiB</item> + <item>10 MiB</item> + </string-array> + <string-array name="filesizes_values"> + <item>0</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + <item>5242880</item> + <item>10485760</item> + </string-array> + <string-array name="mute_options_descriptions"> + <item>@string/thirty_minutes</item> + <item>@string/one_hour</item> + <item>@string/two_hours</item> + <item>@string/eight_hours</item> + <item>@string/until_further_notice</item> + </string-array> - <integer-array name="mute_options_durations"> - <item>1800</item> - <item>3600</item> - <item>7200</item> - <item>28800</item> - <item>-1</item> - </integer-array> + <integer-array name="mute_options_durations"> + <item>1800</item> + <item>3600</item> + <item>7200</item> + <item>28800</item> + <item>-1</item> + </integer-array> </resources> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 2354a5e8..e314f752 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,4 +5,24 @@ <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> + <attr name="icon_add_group" format="reference"/> + <attr name="icon_add_person" format="reference"/> + <attr name="icon_cancel" format="reference"/> + <attr name="icon_chat" format="reference"/> + <attr name="icon_copy" format="reference"/> + <attr name="icon_discard" format="reference"/> + <attr name="icon_download" format="reference"/> + <attr name="icon_edit" format="reference"/> + <attr name="icon_edit_dark" format="reference"/> + <attr name="icon_group" format="reference"/> + <attr name="icon_new" format="reference"/> + <attr name="icon_new_attachment" format="reference"/> + <attr name="icon_not_secure" format="reference"/> + <attr name="icon_refresh" format="reference"/> + <attr name="icon_remove" format="reference"/> + <attr name="icon_search" format="reference"/> + <attr name="icon_secure" format="reference"/> + <attr name="icon_settings" format="reference"/> + <attr name="icon_import_export" format="reference"/> + </resources>
\ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 908b8b89..c21650a5 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ <color name="primary" type="color">#ff259b24</color> <color name="primarydark" type="color">#ff0a7e07</color> + <color name="accent">#ff0091ea</color> <color name="primarytext" type="color">#de000000</color> <color name="secondarytext" type="color">#8a000000</color> <color name="ondarktext" type="color">#fffafafa</color> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 47c82246..79e920e9 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,5 +1,7 @@ <resources> <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> + <dimen name="activity_horizontal_margin">8dp</dimen> + <dimen name="activity_vertical_margin">8dp</dimen> + <dimen name="infocard_padding">16dp</dimen> + <dimen name="conversations_overview_width">288dp</dimen> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bc3c4ece..ccb4b67a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -21,7 +21,6 @@ <string name="title_activity_settings">Settings</string> <string name="title_activity_conference_details">Conference Details</string> <string name="title_activity_contact_details">Contact Details</string> - <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> <string name="title_activity_choose_contact">Choose contact</string> @@ -47,7 +46,7 @@ <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> <string name="register_account">Register new account on server</string> <string name="change_password_on_server">Change password on server</string> - <string name="share_with">Share with</string> + <string name="share_with">Share with…</string> <string name="start_conversation">Start Conversation</string> <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> @@ -72,7 +71,6 @@ <string name="add_contact">Add contact</string> <string name="send_failed">delivery failed</string> <string name="send_rejected">rejected</string> - <string name="receiving_image">Receiving image file (%1$d%%)</string> <string name="preparing_image">Preparing image for transmission</string> <string name="action_clear_history">Clear history</string> <string name="clear_conversation_history">Clear Conversation History</string> @@ -85,7 +83,6 @@ <string name="send_pgp_message">Send OpenPGP encrypted message</string> <string name="your_nick_has_been_changed">Your nickname has been changed</string> <string name="download_image">Download Image</string> - <string name="image_offered_for_download"><i>Image file offered for download</i></string> <string name="send_unencrypted">Send unencrypted</string> <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> <string name="openkeychain_required">OpenKeychain</string> @@ -99,8 +96,6 @@ <string name="no_pgp_keys">No OpenPGP Keys found</string> <string name="contacts_have_no_pgp_keys">Conversations is unable to encrypt your messages because your contacts are not announcing their public key.\n\n<small>Please ask your contacts to setup OpenPGP.</small></string> <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string> - <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string> - <string name="image_file"><i>Image received. Touch to view</i></string> <string name="pref_general">General</string> <string name="pref_xmpp_resource">XMPP resource</string> <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> @@ -275,8 +270,6 @@ <string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string> <string name="pref_dont_save_encrypted">Don’t save encrypted messages</string> <string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string> - <string name="pref_enable_legacy_ssl">Enable legacy SSL</string> - <string name="pref_enable_legacy_ssl_summary">Enables SSLv3 support for legacy servers. Warning: SSLv3 is considered insecure.</string> <string name="pref_expert_options">Expert options</string> <string name="pref_expert_options_summary">Please be careful with these</string> <string name="title_activity_about">About Conversations</string> @@ -304,6 +297,7 @@ \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0) \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) + \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0) </string> <string name="title_pref_quiet_hours">Quiet Hours</string> <string name="title_pref_quiet_hours_start_time">Start time</string> @@ -330,7 +324,6 @@ <string name="check_image_filesize">Check image file size</string> <string name="message_options">Message options</string> <string name="copy_text">Copy text</string> - <string name="share_image">Share image</string> <string name="copy_original_url">Copy original URL</string> <string name="send_again">Send again</string> <string name="image_url">Image URL</string> @@ -360,17 +353,16 @@ <string name="smp_requested">Contact requested SMP verification</string> <string name="no_otr_session_found">No valid OTR session has been found!</string> <string name="conversations_foreground_service">Conversations</string> - <string name="touch_to_disable">Touch to disable foreground service</string> <string name="pref_keep_foreground_service">Keep service in foreground</string> <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string> <string name="choose_file">Choose file</string> - <string name="receiving_file">Receiving %1$s file (%2$d%% completed)</string> - <string name="download_file">Download %s file</string> - <string name="open_file">Open %s file</string> + <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string> + <string name="download_x_file">Download %s</string> + <string name="file">file</string> + <string name="open_x_file">Open %s</string> <string name="sending_file">sending (%1$d%% completed)</string> <string name="preparing_file">Preparing file for transmission</string> - <string name="file_offered_for_download">File offered for download</string> - <string name="file">%s file</string> + <string name="x_file_offered_for_download">%s offered for download</string> <string name="cancel_transmission">Cancel transmission</string> <string name="file_transmission_failed">file transmission failed</string> <string name="file_deleted">The file has been deleted</string> @@ -408,4 +400,50 @@ <string name="enable_all_accounts">Enable all accounts</string> <string name="disable_all_accounts">Disable all accounts</string> <string name="perform_action_with">Perform action with</string> + <string name="no_affiliation">No affiliation</string> + <string name="no_role">No role</string> + <string name="outcast">Outcast</string> + <string name="member">Member</string> + <string name="advanced_mode">Advanced mode</string> + <string name="grant_membership">Grant membership</string> + <string name="remove_membership">Revoke membership</string> + <string name="grant_admin_privileges">Grant admin privileges</string> + <string name="remove_admin_privileges">Revoke admin privileges</string> + <string name="remove_from_room">Remove from conference</string> + <string name="could_not_change_affiliation">Could not change affiliation of %s</string> + <string name="ban_from_conference">Ban from conference</string> + <string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string> + <string name="ban_now">Ban now</string> + <string name="could_not_change_role">Could not change role of %s</string> + <string name="public_conference">Publicly accessible conference</string> + <string name="private_conference">Private, members only conference</string> + <string name="conference_options">Conference options</string> + <string name="members_only">Private (Members only)</string> + <string name="non_anonymous">Non-anonymous</string> + <string name="modified_conference_options">Modified conference options!</string> + <string name="could_not_modify_conference_options">Could not modify conference options</string> + <string name="never">Never</string> + <string name="thirty_minutes">30 minutes</string> + <string name="one_hour">1 hour</string> + <string name="two_hours">2 hours</string> + <string name="eight_hours">8 hours</string> + <string name="until_further_notice">Until further notice</string> + <string name="pref_input_options">Input options</string> + <string name="pref_enter_is_send">Enter is send</string> + <string name="pref_enter_is_send_summary">Use enter key to send message</string> + <string name="pref_display_enter_key">Show enter key</string> + <string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string> + <string name="audio">audio</string> + <string name="video">video</string> + <string name="image">image</string> + <string name="pdf_document">PDF document</string> + <string name="apk">Android App</string> + <string name="vcard">Contact</string> + <string name="received_x_file">Received %s</string> + <string name="disable_foreground_service">Disable foreground service</string> + <string name="touch_to_open_conversations">Touch to open Conversations</string> + <string name="avatar_has_been_published">Avatar has been published!</string> + <string name="sending_x_file">Sending %s</string> + <string name="offering_x_file">Offering %s</string> + <string name="hide_offline">Hide offline</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index fa7973d2..80f2bfe6 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -8,6 +8,27 @@ <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + + <item name="attr/icon_add_group">@drawable/ic_action_add_group</item> + <item name="attr/icon_add_person">@drawable/ic_action_add_person</item> + <item name="attr/icon_cancel">@drawable/ic_action_cancel</item> + <item name="attr/icon_chat">@drawable/ic_action_chat</item> + <item name="attr/icon_copy">@drawable/ic_action_copy</item> + <item name="attr/icon_discard">@drawable/ic_action_discard</item> + <item name="attr/icon_download">@drawable/ic_action_download</item> + <item name="attr/icon_edit">@drawable/ic_action_edit</item> + <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item> + + <item name="attr/icon_group">@drawable/ic_action_group</item> + <item name="attr/icon_new">@drawable/ic_action_new</item> + <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item> + <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item> + <item name="attr/icon_refresh">@drawable/ic_action_refresh</item> + <item name="attr/icon_remove">@drawable/ic_action_remove</item> + <item name="attr/icon_search">@drawable/ic_action_search</item> + <item name="attr/icon_secure">@drawable/ic_action_secure</item> + <item name="attr/icon_settings">@drawable/ic_action_settings</item> + <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> |