Доработки в списке пользователей

- Анимируем принятие заявки в друзья
- После принятия заявки в друзья обновляем список друзей и отображаем нового друга
- После ответа на заявку в друзья убираем эту заявку из списка на экране
- При рефреше на экране с черным списком закрываем экран, если сервер прислал пустой черный список

Author: easydev991

SwiftUI-WorkoutApp/Libraries/SWNetwork/Sources/SWNetwork/SWNetwork.swift

@@ -163,15 +163,20 @@ private extension SWNetworkService {
     /// - Returns: Новая ошибка
     @discardableResult
     func handleUrlSession(_ error: Error, _ request: URLRequest) -> Error {
-        if (error as NSError).code == -999 {
-            assertionFailure("Запрос отменён! Код ошибки: -999")
+        let errorCode = (error as NSError).code
+        if errorCode == -999 {
+            let message = "Запрос отменён! Код ошибки: -999. URL запроса: \(request.urlString)"
+            logger.error("\(message)")
+        } else {
+            logger.error(
+                """
+                Ошибка!
+                \(error.localizedDescription, privacy: .public)
+                Код ошибки: \(errorCode, privacy: .public)
+                \nURL запроса: \(request.urlString, privacy: .public)
+                """
+            )
         }
-        logger.error(
-            """
-            \(error.localizedDescription, privacy: .public)
-            \nURL запроса: \(request.urlString, privacy: .public)
-            """
-        )
         guard let urlError = error as? URLError else {
             return error
         }

SwiftUI-WorkoutApp/Screens/Common/UsersListScreen.swift

@@ -6,6 +6,7 @@ import SWUtils
 
 /// Экран со списком пользователей
 struct UsersListScreen: View {
+    @Environment(\.dismiss) private var dismiss
     @Environment(\.isNetworkConnected) private var isNetworkConnected
     @EnvironmentObject private var defaults: DefaultsService
     @State private var users = [UserResponse]()
@@ -21,20 +22,10 @@ struct UsersListScreen: View {
         ScrollView {
             VStack(spacing: 0) {
                 friendRequestsSectionIfNeeded
-                SectionView(
-                    header: friendRequests.isEmpty ? nil : "Друзья",
-                    mode: .regular
-                ) {
-                    LazyVStack(spacing: 12) {
-                        ForEach(users) { item in
-                            listItem(for: item)
-                                .disabled(item.id == defaults.mainUserInfo?.id)
-                        }
-                    }
-                }
-                .padding(.top)
+                friendsSectionIfNeeded
             }
             .padding(.horizontal)
+            .frame(maxWidth: .infinity)
         }
         .sheet(
             item: $messagingModel.recipient,
@@ -98,6 +89,27 @@ private extension UsersListScreen {
         }
     }
 
+    @ViewBuilder
+    var friendsSectionIfNeeded: some View {
+        ZStack {
+            if !users.isEmpty {
+                SectionView(
+                    header: friendRequests.isEmpty ? nil : "Друзья",
+                    mode: .regular
+                ) {
+                    LazyVStack(spacing: 12) {
+                        ForEach(users) { item in
+                            listItem(for: item)
+                                .disabled(item.id == defaults.mainUserInfo?.id)
+                        }
+                    }
+                }
+            }
+        }
+        .animation(.default, value: users)
+        .padding(.top)
+    }
+
     @ViewBuilder
     func listItem(for model: UserResponse) -> some View {
         switch mode {
@@ -166,28 +178,20 @@ private extension UsersListScreen {
             case let .friends(userID), let .friendsForChat(userID):
                 if !users.isEmpty, !refresh { return }
                 if !refresh { isLoading = true }
-                let isMainUser = userID == defaults.mainUserInfo?.id
-                let response = try await client.getFriendsForUser(id: userID)
-                if isMainUser {
-                    try? defaults.saveFriendsIds(response.map(\.id))
-                    if defaults.friendRequestsList.isEmpty || refresh {
-                        friendRequests = try await client.getFriendRequests()
-                        try? defaults.saveFriendRequests(friendRequests)
-                    } else {
-                        friendRequests = defaults.friendRequestsList
-                    }
+                if userID == defaults.mainUserInfo?.id {
+                    try await makeListForMainUser(userID)
+                } else {
+                    users = try await client.getFriendsForUser(id: userID)
                 }
-                users = response
             case let .eventParticipants(list), let .parkParticipants(list):
                 users = list
             case .blacklist:
                 if !users.isEmpty, !refresh { return }
                 if !refresh { isLoading = true }
-                if defaults.blacklistedUsers.isEmpty || refresh {
-                    users = try await client.getBlacklist()
-                    try? defaults.saveBlacklist(users)
-                } else {
-                    users = defaults.blacklistedUsers
+                users = try await client.getBlacklist()
+                try? defaults.saveBlacklist(users)
+                if users.isEmpty {
+                    dismiss()
                 }
             }
         } catch {
@@ -202,14 +206,26 @@ private extension UsersListScreen {
             do {
                 let isSuccess = try await client.respondToFriendRequest(from: userID, accept: accept)
                 if isSuccess {
-                    await askForUsers(refresh: true)
+                    friendRequests.removeAll(where: { $0.id == userID })
+                    try await makeListForMainUser(defaults.mainUserInfo?.id)
                 }
             } catch {
                 SWAlert.shared.presentDefaultUIKit(message: error.localizedDescription)
             }
             isLoading = false
         }
     }
+
+    func makeListForMainUser(_ id: Int?) async throws {
+        guard let id else { return }
+        async let friendsTask = client.getFriendsForUser(id: id)
+        async let requestsTask = client.getFriendRequests()
+        let (friends, requests) = try await (friendsTask, requestsTask)
+        try? defaults.saveFriendsIds(friends.map(\.id))
+        try? defaults.saveFriendRequests(requests)
+        users = friends
+        friendRequests = requests
+    }
 }
 
 #if DEBUG