mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-28 19:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor notifications count

Browse source
This commit is contained in:
Thomas Ricouard 2023-09-19 08:44:11 +02:00
parent f9c0355f1d
commit fd09276d49
7 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
IceCubesApp/App/IceCubesApp.swift
View file

@ -103,7 +103,7 @@ struct IceCubesApp: App {
if tab == .notifications, selectedTab != tab,
let token = appAccountsManager.currentAccount.oauthToken
{
return watcher.unreadNotificationsCount + userPreferences.getNotificationsCount(for: token)
return watcher.unreadNotificationsCount + (userPreferences.notificationsCount[token] ?? 0)
}
return 0
}
@ -176,7 +176,7 @@ struct IceCubesApp: App {
if selectedTab == .notifications,
let token = appAccountsManager.currentAccount.oauthToken
{
userPreferences.setNotification(count: 0, token: token)
userPreferences.notificationsCount[token] = 0
watcher.unreadNotificationsCount = 0
}
}
@ -217,6 +217,7 @@ struct IceCubesApp: App {
case .active:
watcher.watch(streams: [.user, .direct])
UNUserNotificationCenter.current().setBadgeCount(0)
userPreferences.reloadNotificationsCount(tokens: appAccountsManager.availableAccounts.compactMap{ $0.oauthToken })
Task {
await userPreferences.refreshServerPreferences()
}
@ -286,6 +287,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
func application(_: UIApplication, didFailToRegisterForRemoteNotificationsWithError _: Error) {}
func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any]) async -> UIBackgroundFetchResult {
UserPreferences.shared.reloadNotificationsCount(tokens: AppAccountsManager.shared.availableAccounts.compactMap{ $0.oauthToken })
return .noData
}
func application(_: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options _: UIScene.ConnectionOptions) -> UISceneConfiguration {
let configuration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
if connectingSceneSession.role == .windowApplication {

9
IceCubesApp/App/SideBarView.swift
View file

@ -22,7 +22,7 @@ struct SideBarView<Content: View>: View {
if tab == .notifications, selectedTab != tab,
let token = appAccounts.currentAccount.oauthToken
{
return watcher.unreadNotificationsCount + userPreferences.getNotificationsCount(for: token)
return watcher.unreadNotificationsCount + (userPreferences.notificationsCount[token] ?? 0)
}
return 0
}
@ -82,9 +82,10 @@ struct SideBarView<Content: View>: View {
AppAccountView(viewModel: .init(appAccount: account, isCompact: true))
if showBadge,
let token = account.oauthToken,
userPreferences.getNotificationsCount(for: token) > 0
let notificationsCount = userPreferences.notificationsCount[token],
notificationsCount > 0
{
makeBadgeView(count: userPreferences.getNotificationsCount(for: token))
makeBadgeView(count: notificationsCount)
}
}
}
@ -110,7 +111,7 @@ struct SideBarView<Content: View>: View {
SoundEffectManager.shared.playSound(of: .tabSelection)
if tab == .notifications {
if let token = appAccounts.currentAccount.oauthToken {
userPreferences.setNotification(count: 0, token: token)
userPreferences.notificationsCount[token] = 0
}
watcher.unreadNotificationsCount = 0
}

2
IceCubesApp/App/Tabs/NotificationTab.swift
View file

@ -90,7 +90,7 @@ struct NotificationsTab: View {
private func clearNotifications() {
if isSecondaryColumn {
if let token = appAccount.currentAccount.oauthToken {
userPreferences.setNotification(count: 0, token: token)
userPreferences.notificationsCount[token] = 0
}
watcher.unreadNotificationsCount = 0
}

10
IceCubesNotifications/NotificationService.swift
View file

@ -64,14 +64,16 @@ class NotificationService: UNNotificationServiceExtension {
bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: "glass.caf"))
let preferences = UserPreferences.shared
let tokens = AppAccountsManager.shared.pushAccounts.map(\.token)
preferences.reloadNotificationsCount(tokens: tokens)
if let token = AppAccountsManager.shared.availableAccounts.first(where: { $0.oauthToken?.accessToken == notification.accessToken })?.oauthToken {
var currentCount = preferences.getNotificationsCount(for: token)
var currentCount = preferences.notificationsCount[token] ?? 0
currentCount += 1
preferences.setNotification(count: currentCount, token: token)
preferences.notificationsCount[token] = currentCount
}
let tokens = AppAccountsManager.shared.pushAccounts.map(\.token)
bestAttemptContent.badge = .init(integerLiteral: preferences.getNotificationsTotalCount(for: tokens))
bestAttemptContent.badge = .init(integerLiteral: preferences.totalNotificationsCount)
if let urlString = notification.icon,
let url = URL(string: urlString)

4
Packages/AppAccount/Sources/AppAccount/AppAccountView.swift
View file

@ -67,9 +67,9 @@ public struct AppAccountView: View {
.offset(x: 5, y: -5)
} else if viewModel.showBadge,
let token = viewModel.appAccount.oauthToken,
preferences.getNotificationsCount(for: token) > 0
let notificationsCount = preferences.notificationsCount[token],
notificationsCount > 0
{
let notificationsCount = preferences.getNotificationsCount(for: token)
ZStack {
Circle()
.fill(.red)

2
Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
View file

@ -20,7 +20,7 @@ public struct AppAccountsSelectorView: View {
accountsViewModel
.filter { $0.account?.id != currentAccount.account?.id }
.compactMap(\.appAccount.oauthToken)
.map { preferences.getNotificationsCount(for: $0) }
.map { preferences.notificationsCount[$0] ?? 0 }
.reduce(0, +) > 0
}

30
Packages/Env/Sources/Env/UserPreferences.swift
View file

@ -133,21 +133,23 @@ public class UserPreferences: ObservableObject {
}
}
public func setNotification(count: Int, token: OauthToken) {
Self.sharedDefault?.set(count, forKey: "push_notifications_count_\(token.createdAt)")
objectWillChange.send()
}
public func getNotificationsCount(for token: OauthToken) -> Int {
Self.sharedDefault?.integer(forKey: "push_notifications_count_\(token.createdAt)") ?? 0
}
public func getNotificationsTotalCount(for tokens: [OauthToken]) -> Int {
var count = 0
for token in tokens {
count += getNotificationsCount(for: token)
@Published public var notificationsCount: [OauthToken: Int] = [:] {
didSet {
for (key, value) in notificationsCount {
Self.sharedDefault?.set(value, forKey: "push_notifications_count_\(key.createdAt)")
}
}
}
public var totalNotificationsCount: Int {
notificationsCount.compactMap{ $0.value }.reduce(0, +)
}
public func reloadNotificationsCount(tokens: [OauthToken]) {
notificationsCount = [:]
for token in tokens {
notificationsCount[token] = Self.sharedDefault?.integer(forKey: "push_notifications_count_\(token.createdAt)") ?? 0
}
return count
}
@Published public var serverPreferences: ServerPreferences?