diff options
author | Allan Wang <me@allanwang.ca> | 2018-03-11 15:47:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-11 15:47:35 -0400 |
commit | 67988a25d83fc10b187fcc821c3ceacfad0195d5 (patch) | |
tree | 58d6622f3eccf0275d55ee7f6ef2ba76845211ab /app/src/main/res | |
parent | 7f74e08270e34eb66a824ac18519293d4a42278c (diff) | |
download | frost-67988a25d83fc10b187fcc821c3ceacfad0195d5.tar.gz frost-67988a25d83fc10b187fcc821c3ceacfad0195d5.tar.bz2 frost-67988a25d83fc10b187fcc821c3ceacfad0195d5.zip |
Fix/notification sound (#763)
* Update dependencies
* Update theme
* Fix bad css merge
* Add notification feedback for fetching now
* Hide notif settings that no longer work with channels
* Wip android o channels
* Revert back to old group method
* Update dependencies
* Update rxnetwork version
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/strings_errors.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings_no_translate.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/strings_pref_notifications.xml | 2 |
4 files changed, 6 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e39e91ed..16b55b79 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,4 +59,6 @@ <string name="options">Options</string> <string name="tab_customizer_instructions">Long press and drag to rearrange the top icons.</string> + <string name="no_new_notifications">No new notifications found</string> + </resources> diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml index cc51699a..71d147f7 100644 --- a/app/src/main/res/values/strings_errors.xml +++ b/app/src/main/res/values/strings_errors.xml @@ -8,4 +8,5 @@ <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> <string name="video_load_failed">Failed to load video</string> + <string name="error_notification">An error occurred when fetching notifications</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml index 13dc9f1c..17e6c8f7 100644 --- a/app/src/main/res/values/strings_no_translate.xml +++ b/app/src/main/res/values/strings_no_translate.xml @@ -14,4 +14,5 @@ <string name="debug_report" translatable="false">Debug Report</string> <string name="theme_issue" translatable="false">Theme Issue</string> <string name="feature_request" translatable="false">Feature Request</string> + <string name="reset_notif_epoch" translatable="false">Reset Notif Epoch</string> </resources> diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml index 8db493b8..aea7ada9 100644 --- a/app/src/main/res/values/strings_pref_notifications.xml +++ b/app/src/main/res/values/strings_pref_notifications.xml @@ -21,6 +21,8 @@ <string name="notification_fetch_success">Fetching Notifications…</string> <string name="notification_fetch_fail">Couldn\'t fetch notifications</string> <string name="notification_sound">Notification sound</string> + <string name="notification_channel">Customize notification channels</string> + <string name="notification_channel_desc">Modify sound, vibration, priority, etc</string> <string name="notification_ringtone">Notification Ringtone</string> <string name="message_ringtone">Message Ringtone</string> |