Обновил состояние экрана со списком площадок для пользователя (#319)

* Доработал экран с добавленными площадками

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

* Убрал лишний текст "Загрузка..."

Author: easydev991

SwiftUI-WorkoutApp/Resources/Localizable.xcstrings

@@ -1641,16 +1641,6 @@
         }
       }
     },
-    "Загрузка..." : {
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Loading..."
-          }
-        }
-      }
-    },
     "Закрыть" : {
       "localizations" : {
         "en" : {

SwiftUI-WorkoutApp/Screens/Common/FriendsListScreen.swift

@@ -91,9 +91,7 @@ private extension FriendsListScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }
 

SwiftUI-WorkoutApp/Screens/Messages/DialogsListScreen.swift

@@ -94,9 +94,7 @@ private extension DialogsListScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }
 

SwiftUI-WorkoutApp/Screens/Parks/ParksListScreen.swift

@@ -7,56 +7,36 @@ import SWUtils
 /// Экран со списком площадок
 struct ParksListScreen: View {
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.isNetworkConnected) private var isNetworkConnected
     @EnvironmentObject private var defaults: DefaultsService
     @EnvironmentObject private var parksManager: ParksManager
-    @State private var parks = [Park]()
-    @State private var isLoading = false
+    @State private var currentState = CurrentState.initial
     /// Площадка для открытия детального экрана
     @State private var selectedPark: Park?
+    private var client: SWClient { SWClient(with: defaults) }
     let mode: Mode
 
     var body: some View {
         ScrollView {
-            LazyVStack(spacing: 12) {
-                ForEach(parks) { park in
-                    Button {
-                        switch mode {
-                        case let .event(_, callBack):
-                            callBack(park.id, park.name ?? park.longTitle)
-                            dismiss()
-                        case .usedBy, .added:
-                            selectedPark = park
-                        }
-                    } label: {
-                        ParkRowView(
-                            imageURL: park.previewImageURL,
-                            title: park.longTitle,
-                            address: park.address,
-                            usersTrainHereText: park.usersTrainHereText
-                        )
-                    }
-                    .accessibilityIdentifier("ParkViewCell")
-                }
-            }
-            .padding([.top, .horizontal])
+            contentView
+                .animation(.default, value: currentState)
+                .frame(maxWidth: .infinity)
         }
-        .loadingOverlay(if: isLoading)
+        .loadingOverlay(if: currentState.isLoading)
         .background(Color.swBackground)
         .sheet(item: $selectedPark) { park in
             NavigationView {
                 ParkDetailScreen(park: park) { deletePark(id: $0) }
             }
             .navigationViewStyle(.stack)
         }
-        .onChange(of: parks) { list in
-            if list.isEmpty {
-                defaults.setUserNeedUpdate(true)
+        .onChange(of: currentState) { newState in
+            if newState.isReadyAndEmpty {
                 dismiss()
             }
         }
         .task { await askForParks() }
         .refreshable {
-            guard mode.canRefreshList else { return }
             await askForParks(refresh: true)
         }
         .toolbar {
@@ -71,16 +51,45 @@ struct ParksListScreen: View {
 
 extension ParksListScreen {
     enum Mode {
+        /// Площадки, где тренируется пользователь
         case usedBy(userID: Int)
+        /// Площадки, где тренируется пользователь, для создания мероприятия
         case event(userID: Int, didSelectPark: (_ id: Int, _ name: String) -> Void)
+        /// Площадки, добавленные пользователем
         case added(list: [Park])
+    }
+}
+
+extension ParksListScreen {
+    enum CurrentState: Equatable {
+        case initial
+        case loading
+        case ready([Park])
+        case error(ErrorKind)
+
+        var isLoading: Bool {
+            if case .loading = self { true } else { false }
+        }
+
+        /// Нужно ли загружать данные, когда их нет (или для рефреша)
+        var shouldLoad: Bool {
+            switch self {
+            case .initial, .error: true
+            case let .ready(parks): parks.isEmpty
+            case .loading: false
+            }
+        }
 
-        var canRefreshList: Bool {
+        var isReadyAndNotEmpty: Bool {
             switch self {
-            case .added: false
-            case .usedBy, .event: true
+            case let .ready(parks): !parks.isEmpty
+            default: false
             }
         }
+
+        var isReadyAndEmpty: Bool {
+            if case let .ready(parks) = self { parks.isEmpty } else { false }
+        }
     }
 }
 
@@ -95,6 +104,39 @@ private extension ParksListScreen.Mode {
 }
 
 private extension ParksListScreen {
+    @ViewBuilder
+    var contentView: some View {
+        switch currentState {
+        case let .ready(parks):
+            LazyVStack(spacing: 12) {
+                ForEach(parks) { park in
+                    Button {
+                        switch mode {
+                        case let .event(_, callBack):
+                            callBack(park.id, park.name ?? park.longTitle)
+                            dismiss()
+                        case .usedBy, .added:
+                            selectedPark = park
+                        }
+                    } label: {
+                        ParkRowView(
+                            imageURL: park.previewImageURL,
+                            title: park.longTitle,
+                            address: park.address,
+                            usersTrainHereText: park.usersTrainHereText
+                        )
+                    }
+                    .accessibilityIdentifier("ParkViewCell")
+                }
+            }
+            .padding([.top, .horizontal])
+        case let .error(errorKind):
+            CommonErrorView(errorKind: errorKind)
+        case .initial, .loading:
+            EmptyView()
+        }
+    }
+
     @ViewBuilder
     var refreshButtonIfNeeded: some View {
         if !DeviceOSVersionChecker.iOS16Available {
@@ -103,47 +145,45 @@ private extension ParksListScreen {
             } label: {
                 Icons.Regular.refresh.view
             }
-            .disabled(isLoading)
+            .disabled(currentState.isLoading)
         }
     }
 
     func askForParks(refresh: Bool = false) async {
-        if isLoading { return }
-        do {
-            switch mode {
-            case let .usedBy(userID), let .event(userID, _):
-                let isMainUser = userID == defaults.mainUserInfo?.id
-                let needUpdate = parks.isEmpty || refresh
-                if isMainUser {
-                    if !needUpdate, !defaults.needUpdateUser { return }
-                    try await makeList(for: userID, isMainUser, refresh)
+        switch mode {
+        case let .usedBy(userID), let .event(userID, _):
+            guard currentState.shouldLoad || refresh else { return }
+            guard isNetworkConnected else {
+                if currentState.isReadyAndNotEmpty {
+                    SWAlert.shared.presentNoConnection(false)
                 } else {
-                    if !needUpdate { return }
-                    try await makeList(for: userID, isMainUser, refresh)
+                    currentState = .error(.notConnected)
                 }
-            case let .added(list):
-                parks = list
+                return
             }
-        } catch {
-            SWAlert.shared.presentDefaultUIKit(error)
+            if !refresh {
+                currentState = .loading
+            }
+            do {
+                let parks = try await SWClient(with: defaults).getParksForUser(userID)
+                let isMainUser = userID == defaults.mainUserInfo?.id
+                if isMainUser { defaults.setUserNeedUpdate(false) }
+                currentState = .ready(parks)
+            } catch {
+                currentState = .error(.common(message: error.localizedDescription))
+            }
+        case let .added(list):
+            currentState = .ready(list)
         }
-        isLoading = false
-    }
-
-    func makeList(for userID: Int, _ isMainUser: Bool, _ isRefreshing: Bool) async throws {
-        if !isRefreshing { isLoading = true }
-        if isMainUser { defaults.setUserNeedUpdate(false) }
-        parks = try await SWClient(with: defaults).getParksForUser(userID)
     }
 
     func deletePark(id: Int) {
         selectedPark = nil
-        parks.removeAll(where: { $0.id == id })
+        guard case let .ready(parks) = currentState else { return }
         do {
             try parksManager.deletePark(with: id)
-            if !mode.canRefreshList {
-                dismiss()
-            }
+            let updatedParks = parks.filter { $0.id != id }
+            currentState = .ready(updatedParks)
         } catch {
             SWAlert.shared.presentDefaultUIKit(error)
         }

SwiftUI-WorkoutApp/Screens/Profile/BlackListScreen.swift

@@ -101,9 +101,7 @@ private extension BlackListScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }
 

SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalEntriesScreen.swift

@@ -125,9 +125,7 @@ private extension JournalEntriesScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }
 

SwiftUI-WorkoutApp/Screens/Profile/Journals/JournalsListScreen.swift

@@ -146,9 +146,7 @@ private extension JournalsListScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }
 

SwiftUI-WorkoutApp/Screens/Profile/MainUserFriendsListScreen.swift

@@ -97,9 +97,7 @@ private extension MainUserFriendsListScreen {
         case let .error(errorKind):
             CommonErrorView(errorKind: errorKind)
         case .initial, .loading:
-            ContainerRelativeView {
-                Text("Загрузка...")
-            }
+            EmptyView()
         }
     }