mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-25 17:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix notifications reload

Browse source
This commit is contained in:
Thomas Ricouard 2023-12-28 13:48:50 +01:00
parent 00e35be2d5
commit b83f7e9a55
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Packages/Notifications/Sources/Notifications/NotificationsListView.swift
View file

@ -39,7 +39,6 @@ public struct NotificationsListView: View {
}
}
}
.onAppear { viewModel.loadSelectedType() }
.toolbar {
ToolbarItem(placement: .principal) {
let title = lockedType?.menuTitle() ?? viewModel.selectedType?.menuTitle() ?? "notifications.navigation-title"
@ -64,6 +63,9 @@ public struct NotificationsListView: View {
ToolbarTitleMenu {
Button {
viewModel.selectedType = nil
Task {
await viewModel.fetchNotifications()
}
} label: {
Label("notifications.navigation-title", systemImage: "bell.fill")
}
@ -71,6 +73,9 @@ public struct NotificationsListView: View {
ForEach(Notification.NotificationType.allCases, id: \.self) { type in
Button {
viewModel.selectedType = type
Task {
await viewModel.fetchNotifications()
}
} label: {
Label {
Text(type.menuTitle())
@ -87,15 +92,19 @@ public struct NotificationsListView: View {
.scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor)
#endif
.task {
.onAppear {
viewModel.client = client
viewModel.currentAccount = account
if let lockedType {
viewModel.isLockedType = true
viewModel.selectedType = lockedType
} else {
viewModel.loadSelectedType()
}
Task {
await viewModel.fetchNotifications()
}
}
.refreshable {
SoundEffectManager.shared.playSound(.pull)
HapticManager.shared.fireHaptic(.dataRefresh(intensity: 0.3))

5
Packages/Notifications/Sources/Notifications/NotificationsViewModel.swift
View file

@ -50,15 +50,10 @@ import SwiftUI
}
consolidatedNotifications = []
Task {
await fetchNotifications()
}
}
}
func loadSelectedType() {
client = client
guard let value = UserDefaults.standard.string(forKey: filterKey)
else {
selectedType = nil