Bugfix/update loading overlay (#119)

* Работа в процессе

Поменял способ работы модификатора с лоадером - теперь через ZStack и if/else, чтобы не дрифтовал

* Работа в процессе

Прячу лишний лоадер при рефреше

* Поправил лоадер

* Мелкий рефактор

Author: easydev991

SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/LoadingOverlayModifier.swift

@@ -4,26 +4,26 @@ struct LoadingOverlayModifier: ViewModifier {
     let isLoading: Bool
 
     func body(content: Content) -> some View {
-        content
-            .disabled(isLoading)
-            .opacity(isLoading ? 0.5 : 1)
-            .animation(.default, value: isLoading)
-            .overlay {
-                LoadingIndicator(isVisible: isLoading)
+        ZStack {
+            if isLoading {
+                content.opacity(0.5)
+                LoadingIndicator()
+            } else {
+                content
             }
+        }
+        .disabled(isLoading)
+        .animation(.default, value: isLoading)
     }
 }
 
 private struct LoadingIndicator: View {
     @State private var isAnimating = false
-    let isVisible: Bool
 
     var body: some View {
         Image("LoadingIndicator", bundle: .module)
             .resizable()
             .frame(width: 50, height: 50)
-            .opacity(isVisible ? 1 : 0)
-            .animation(.default, value: isVisible)
             .rotationEffect(Angle(degrees: isAnimating ? 360 : 0))
             .animation(
                 .linear(duration: 2.0).repeatForever(autoreverses: false),

SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift

@@ -150,7 +150,7 @@ private extension EventsListView {
     }
 
     var showEmptyView: Bool {
-        selectedEventType == .future && viewModel.futureEvents.isEmpty
+        selectedEventType == .future && viewModel.futureEvents.isEmpty && !viewModel.isLoading
     }
 
     func selectedEventAction(_: EventType) {

SwiftUI-WorkoutApp/Screens/Journals/JournalsList/JournalsListView.swift

@@ -116,7 +116,7 @@ private extension JournalsListView {
     }
 
     var showEmptyView: Bool {
-        viewModel.list.isEmpty && isMainUser
+        viewModel.list.isEmpty && isMainUser && !viewModel.isLoading
     }
 
     var isMainUser: Bool {

SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListView.swift

@@ -85,7 +85,7 @@ private extension DialogListView {
     }
 
     var showEmptyView: Bool {
-        viewModel.list.isEmpty
+        viewModel.list.isEmpty && !viewModel.isLoading
     }
 
     var emptyViewButtonTitle: String {

SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListViewModel.swift

@@ -9,15 +9,15 @@ final class DialogListViewModel: ObservableObject {
 
     func makeItems(with defaults: DefaultsService, refresh: Bool) async {
         if isLoading || (!list.isEmpty && !refresh) { return }
-        isLoading.toggle()
+        if !refresh { isLoading.toggle() }
         do {
             list = try await APIService(with: defaults).getDialogs()
             let unreadMessagesCount = list.map(\.unreadMessagesCount).reduce(0, +)
             defaults.saveUnreadMessagesCount(unreadMessagesCount)
         } catch {
             errorMessage = ErrorFilterService.message(from: error)
         }
-        isLoading.toggle()
+        if !refresh { isLoading.toggle() }
     }
 
     func deleteDialog(at index: Int?, with defaults: DefaultsProtocol) async {

SwiftUI-WorkoutApp/Screens/SportsGrounds/List/SportsGroundListViewModel.swift

@@ -15,14 +15,14 @@ final class SportsGroundListViewModel: ObservableObject {
             let needUpdate = list.isEmpty || refresh
             if isMainUser {
                 if !needUpdate, !defaults.needUpdateUser { return }
-                isLoading.toggle()
+                if !refresh { isLoading.toggle() }
                 await makeList(for: userID, with: defaults)
             } else {
                 if !needUpdate { return }
-                isLoading.toggle()
+                if !refresh { isLoading.toggle() }
                 await makeList(for: userID, with: defaults)
             }
-            isLoading.toggle()
+            if !refresh { isLoading.toggle() }
         case let .added(list):
             self.list = list
         }