Доработал бейджи и загрузку диалогов/друзей (#284)

easydev991 · web-flow · commit 30de381991ff · 2025-02-13T11:18:23.000+03:00
* Доработал обновление диалогов и профиля

* Обновляем список друзей после изменения списка

* Добавил бейдж для профиля

Показываем количество заявок в друзья

* Доработал бейджи

- Показываем бейдж на табе с профилем, если есть заявки в друзья
- Показываем бейдж на иконке приложения с суммарным количеством уведомлений (сообщения + заявки)

* Мелкий рефактор
diff --git a/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj b/SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
@@ -876,7 +876,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -928,7 +928,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
diff --git a/SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/DeviceOSVersionChecker.swift b/SwiftUI-WorkoutApp/Libraries/SWModels/Sources/SWModels/DeviceOSVersionChecker.swift
@@ -1,11 +1,6 @@
 import Foundation
 
-@available(
-    iOS,
-    introduced: 15,
-    deprecated: 16,
-    message: "refreshable работает в ScrollView на iOS 16, можно убрать неактуальную кнопку обновления"
-)
+@available(iOS, deprecated: 16, message: "refreshable работает в ScrollView на iOS 16, можно убрать неактуальную кнопку обновления")
 public enum DeviceOSVersionChecker {
     /// Установлена ли iOS 16 на девайсе
     ///
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift
@@ -9,7 +9,7 @@ struct DialogsListScreen: View {
     @Environment(\.scenePhase) private var scenePhase
     @Environment(\.isNetworkConnected) private var isNetworkConnected
     @EnvironmentObject private var defaults: DefaultsService
-    @StateObject private var viewModel = DialogsViewModel()
+    @EnvironmentObject private var viewModel: DialogsViewModel
     @State private var selectedDialog: DialogResponse?
     @State private var indexToDelete: Int?
     @State private var openFriendList = false
@@ -32,15 +32,14 @@ struct DialogsListScreen: View {
             .background(Color.swBackground)
             .navigationTitle("Сообщения")
         }
-        .navigationViewStyle(.stack)
-        .onChange(of: defaults.isAuthorized, perform: viewModel.clearDialogsOnLogout)
         .onChange(of: scenePhase) { phase in
             if case .active = phase {
-                guard refreshTask == nil else { return }
-                refreshTask = Task { await askForDialogs(refresh: true) }
+                refreshTask = Task {
+                    try? await viewModel.getDialogs(refresh: true, defaults: defaults)
+                }
             }
         }
-        .task(id: defaults.isAuthorized) { await askForDialogs() }
+        .navigationViewStyle(.stack)
     }
 }
 
@@ -168,7 +167,7 @@ private extension DialogsListScreen {
 
     func askForDialogs(refresh: Bool = false) async {
         do {
-            try await viewModel.askForDialogs(refresh: refresh, defaults: defaults)
+            try await viewModel.getDialogs(refresh: refresh, defaults: defaults)
         } catch {
             SWAlert.shared.presentDefaultUIKit(error)
         }
@@ -189,5 +188,6 @@ private extension DialogsListScreen {
 #Preview {
     DialogsListScreen()
         .environmentObject(DefaultsService())
+        .environmentObject(DialogsViewModel())
 }
 #endif
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogsViewModel.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogsViewModel.swift
@@ -10,11 +10,16 @@ final class DialogsViewModel: ObservableObject {
     var hasDialogs: Bool { !dialogs.isEmpty }
     var showEmptyView: Bool { !hasDialogs && !isLoading }
 
-    func askForDialogs(
+    func getDialogs(
         refresh: Bool = false,
         defaults: DefaultsService
     ) async throws {
-        guard defaults.isAuthorized else { return }
+        guard defaults.isAuthorized else {
+            if !dialogs.isEmpty {
+                dialogs.removeAll()
+            }
+            return
+        }
         guard !isLoading else { return }
         guard dialogs.isEmpty || refresh else { return }
         if !refresh || dialogs.isEmpty { isLoading = true }
@@ -51,11 +56,6 @@ final class DialogsViewModel: ObservableObject {
         defaults.saveUnreadMessagesCount(newValue)
     }
 
-    func clearDialogsOnLogout(isAuthorized: Bool) {
-        guard !isAuthorized else { return }
-        dialogs.removeAll()
-    }
-
     private func updateUnreadMessagesCount(with defaults: DefaultsService) {
         let unreadMessagesCount = dialogs.map(\.unreadMessagesCount).reduce(0, +)
         defaults.saveUnreadMessagesCount(unreadMessagesCount)
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/MainUserFriendsListScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/MainUserFriendsListScreen.swift
@@ -74,10 +74,11 @@ private extension MainUserFriendsListScreen {
 
     func askForUsers(refresh: Bool = false) async {
         guard !isLoading else { return }
+        let needUpdate = defaults.needUpdateUser
         let isEmpty = [friends, friendRequests].allSatisfy(\.isEmpty)
-        guard isEmpty || refresh else { return }
+        guard isEmpty || refresh || needUpdate else { return }
         do {
-            if !refresh { isLoading = true }
+            if !refresh || needUpdate { isLoading = true }
             try await getFriendsAndRequests()
         } catch {
             SWAlert.shared.presentDefaultUIKit(error)
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/MainUserProfileScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/MainUserProfileScreen.swift
@@ -34,7 +34,6 @@ struct MainUserProfileScreen: View {
         .task { await askForUserInfo() }
         .onChange(of: scenePhase) { phase in
             if case .active = phase {
-                guard refreshTask == nil else { return }
                 refreshTask = Task { await askForUserInfo(refresh: true) }
             }
         }
@@ -155,7 +154,7 @@ private extension MainUserProfileScreen {
     func askForUserInfo(refresh: Bool = false) async {
         guard let userId = defaults.mainUserInfo?.id else { return }
         guard !isLoading else { return }
-        if !refresh { isLoading = true }
+        if !refresh || defaults.needUpdateUser { isLoading = true }
         if refresh || defaults.needUpdateUser {
             do {
                 let result = try await client.getSocialUpdates(userID: userId)
diff --git a/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift b/SwiftUI-WorkoutApp/Screens/Profile/UserDetailsScreen.swift
@@ -133,6 +133,7 @@ private extension UserDetailsScreen {
                     case .removeFriend:
                         socialActions.friend = .sendFriendRequest
                     }
+                    defaults.setUserNeedUpdate(true)
                 }
             } catch {
                 SWAlert.shared.presentDefaultUIKit(error)
diff --git a/SwiftUI-WorkoutApp/Screens/Root/RootScreen.swift b/SwiftUI-WorkoutApp/Screens/Root/RootScreen.swift
@@ -4,34 +4,45 @@ import SwiftUI
 struct RootScreen: View {
     @Binding var selectedTab: TabViewModel.Tab
     let unreadCount: Int
+    let friendRequestsCount: Int
 
     var body: some View {
         TabView(selection: $selectedTab) {
             ForEach(TabViewModel.Tab.allCases, id: \.rawValue) { tab in
                 tab.screen
                     .tabItem { tab.tabItemLabel }
                     .tag(tab)
-                    .badge(tab == .messages ? unreadCount : 0)
+                    .badge(makeBadgeCount(for: tab))
             }
         }
         .navigationViewStyle(.stack)
     }
+
+    private func makeBadgeCount(for tab: TabViewModel.Tab) -> Int {
+        switch tab {
+        case .messages: unreadCount
+        case .profile: friendRequestsCount
+        default: 0
+        }
+    }
 }
 
 #if DEBUG
-#Preview("Есть бейдж для чатов") {
+#Preview("Есть бейджи") {
     RootScreen(
         selectedTab: .constant(.map),
-        unreadCount: 1
+        unreadCount: 1,
+        friendRequestsCount: 1
     )
     .environmentObject(ParksManager())
     .environmentObject(DefaultsService())
 }
 
-#Preview("Нет бейджа") {
+#Preview("Нет бейджей") {
     RootScreen(
         selectedTab: .constant(.map),
-        unreadCount: 0
+        unreadCount: 0,
+        friendRequestsCount: 0
     )
     .environmentObject(ParksManager())
     .environmentObject(DefaultsService())
diff --git a/SwiftUI-WorkoutApp/Services/DefaultsService.swift b/SwiftUI-WorkoutApp/Services/DefaultsService.swift
@@ -5,6 +5,9 @@ import SWUtils
 @MainActor
 final class DefaultsService: ObservableObject, DefaultsProtocol {
     var authToken: String? { try? basicAuthInfo().token }
+    var appIconBadgeCount: Int {
+        unreadMessagesCount + friendRequestsList.count
+    }
 
     @AppStorage(Key.needUpdateUser.rawValue)
     private(set) var needUpdateUser = false
diff --git a/SwiftUI-WorkoutApp/SwiftUI_WorkoutAppApp.swift b/SwiftUI-WorkoutApp/SwiftUI_WorkoutAppApp.swift
@@ -11,6 +11,7 @@ struct SwiftUI_WorkoutAppApp: App {
     @StateObject private var defaults = DefaultsService()
     @StateObject private var network = NetworkStatus()
     @StateObject private var parksManager = ParksManager()
+    @StateObject private var dialogsViewModel = DialogsViewModel()
     @State private var countriesUpdateTask: Task<Void, Never>?
     private let countriesStorage = SWAddress()
     private var client: SWClient { SWClient(with: defaults) }
@@ -31,20 +32,26 @@ struct SwiftUI_WorkoutAppApp: App {
         WindowGroup {
             RootScreen(
                 selectedTab: $tabViewModel.selectedTab,
-                unreadCount: defaults.unreadMessagesCount
+                unreadCount: defaults.unreadMessagesCount,
+                friendRequestsCount: defaults.friendRequestsList.count
             )
             .environmentObject(tabViewModel)
             .environmentObject(defaults)
             .environmentObject(parksManager)
+            .environmentObject(dialogsViewModel)
             .preferredColorScheme(colorScheme)
             .environment(\.isNetworkConnected, network.isConnected)
             .environment(\.userFlags, defaults.userFlags)
+            .task(id: defaults.isAuthorized) {
+                try? await dialogsViewModel.getDialogs(defaults: defaults)
+            }
         }
         .onChange(of: scenePhase) { phase in
             switch phase {
             case .active:
                 updateCountriesIfNeeded()
             default:
+                updateAppIconBadge()
                 defaults.setUserNeedUpdate(true)
             }
         }
@@ -61,6 +68,28 @@ struct SwiftUI_WorkoutAppApp: App {
             }
         }
     }
+
+    @available(iOS, deprecated: 16, message: "Заменить на async-вариант")
+    private func updateAppIconBadge() {
+        func setupAppIconBadge() {
+            DispatchQueue.main.async {
+                UIApplication.shared.applicationIconBadgeNumber = defaults.appIconBadgeCount
+            }
+        }
+        let center = UNUserNotificationCenter.current()
+        center.getNotificationSettings { settings in
+            switch settings.authorizationStatus {
+            case .notDetermined:
+                center.requestAuthorization(options: [.badge]) { granted, _ in
+                    guard granted else { return }
+                    setupAppIconBadge()
+                }
+            case .authorized, .provisional:
+                setupAppIconBadge()
+            default: break
+            }
+        }
+    }
 }
 
 private extension SwiftUI_WorkoutAppApp {
@@ -100,8 +129,6 @@ private extension SwiftUI_WorkoutAppApp {
         let tabBarItemAppearance = UITabBarItemAppearance()
         tabBarItemAppearance.normal.iconColor = .init(.swSmallElements)
         tabBarItemAppearance.normal.titleTextAttributes = [.foregroundColor: UIColor(.swSmallElements)]
-        tabBarItemAppearance.normal.badgeBackgroundColor = .accent
-        tabBarItemAppearance.normal.badgeTextAttributes = [.foregroundColor: UIColor(.swBackground)]
         return tabBarItemAppearance
     }
 

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ private extension UserDetailsScreen {`
`133`	`133`	`case .removeFriend:`
`134`	`134`	`socialActions.friend = .sendFriendRequest`
`135`	`135`	`}`
	`136`	`+ defaults.setUserNeedUpdate(true)`
`136`	`137`	`}`
`137`	`138`	`} catch {`
`138`	`139`	`SWAlert.shared.presentDefaultUIKit(error)`