diff options
author | Allan Wang <me@allanwang.ca> | 2017-12-11 17:52:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-11 17:52:24 -0500 |
commit | db262e95779e0a17275bdb94be2b0ac12819178e (patch) | |
tree | 42b89edf8796e85e362ca86dead1170cb38f6434 /app/src/main/res/values | |
parent | 1d4380cee77fc049a54d280a27dcefa3fa6ff1fd (diff) | |
download | frost-db262e95779e0a17275bdb94be2b0ac12819178e.tar.gz frost-db262e95779e0a17275bdb94be2b0ac12819178e.tar.bz2 frost-db262e95779e0a17275bdb94be2b0ac12819178e.zip |
Feature/tab customization (#522)
* Add initial tab customizing view
* Add rest of content for now
* Delete project file backups
* Stash
* Support full tab customization
* Test activity animations
* Update kau and fix sound uri
* Try catch download, resolves #523
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/dimens.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values/strings_download.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings_errors.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings_pref_appearance.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/values/strings_pref_notifications.xml | 2 |
6 files changed, 12 insertions, 2 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 888340e9..3d03888e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -7,4 +7,5 @@ <dimen name="tab_bar_height">50dp</dimen> <dimen name="intro_bar_height">64dp</dimen> + <dimen name="badge_icon_size">20dp</dimen> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1d3c530..540ee0da 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,5 +54,8 @@ <string name="bottom_bar">Bottom Bar</string> <string name="pip" translatable="false">PIP</string> + <string name="preview">Preview</string> + <string name="options">Options</string> + <string name="tab_customizer_instructions">Long press and drag to rearrange the top icons.</string> </resources> diff --git a/app/src/main/res/values/strings_download.xml b/app/src/main/res/values/strings_download.xml index c0cb8cd4..5a1e3fa7 100644 --- a/app/src/main/res/values/strings_download.xml +++ b/app/src/main/res/values/strings_download.xml @@ -11,4 +11,6 @@ <string name="downloaded_video">Video Downloaded</string> <string name="downloading_file">Downloading File</string> <string name="downloaded_file">File Downloaded</string> + + <string name="error_invalid_download">Invalid download attempt</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml index 88428652..173ed58e 100644 --- a/app/src/main/res/values/strings_errors.xml +++ b/app/src/main/res/values/strings_errors.xml @@ -6,4 +6,5 @@ <string name="invalid_share_url_desc">You have shared a block of text that is not a url. The text has been copied to your clipboard, so you may share it manually yourself.</string> <string name="no_download_manager">No Download Manager</string> <string name="no_download_manager_desc">The download manager is not enabled. Would you like to enable it to allow downloads?</string> + <string name="error_generic">An error occurred.</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_pref_appearance.xml b/app/src/main/res/values/strings_pref_appearance.xml index f2e0f9e0..a179b096 100644 --- a/app/src/main/res/values/strings_pref_appearance.xml +++ b/app/src/main/res/values/strings_pref_appearance.xml @@ -13,7 +13,10 @@ <string name="global_customization">Global Customization</string> <string name="main_activity_layout">Main Activity Layout</string> - <string name="set_main_activity_layout">Set Main Activity Layout</string> + <string name="main_activity_layout_desc">Set Main Activity Layout</string> + + <string name="main_tabs">Main Activity Tabs</string> + <string name="main_tabs_desc">Customize which tabs you\'ll see in your main activity</string> <string name="rounded_icons">Rounded Icons</string> <string name="rounded_icons_desc">Profile photos and group conversation icons will be rounded</string> diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml index 61c8c598..49665f8e 100644 --- a/app/src/main/res/values/strings_pref_notifications.xml +++ b/app/src/main/res/values/strings_pref_notifications.xml @@ -22,7 +22,7 @@ <string name="notification_ringtone">Notification Ringtone</string> <string name="message_ringtone">Message Ringtone</string> - <string name="select_ringtone">Selet Ringtone</string> + <string name="select_ringtone">Select Ringtone</string> <string name="notification_vibrate">Notification vibration</string> <string name="notification_lights">Notification lights</string> |