oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Add UI for editing per-thread notification sounds.

Browse source
This commit is contained in:
Matthew Chen 2018-02-21 20:17:00 -05:00
parent dc8b8ca0bd
commit 396fe82707
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Signal/src/ViewControllers/OWSConversationSettingsViewController.m
View file

@ -6,6 +6,7 @@
#import "BlockListUIUtils.h"
#import "ContactsViewHelper.h"
#import "FingerprintViewController.h"
#import "NotificationSoundsViewController.h"
#import "OWSAddToContactViewController.h"
#import "OWSBlockingManager.h"
#import "PhoneNumber.h"
@ -438,6 +439,24 @@ NS_ASSUME_NONNULL_BEGIN
[contents addSection:mainSection];
// Notifications section.
OWSTableSection *notificationsSection = [OWSTableSection new];
notificationsSection.headerTitle = NSLocalizedString(@"CONVERSATION_SETTINGS_NOTIFICATIONS_SECTION",
@"Label for notifications section of conversation settings view.");
[notificationsSection
addItem:[OWSTableItem disclosureItemWithText:
NSLocalizedString(@"NOTIFICATIONS_ITEM_SOUND",
@"Label for settings view that allows user to change the notification sound.")
actionBlock:^{
NotificationSoundsViewController *vc =
[NotificationSoundsViewController new];
vc.thread = weakSelf.thread;
[weakSelf.navigationController pushViewController:vc animated:YES];
}]];
[contents addSection:notificationsSection];
// Group settings section.
if (self.isGroupThread) {

3
Signal/translations/en.lproj/Localizable.strings
View file

@ -439,6 +439,9 @@
/* Label for 'new contact' button in conversation settings view. */
"CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact";
/* Label for notifications section of conversation settings view. */
"CONVERSATION_SETTINGS_NOTIFICATIONS_SECTION" = "Notifications";
/* Label for button to unmute a thread. */
"CONVERSATION_SETTINGS_UNMUTE_ACTION" = "Unmute";

1
SignalMessaging/SignalMessaging.h
View file

@ -19,6 +19,7 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
#import <SignalMessaging/DebugLogger.h>
#import <SignalMessaging/Environment.h>
#import <SignalMessaging/NSString+OWS.h>
#import <SignalMessaging/NotificationSounds.h>
#import <SignalMessaging/OWSAudioAttachmentPlayer.h>
#import <SignalMessaging/OWSContactAvatarBuilder.h>
#import <SignalMessaging/OWSContactOffersInteraction.h>

4
SignalMessaging/environment/NotificationSounds.m
View file

@ -193,6 +193,7 @@ NSString *const kNotificationSoundsStorageGlobalNotificationKey = @"kNotificatio
NSNumber *_Nullable value =
[notificationSounds.dbConnection objectForKey:kNotificationSoundsStorageGlobalNotificationKey
inCollection:kNotificationSoundsStorageNotificationCollection];
// Default to the global default.
return (value ? (NotificationSound)value.intValue : [self defaultNotificationSound]);
}
@ -208,8 +209,9 @@ NSString *const kNotificationSoundsStorageGlobalNotificationKey = @"kNotificatio
{
NotificationSounds *notificationSounds = NotificationSounds.sharedManager;
NSNumber *_Nullable value =
[notificationSounds.dbConnection objectForKey:kNotificationSoundsStorageGlobalNotificationKey
[notificationSounds.dbConnection objectForKey:thread.uniqueId
inCollection:kNotificationSoundsStorageNotificationCollection];
// Default to the "global" notification sound, which in turn will default to the global default.
return (value ? (NotificationSound)value.intValue : [self globalNotificationSound]);
}