Доработки

+ доработал цвета в таббаре и навбаре

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -856,7 +856,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;
@@ -907,7 +907,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
 				DEVELOPMENT_TEAM = CR68PP2Z3F;
 				ENABLE_PREVIEWS = YES;

SwiftUI-WorkoutApp/Libraries/SWNetworkClient/Sources/SWNetworkClient/SWClient.swift

@@ -62,7 +62,6 @@ public struct SWClient: Sendable {
     /// - Parameters:
     ///   - userID: `id` пользователя
     /// - Returns: вся информация о пользователе
-    @discardableResult
     public func getUserByID(_ userID: Int) async throws -> UserResponse {
         let endpoint = Endpoint.getUser(id: userID)
         return try await makeResult(for: endpoint)

SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift

@@ -33,7 +33,8 @@ struct DialogsListScreen: View {
             .navigationTitle("Сообщения")
         }
         .navigationViewStyle(.stack)
-        .task { await askForDialogs() }
+        .onChange(of: defaults.isAuthorized, perform: viewModel.clearDialogsOnLogout)
+        .task(id: defaults.isAuthorized) { await askForDialogs() }
     }
 }
 
@@ -48,7 +49,6 @@ private extension DialogsListScreen {
                 isPresented: $showDeleteConfirmation,
                 titleVisibility: .visible
             ) { deleteDialogButton }
-            .refreshable { await askForDialogs(refresh: true) }
             .toolbar {
                 ToolbarItem(placement: .topBarLeading) {
                     refreshButton
@@ -67,8 +67,8 @@ private extension DialogsListScreen {
         } label: {
             Icons.Regular.refresh.view
         }
-        .opacity(viewModel.showRefreshButton ? 1 : 0)
-        .disabled(viewModel.isLoading)
+        .opacity(viewModel.showEmptyView ? 1 : 0)
+        .disabled(viewModel.isLoading || !isNetworkConnected)
     }
 
     var friendListButton: some View {
@@ -109,6 +109,7 @@ private extension DialogsListScreen {
             }
             .listStyle(.plain)
             .opacity(viewModel.hasDialogs ? 1 : 0)
+            .refreshable { await askForDialogs(refresh: true) }
         }
         .animation(.default, value: viewModel.dialogs.count)
         .background(

SwiftUI-WorkoutApp/Screens/Messages/DialogsViewModel.swift

@@ -8,9 +8,6 @@ final class DialogsViewModel: ObservableObject {
     @Published private(set) var isLoading = false
     var hasDialogs: Bool { !dialogs.isEmpty }
     var showEmptyView: Bool { !hasDialogs && !isLoading }
-    var showRefreshButton: Bool {
-        showEmptyView || !DeviceOSVersionChecker.iOS16Available
-    }
 
     @MainActor
     func askForDialogs(
@@ -54,4 +51,10 @@ final class DialogsViewModel: ObservableObject {
         let newValue = defaults.unreadMessagesCount - dialog.unreadMessagesCount
         defaults.saveUnreadMessagesCount(newValue)
     }
+
+    @MainActor
+    func clearDialogsOnLogout(isAuthorized: Bool) {
+        guard !isAuthorized else { return }
+        dialogs.removeAll()
+    }
 }

SwiftUI-WorkoutApp/SwiftUI_WorkoutAppApp.swift

@@ -11,8 +11,10 @@ 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>?
     @State private var socialUpdateTask: Task<Void, Never>?
+    @State private var dialogsUpdateTask: Task<Void, Never>?
     private let countriesStorage = SWAddress()
     private var client: SWClient { SWClient(with: defaults) }
     private var colorScheme: ColorScheme? {
@@ -38,6 +40,7 @@ struct SwiftUI_WorkoutAppApp: App {
             .environmentObject(network)
             .environmentObject(defaults)
             .environmentObject(parksManager)
+            .environmentObject(dialogsViewModel)
             .preferredColorScheme(colorScheme)
             .environment(\.isNetworkConnected, network.isConnected)
             .environment(\.userFlags, defaults.userFlags)
@@ -67,18 +70,15 @@ struct SwiftUI_WorkoutAppApp: App {
     private func updateSocialInfoIfNeeded() {
         guard let mainUserId = defaults.mainUserInfo?.id else { return }
         socialUpdateTask = Task {
-            async let socialUpdatesTask = client.getSocialUpdates(userID: mainUserId)
-            async let unreadCountTask = UnreadCountService(client: client).getUnreadCount()
-            let (socialUpdates, unreadCount) = await (socialUpdatesTask, unreadCountTask)
-            if let socialUpdates {
-                try? defaults.saveFriendsIds(socialUpdates.friends.map(\.id))
-                try? defaults.saveFriendRequests(socialUpdates.friendRequests)
-                try? defaults.saveBlacklist(socialUpdates.blacklist)
+            if let result = await client.getSocialUpdates(userID: mainUserId) {
+                try? defaults.saveFriendsIds(result.friends.map(\.id))
+                try? defaults.saveFriendRequests(result.friendRequests)
+                try? defaults.saveBlacklist(result.blacklist)
                 defaults.setUserNeedUpdate(false)
             }
-            if let unreadCount {
-                defaults.saveUnreadMessagesCount(unreadCount)
-            }
+        }
+        dialogsUpdateTask = Task {
+            try? await dialogsViewModel.askForDialogs(refresh: true, defaults: defaults)
         }
     }
 }
@@ -93,7 +93,13 @@ private extension SwiftUI_WorkoutAppApp {
             $0.backgroundColor = .init(Color.swBackground)
             $0.shadowColor = nil
         }
+        let tabBarItemAppearance = makeTabBarItemAppearance()
+        tabBarAppearance.inlineLayoutAppearance = tabBarItemAppearance
+        tabBarAppearance.stackedLayoutAppearance = tabBarItemAppearance
+        tabBarAppearance.compactInlineLayoutAppearance = tabBarItemAppearance
+        UITabBar.appearance().standardAppearance = tabBarAppearance
         UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance
+        UINavigationBar.appearance().standardAppearance = navBarAppearance
         UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
         fixAlertAccentColor()
         if !DeviceOSVersionChecker.iOS16Available {
@@ -104,15 +110,27 @@ private extension SwiftUI_WorkoutAppApp {
     /// Исправляет баг с accentColor у алертов,  [обсуждение](https://developer.apple.com/forums/thread/673147)
     ///
     /// Без этой настройки у всех алертов при первом появлении стандартный tintColor (синий),
-    /// а при нажатии он меняется на `AccentColor` в проекте
+    /// а при нажатии он меняется на AccentColor в проекте
     func fixAlertAccentColor() {
         UIView.appearance().tintColor = .accent
     }
 
+    /// Настройки цветовых параметров для табов в таббаре
+    func makeTabBarItemAppearance() -> UITabBarItemAppearance {
+        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
+    }
+
+    #if DEBUG
     func prepareForUITestIfNeeded() {
         if ProcessInfo.processInfo.arguments.contains("UITest") {
             UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
             UIView.setAnimationsEnabled(false)
         }
     }
+    #endif
 }