Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IMPORTANT this branch missing localization, added mute tab bar notification permission warning featured #22

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IMPORTANT this branch missing localization, added mute tab bar notification permission warning featured #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions TelegramUI/Notices.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ private enum ApplicationSpecificGlobalNotice: Int32 {
case archiveChatTips = 10
case archiveIntroDismissed = 11
case callsTabTip = 12
case notificationsPermissionTabBarWarningMute = 13

var key: ValueBoxKey {
let v = ValueBoxKey(length: 4)
Expand Down Expand Up @@ -189,6 +190,10 @@ private struct ApplicationSpecificNoticeKeys {
static func notificationsPermissionWarning() -> NoticeEntryKey {
return NoticeEntryKey(namespace: noticeNamespace(namespace: permissionsNamespace), key: ApplicationSpecificGlobalNotice.notificationsPermissionWarning.key)
}

static func notificationsPermissionTabBarWarningMute() -> NoticeEntryKey {
return NoticeEntryKey(namespace: noticeNamespace(namespace: permissionsNamespace), key: ApplicationSpecificGlobalNotice.notificationsPermissionTabBarWarningMute.key)
}

static func volumeButtonToUnmuteTip() -> NoticeEntryKey {
return NoticeEntryKey(namespace: noticeNamespace(namespace: globalNamespace), key: ApplicationSpecificGlobalNotice.volumeButtonToUnmuteTip.key)
Expand Down Expand Up @@ -406,6 +411,10 @@ public struct ApplicationSpecificNotice {
public static func notificationsPermissionWarningKey() -> NoticeEntryKey {
return ApplicationSpecificNoticeKeys.notificationsPermissionWarning()
}

public static func notificationsPermissionTabBarWarningMuteKey() -> NoticeEntryKey {
return ApplicationSpecificNoticeKeys.notificationsPermissionTabBarWarningMute()
}

public static func getTimestampValue(_ entry: NoticeEntry) -> Int32? {
if let value = entry as? ApplicationSpecificTimestampNotice {
Expand All @@ -420,6 +429,12 @@ public struct ApplicationSpecificNotice {
transaction.setNotice(ApplicationSpecificNoticeKeys.notificationsPermissionWarning(), ApplicationSpecificTimestampNotice(value: value))
}.start()
}

public static func setNotificationsPermissionTabBarWarningMute(accountManager: AccountManager, value: Bool) {
let _ = accountManager.transaction { transaction -> Void in
transaction.setNotice(ApplicationSpecificNoticeKeys.notificationsPermissionTabBarWarningMute(), ApplicationSpecificVariantNotice(value: value))
}.start()
}

static func getVolumeButtonToUnmute(accountManager: AccountManager) -> Signal<Bool, NoError> {
return accountManager.transaction { transaction -> Bool in
Expand Down
121 changes: 81 additions & 40 deletions TelegramUI/NotificationsAndSounds.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ private final class NotificationsAndSoundsArguments {
let soundSelectionDisposable: MetaDisposable

let authorizeNotifications: () -> Void
let muteWarningInTabBar: (Bool) -> Void
let suppressWarning: () -> Void

let updateMessageAlerts: (Bool) -> Void
Expand Down Expand Up @@ -44,12 +45,13 @@ private final class NotificationsAndSoundsArguments {

let updateNotificationsFromAllAccounts: (Bool) -> Void

init(context: AccountContext, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping(ViewController)->Void, soundSelectionDisposable: MetaDisposable, authorizeNotifications: @escaping () -> Void, suppressWarning: @escaping () -> Void, updateMessageAlerts: @escaping (Bool) -> Void, updateMessagePreviews: @escaping (Bool) -> Void, updateMessageSound: @escaping (PeerMessageSound) -> Void, updateGroupAlerts: @escaping (Bool) -> Void, updateGroupPreviews: @escaping (Bool) -> Void, updateGroupSound: @escaping (PeerMessageSound) -> Void, updateChannelAlerts: @escaping (Bool) -> Void, updateChannelPreviews: @escaping (Bool) -> Void, updateChannelSound: @escaping (PeerMessageSound) -> Void, updateInAppSounds: @escaping (Bool) -> Void, updateInAppVibration: @escaping (Bool) -> Void, updateInAppPreviews: @escaping (Bool) -> Void, updateDisplayNameOnLockscreen: @escaping (Bool) -> Void, updateTotalUnreadCountStyle: @escaping (Bool) -> Void, updateIncludeTag: @escaping (PeerSummaryCounterTags, Bool) -> Void, updateTotalUnreadCountCategory: @escaping (Bool) -> Void, resetNotifications: @escaping () -> Void, updatedExceptionMode: @escaping(NotificationExceptionMode) -> Void, openAppSettings: @escaping () -> Void, updateJoinedNotifications: @escaping (Bool) -> Void, updateNotificationsFromAllAccounts: @escaping (Bool) -> Void) {
init(context: AccountContext, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping(ViewController)->Void, soundSelectionDisposable: MetaDisposable, authorizeNotifications: @escaping () -> Void, muteWarningInTabBar: @escaping (Bool) -> Void, suppressWarning: @escaping () -> Void, updateMessageAlerts: @escaping (Bool) -> Void, updateMessagePreviews: @escaping (Bool) -> Void, updateMessageSound: @escaping (PeerMessageSound) -> Void, updateGroupAlerts: @escaping (Bool) -> Void, updateGroupPreviews: @escaping (Bool) -> Void, updateGroupSound: @escaping (PeerMessageSound) -> Void, updateChannelAlerts: @escaping (Bool) -> Void, updateChannelPreviews: @escaping (Bool) -> Void, updateChannelSound: @escaping (PeerMessageSound) -> Void, updateInAppSounds: @escaping (Bool) -> Void, updateInAppVibration: @escaping (Bool) -> Void, updateInAppPreviews: @escaping (Bool) -> Void, updateDisplayNameOnLockscreen: @escaping (Bool) -> Void, updateTotalUnreadCountStyle: @escaping (Bool) -> Void, updateIncludeTag: @escaping (PeerSummaryCounterTags, Bool) -> Void, updateTotalUnreadCountCategory: @escaping (Bool) -> Void, resetNotifications: @escaping () -> Void, updatedExceptionMode: @escaping(NotificationExceptionMode) -> Void, openAppSettings: @escaping () -> Void, updateJoinedNotifications: @escaping (Bool) -> Void, updateNotificationsFromAllAccounts: @escaping (Bool) -> Void) {
self.context = context
self.presentController = presentController
self.pushController = pushController
self.soundSelectionDisposable = soundSelectionDisposable
self.authorizeNotifications = authorizeNotifications
self.muteWarningInTabBar = muteWarningInTabBar
self.suppressWarning = suppressWarning
self.updateMessageAlerts = updateMessageAlerts
self.updateMessagePreviews = updateMessagePreviews
Expand Down Expand Up @@ -123,6 +125,8 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {

case permissionInfo(PresentationTheme, String, String, Bool)
case permissionEnable(PresentationTheme, String)
case permissionTabBarWarningMuteEnable(PresentationTheme, String, Bool)
case permissionTabBarWarningMuteNotice(PresentationTheme, String)

case messageHeader(PresentationTheme, String)
case messageAlerts(PresentationTheme, String, Bool)
Expand Down Expand Up @@ -171,7 +175,7 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
switch self {
case .accountsHeader, .allAccounts, .accountsInfo:
return NotificationsAndSoundsSection.accounts.rawValue
case .permissionInfo, .permissionEnable:
case .permissionInfo, .permissionEnable, .permissionTabBarWarningMuteEnable, .permissionTabBarWarningMuteNotice:
return NotificationsAndSoundsSection.permission.rawValue
case .messageHeader, .messageAlerts, .messagePreviews, .messageSound, .messageNotice, .userExceptions:
return NotificationsAndSoundsSection.messages.rawValue
Expand Down Expand Up @@ -204,74 +208,78 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
return 3
case .permissionEnable:
return 4
case .messageHeader:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This switch statement needs some refactoring :) Otherwise diff is not readable.

Copy link
Author

@azimin azimin Jun 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally agree, one of solution is to get rid of “= X” and give Swift do Int enumeration automatically base on case position.

case .permissionTabBarWarningMuteEnable:
return 5
case .messageAlerts:
case .permissionTabBarWarningMuteNotice:
return 6
case .messagePreviews:
case .messageHeader:
return 7
case .messageSound:
case .messageAlerts:
return 8
case .userExceptions:
case .messagePreviews:
return 9
case .messageNotice:
case .messageSound:
return 10
case .groupHeader:
case .userExceptions:
return 11
case .groupAlerts:
case .messageNotice:
return 12
case .groupPreviews:
case .groupHeader:
return 13
case .groupSound:
case .groupAlerts:
return 14
case .groupExceptions:
case .groupPreviews:
return 15
case .groupNotice:
case .groupSound:
return 16
case .channelHeader:
case .groupExceptions:
return 17
case .channelAlerts:
case .groupNotice:
return 18
case .channelPreviews:
case .channelHeader:
return 19
case .channelSound:
case .channelAlerts:
return 20
case .channelExceptions:
case .channelPreviews:
return 21
case .channelNotice:
case .channelSound:
return 22
case .inAppHeader:
case .channelExceptions:
return 23
case .inAppSounds:
case .channelNotice:
return 24
case .inAppVibrate:
case .inAppHeader:
return 25
case .inAppPreviews:
case .inAppSounds:
return 26
case .displayNamesOnLockscreen:
case .inAppVibrate:
return 27
case .displayNamesOnLockscreenInfo:
case .inAppPreviews:
return 28
case .badgeHeader:
case .displayNamesOnLockscreen:
return 29
case .unreadCountStyle:
case .displayNamesOnLockscreenInfo:
return 30
case .includePublicGroups:
case .badgeHeader:
return 31
case .includeChannels:
case .unreadCountStyle:
return 32
case .unreadCountCategory:
case .includePublicGroups:
return 33
case .unreadCountCategoryInfo:
case .includeChannels:
return 34
case .joinedNotifications:
case .unreadCountCategory:
return 35
case .joinedNotificationsInfo:
case .unreadCountCategoryInfo:
return 36
case .reset:
case .joinedNotifications:
return 37
case .resetNotice:
case .joinedNotificationsInfo:
return 38
case .reset:
return 39
case .resetNotice:
return 40
}
}

Expand Down Expand Up @@ -348,6 +356,18 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
} else {
return false
}
case let .permissionTabBarWarningMuteEnable(lhsTheme, lhsText, lhsValue):
if case let .permissionTabBarWarningMuteEnable(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
return true
} else {
return false
}
case let .permissionTabBarWarningMuteNotice(lhsTheme, lhsText):
if case let .permissionTabBarWarningMuteNotice(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
return true
} else {
return false
}
case let .messageHeader(lhsTheme, lhsText):
if case let .messageHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
return true
Expand Down Expand Up @@ -577,6 +597,12 @@ private enum NotificationsAndSoundsEntry: ItemListNodeEntry {
return ItemListActionItem(theme: theme, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
arguments.authorizeNotifications()
})
case let .permissionTabBarWarningMuteEnable(theme, text, value):
return ItemListSwitchItem(theme: theme, title: text, value: value, sectionId: self.section, style: .blocks, updated: { updatedValue in
arguments.muteWarningInTabBar(!updatedValue)
}, tag: self.tag)
case let .permissionTabBarWarningMuteNotice(theme, text):
return ItemListTextItem(theme: theme, text: .plain(text), sectionId: self.section)
case let .messageHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
case let .messageAlerts(theme, text, value):
Expand Down Expand Up @@ -715,7 +741,7 @@ private func filteredGlobalSound(_ sound: PeerMessageSound) -> PeerMessageSound
}
}

private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warningSuppressed: Bool, globalSettings: GlobalNotificationSettingsSet, inAppSettings: InAppNotificationSettings, exceptions: (users: NotificationExceptionMode, groups: NotificationExceptionMode, channels: NotificationExceptionMode), presentationData: PresentationData, hasMoreThanOneAccount: Bool) -> [NotificationsAndSoundsEntry] {
private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warningSuppressed: Bool, warningInTabBarMuted: Bool, globalSettings: GlobalNotificationSettingsSet, inAppSettings: InAppNotificationSettings, exceptions: (users: NotificationExceptionMode, groups: NotificationExceptionMode, channels: NotificationExceptionMode), presentationData: PresentationData, hasMoreThanOneAccount: Bool) -> [NotificationsAndSoundsEntry] {
var entries: [NotificationsAndSoundsEntry] = []

if hasMoreThanOneAccount {
Expand All @@ -739,6 +765,9 @@ private func notificationsAndSoundsEntries(authorizationStatus: AccessType, warn
case (.denied, _):
entries.append(.permissionInfo(presentationData.theme, title, text, true))
entries.append(.permissionEnable(presentationData.theme, presentationData.strings.Notifications_PermissionsAllowInSettings))
// WARNING: - Requred localization
entries.append(.permissionTabBarWarningMuteEnable(presentationData.theme, "Show Warning in Tab", !warningInTabBarMuted))
entries.append(.permissionTabBarWarningMuteNotice(presentationData.theme, "A warning icon will appear in the tab bar."))
case (.unreachable, false):
entries.append(.permissionInfo(presentationData.theme, title, text, false))
entries.append(.permissionEnable(presentationData.theme, presentationData.strings.Notifications_PermissionsOpenSettings))
Expand Down Expand Up @@ -836,6 +865,8 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions
break
}
})
}, muteWarningInTabBar: { value in
ApplicationSpecificNotice.setNotificationsPermissionTabBarWarningMute(accountManager: context.sharedContext.accountManager, value: value)
}, suppressWarning: {
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.Notifications_PermissionsSuppressWarningTitle, text: presentationData.strings.Notifications_PermissionsSuppressWarningText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Notifications_PermissionsKeepDisabled, action: {
Expand Down Expand Up @@ -1055,15 +1086,25 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions
}
}))
}

let permissionWarningInTabBarMuted = Promise<Bool>(false)
if #available(iOSApplicationExtension 10.0, *) {
permissionWarningInTabBarMuted.set(.single(true)
|> then(
context.sharedContext.accountManager.noticeEntry(key: ApplicationSpecificNotice.notificationsPermissionTabBarWarningMuteKey())
|> map { noticeView -> Bool in
return (noticeView.value as? ApplicationSpecificVariantNotice)?.value ?? false
}))
}

let hasMoreThanOneAccount = context.sharedContext.activeAccounts
|> map { _, accounts, _ -> Bool in
return accounts.count > 1
}
|> distinctUntilChanged

let signal = combineLatest(context.sharedContext.presentationData, sharedData, preferences, notificationExceptions.get(), DeviceAccess.authorizationStatus(context: context, subject: .notifications), notificationsWarningSuppressed.get(), hasMoreThanOneAccount)
|> map { presentationData, sharedData, view, exceptions, authorizationStatus, warningSuppressed, hasMoreThanOneAccount -> (ItemListControllerState, (ItemListNodeState<NotificationsAndSoundsEntry>, NotificationsAndSoundsEntry.ItemGenerationArguments)) in
let signal = combineLatest(context.sharedContext.presentationData, sharedData, preferences, notificationExceptions.get(), DeviceAccess.authorizationStatus(context: context, subject: .notifications), notificationsWarningSuppressed.get(), permissionWarningInTabBarMuted.get(), hasMoreThanOneAccount)
|> map { presentationData, sharedData, view, exceptions, authorizationStatus, warningSuppressed, permissionWarningInTabBarMuted, hasMoreThanOneAccount -> (ItemListControllerState, (ItemListNodeState<NotificationsAndSoundsEntry>, NotificationsAndSoundsEntry.ItemGenerationArguments)) in

let viewSettings: GlobalNotificationSettingsSet
if let settings = view.values[PreferencesKeys.globalNotifications] as? GlobalNotificationSettings {
Expand All @@ -1079,7 +1120,7 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions
inAppSettings = InAppNotificationSettings.defaultSettings
}

let entries = notificationsAndSoundsEntries(authorizationStatus: authorizationStatus, warningSuppressed: warningSuppressed, globalSettings: viewSettings, inAppSettings: inAppSettings, exceptions: exceptions, presentationData: presentationData, hasMoreThanOneAccount: hasMoreThanOneAccount)
let entries = notificationsAndSoundsEntries(authorizationStatus: authorizationStatus, warningSuppressed: warningSuppressed, warningInTabBarMuted: permissionWarningInTabBarMuted, globalSettings: viewSettings, inAppSettings: inAppSettings, exceptions: exceptions, presentationData: presentationData, hasMoreThanOneAccount: hasMoreThanOneAccount)

var index = 0
var scrollToItem: ListViewScrollToItem?
Expand Down
Loading