diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-03 12:36:54 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-03 12:36:54 +0200 |
| commit | 1a09a4706b7cc53225abd5c6124f3da2f784ad61 (patch) | |
| tree | bb48f68460379c2d73ccce5bdd78b059b3a48358 /res | |
| parent | 1f378bffc80c73d23cb62106c912043504ce7fca (diff) | |
added ability to disable notifications for specific conversations - fixed #322
Diffstat (limited to '')
| -rw-r--r-- | res/menu/conversations.xml | 5 | ||||
| -rw-r--r-- | res/values/arrays.xml | 14 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
3 files changed, 23 insertions, 0 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml index 215bbb66..3edee120 100644 --- a/res/menu/conversations.xml +++ b/res/menu/conversations.xml @@ -45,6 +45,11 @@ android:showAsAction="never" android:title="@string/action_end_conversation"/> <item + android:id="@+id/action_mute" + android:orderInCategory="70" + android:showAsAction="never" + android:title="@string/disable_notifications"/> + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f9a198b2..1d2a5ac9 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -19,4 +19,18 @@ <item>524288</item> <item>1048576</item> </string-array> + <string-array name="mute_options_descriptions"> + <item>30 minutes</item> + <item>one hour</item> + <item>2 hours</item> + <item>8 hours</item> + <item>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> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index e799b0ae..7b9c8d95 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -235,5 +235,9 @@ <string name="server_info_session_established">Current session established</string> <string name="additional_information">Additional Information</string> <string name="skip">Skip</string> + <string name="disable_notifications">Disable notifications</string> + <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string> + <string name="notifications_disabled">Notifications are disabled</string> + <string name="enable">Enable</string> </resources>
\ No newline at end of file |