Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Notification navigation wip

This commit is contained in:
Justin Mazzocchi 2021-02-04 12:09:05 -08:00
parent 03b17d21ee
commit 1359b80a8e
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
6 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Localizations/Localizable.strings
View File

@ -145,6 +145,7 @@
"main-navigation.notifications" = "Notifications";
"main-navigation.conversations" = "Messages";
"metatext" = "Metatext";
"notification.signed-in-as-%@" = "Signed in as %@";
"notifications.all" = "All";
"notifications.mentions" = "Mentions";
"ok" = "OK";

8
Notification Service Extension/NotificationService.swift
View File

@ -55,7 +55,7 @@ final class NotificationService: UNNotificationServiceExtension {
}
if appPreferences.notificationPictures {
Self.addImage(pushNotification: pushNotification,
Self.addImage(url: pushNotification.icon,
bestAttemptContent: bestAttemptContent,
contentHandler: contentHandler)
} else {
@ -71,14 +71,14 @@ final class NotificationService: UNNotificationServiceExtension {
}
private extension NotificationService {
static func addImage(pushNotification: PushNotification,
static func addImage(url: URL,
bestAttemptContent: UNMutableNotificationContent,
contentHandler: @escaping (UNNotificationContent) -> Void) {
let fileName = pushNotification.icon.lastPathComponent
let fileName = url.lastPathComponent
let fileURL = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
.appendingPathComponent(fileName)
KingfisherManager.shared.retrieveImage(with: pushNotification.icon) {
KingfisherManager.shared.retrieveImage(with: url) {
switch $0 {
case let .success(result):
let format: ImageFormat

22
ServiceLayer/Sources/ServiceLayer/Services/UserNotificationService.swift
View File

@ -17,6 +17,10 @@ public struct UserNotificationService {
public extension UserNotificationService {
typealias Event = UserNotificationClient.DelegateEvent
typealias Content = UNNotificationContent
typealias MutableContent = UNMutableNotificationContent
typealias Trigger = UNNotificationTrigger
typealias Request = UNNotificationRequest
func isAuthorized(request: Bool) -> AnyPublisher<Bool, Error> {
getNotificationSettings()
@ -32,6 +36,24 @@ public extension UserNotificationService {
}
.eraseToAnyPublisher()
}
func add(request: Request) -> AnyPublisher<Never, Error> {
Future<Void, Error> { promise in
userNotificationClient.add(request) { error in
if let error = error {
promise(.failure(error))
} else {
promise(.success(()))
}
}
}
.ignoreOutput()
.eraseToAnyPublisher()
}
func removeDeliveredNotifications(withIdentifiers identifiers: [String]) {
userNotificationClient.removeDeliveredNotifications(identifiers)
}
}
private extension UserNotificationService {

14
ServiceLayer/Sources/ServiceLayer/Utilities/UserNotificationClient.swift
View File

@ -10,16 +10,22 @@ public struct UserNotificationClient {
case openSettingsForNotification(UNNotification?)
}
public var getNotificationSettings: (@escaping (UNNotificationSettings) -> Void) -> Void
public var requestAuthorization: (UNAuthorizationOptions, @escaping (Bool, Error?) -> Void) -> Void
public var delegateEvents: AnyPublisher<DelegateEvent, Never>
public let getNotificationSettings: (@escaping (UNNotificationSettings) -> Void) -> Void
public let requestAuthorization: (UNAuthorizationOptions, @escaping (Bool, Error?) -> Void) -> Void
public let add: (UNNotificationRequest, ((Error?) -> Void)?) -> Void
public let removeDeliveredNotifications: ([String]) -> Void
public let delegateEvents: AnyPublisher<DelegateEvent, Never>
public init(
getNotificationSettings: @escaping (@escaping (UNNotificationSettings) -> Void) -> Void,
requestAuthorization: @escaping (UNAuthorizationOptions, @escaping (Bool, Error?) -> Void) -> Void,
add: @escaping (UNNotificationRequest, ((Error?) -> Void)?) -> Void,
removeDeliveredNotifications: @escaping ([String]) -> Void,
delegateEvents: AnyPublisher<DelegateEvent, Never>) {
self.getNotificationSettings = getNotificationSettings
self.requestAuthorization = requestAuthorization
self.add = add
self.removeDeliveredNotifications = removeDeliveredNotifications
self.delegateEvents = delegateEvents
}
}
@ -59,6 +65,8 @@ extension UserNotificationClient {
return UserNotificationClient(
getNotificationSettings: userNotificationCenter.getNotificationSettings,
requestAuthorization: userNotificationCenter.requestAuthorization,
add: userNotificationCenter.add(_:withCompletionHandler:),
removeDeliveredNotifications: userNotificationCenter.removeDeliveredNotifications(withIdentifiers:),
delegateEvents: subject
.handleEvents(receiveCancel: { delegate = nil })
.eraseToAnyPublisher())

2
ServiceLayer/Sources/ServiceLayerMocks/MockUserNotificationClient.swift
View File

@ -7,5 +7,7 @@ public extension UserNotificationClient {
static let mock = UserNotificationClient(
getNotificationSettings: { _ in },
requestAuthorization: { _, _ in },
add: { _, completion in completion?(nil) },
removeDeliveredNotifications: { _ in },
delegateEvents: Empty(completeImmediately: false).eraseToAnyPublisher())
}

47
ViewModels/Sources/ViewModels/View Models/RootViewModel.swift
View File

@ -36,7 +36,7 @@ public final class RootViewModel: ObservableObject {
.replaceError(with: nil)
.assign(to: &$mostRecentlyUsedIdentityId)
identitySelected(id: mostRecentlyUsedIdentityId, immediate: true)
identitySelected(id: mostRecentlyUsedIdentityId, immediate: true, notify: false)
allIdentitiesService.identitiesCreated
.sink { [weak self] in self?.identitySelected(id: $0) }
@ -50,7 +50,7 @@ public final class RootViewModel: ObservableObject {
public extension RootViewModel {
func identitySelected(id: Identity.Id?) {
identitySelected(id: id, immediate: false)
identitySelected(id: id, immediate: false, notify: false)
}
func deleteIdentity(id: Identity.Id) {
@ -80,7 +80,12 @@ public extension RootViewModel {
}
private extension RootViewModel {
func identitySelected(id: Identity.Id?, immediate: Bool) {
static let identityChangeNotificationUserInfoKey =
"com.metabolist.metatext.identity-change-notification-user-info-key"
static let removeIdentityChangeNotificationAfter = DispatchTimeInterval.seconds(10)
// swiftlint:disable:next function_body_length
func identitySelected(id: Identity.Id?, immediate: Bool, notify: Bool) {
navigationViewModel?.presentingSecondaryNavigation = false
guard
@ -95,7 +100,9 @@ private extension RootViewModel {
.catch { [weak self] _ -> Empty<Identity, Never> in
DispatchQueue.main.async {
if self?.navigationViewModel?.identityContext.identity.id == id {
self?.identitySelected(id: self?.mostRecentlyUsedIdentityId, immediate: false)
self?.identitySelected(id: self?.mostRecentlyUsedIdentityId,
immediate: false,
notify: true)
}
}
@ -131,6 +138,10 @@ private extension RootViewModel {
.store(in: &self.cancellables)
}
if notify {
self.notifyIdentityChange(identityContext: identityContext)
}
return NavigationViewModel(identityContext: identityContext)
}
.assign(to: &$navigationViewModel)
@ -138,8 +149,15 @@ private extension RootViewModel {
func handle(event: UserNotificationService.Event) {
switch event {
case let .willPresentNotification(_, completionHandler):
case let .willPresentNotification(notification, completionHandler):
completionHandler(.banner)
if notification.request.content.userInfo[Self.identityChangeNotificationUserInfoKey] as? Bool == true {
DispatchQueue.main.asyncAfter(deadline: .now() + Self.removeIdentityChangeNotificationAfter) {
self.userNotificationService.removeDeliveredNotifications(
withIdentifiers: [notification.request.identifier])
}
}
case let .didReceiveResponse(response, completionHandler):
let userInfo = response.notification.request.content.userInfo
@ -157,6 +175,23 @@ private extension RootViewModel {
}
func handle(pushNotification: PushNotification, identityId: Identity.Id) {
// TODO
if identityId != navigationViewModel?.identityContext.identity.id {
identitySelected(id: identityId, immediate: false, notify: true)
}
}
func notifyIdentityChange(identityContext: IdentityContext) {
let content = UserNotificationService.MutableContent()
content.body = String.localizedStringWithFormat(
NSLocalizedString("notification.signed-in-as-%@", comment: ""),
identityContext.identity.handle)
content.userInfo[Self.identityChangeNotificationUserInfoKey] = true
let request = UserNotificationService.Request(identifier: UUID().uuidString, content: content, trigger: nil)
userNotificationService.add(request: request)
.sink { _ in } receiveValue: { _ in }
.store(in: &cancellables)
}
}