Merge pull request #103 from OlegEremenko991/feature/update-loadingoverlay

easydev991 · web-flow · commit 48ae98e84119 · 2023-09-09T15:42:23.000+03:00
Обновил индикатор загрузки и сделал небольшой рефактор
diff --git a/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/LoadingOverlayModifier.swift b/SwiftUI-WorkoutApp/DesignSystem/Sources/DesignSystem/ViewModifiers/LoadingOverlayModifier.swift
@@ -1,40 +1,39 @@
 import SwiftUI
 
 struct LoadingOverlayModifier: ViewModifier {
-    @State private var angle: CGFloat = 0
-    @State private var isAnimating = false
-    private var foreverAnimation: Animation {
-        Animation.linear(duration: 2.0)
-            .repeatForever(autoreverses: false)
-    }
-
     let isLoading: Bool
 
     func body(content: Content) -> some View {
         content
             .disabled(isLoading)
             .opacity(isLoading ? 0.5 : 1)
             .overlay {
-                Image("LoadingIndicator", bundle: .module)
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 50, height: 50)
-                    .opacity(isLoading ? 1 : 0)
-                    .rotationEffect(.degrees(isAnimating ? angle : 0))
-                    .onChange(of: isLoading) { [isLoading] newValue in
-                        switch (isLoading, newValue) {
-                        case (false, true):
-                            isAnimating = true
-                            withAnimation(foreverAnimation) { angle += 360 }
-                        default: break
-                        }
-                    }
+                LoadingIndicator(isVisible: 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)
+            .rotationEffect(Angle(degrees: isAnimating ? 360 : 0))
+            .animation(
+                .linear(duration: 2.0).repeatForever(autoreverses: false),
+                value: isAnimating
+            )
+            .onAppear { isAnimating = true }
+            .opacity(isVisible ? 1 : 0)
+    }
+}
+
 public extension View {
+    /// Добавляет в оверлей индикатор загрузки
     func loadingOverlay(if isLoading: Bool) -> some View {
         modifier(LoadingOverlayModifier(isLoading: isLoading))
     }
diff --git a/SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift b/SwiftUI-WorkoutApp/Screens/Events/List/EventsListView.swift
@@ -20,20 +20,17 @@ struct EventsListView: View {
         NavigationView {
             VStack {
                 segmentedControl
-                if showEmptyView {
-                    emptyView
-                } else {
-                    eventsList
-                }
+                eventsList
+                    .overlay { emptyView }
             }
+            .loadingOverlay(if: viewModel.isLoading)
+            .background(Color.swBackground)
             .alert("Необходимо выбрать площадку", isPresented: $showEventCreationRule) {
                 Button(action: createEventIfAvailable) { Text("Перейти на карту") }
                 Button(role: .cancel, action: {}, label: { Text("Понятно") })
             } message: {
                 Text(Constants.Alert.eventCreationRule)
             }
-            .loadingOverlay(if: viewModel.isLoading)
-            .background(Color.swBackground)
             .alert(alertMessage, isPresented: $showErrorAlert) {
                 Button("Ok", action: closeAlert)
             }
diff --git a/SwiftUI-WorkoutApp/Screens/Journals/JournalsList/JournalsListView.swift b/SwiftUI-WorkoutApp/Screens/Journals/JournalsList/JournalsListView.swift
@@ -24,37 +24,32 @@ struct JournalsListView: View {
     }
 
     var body: some View {
-        Group {
-            if viewModel.list.isEmpty {
-                emptyContentView
-            } else {
-                journalsList
+        journalsList
+            .overlay { emptyContentView }
+            .loadingOverlay(if: viewModel.isLoading)
+            .background(Color.swBackground)
+            .confirmationDialog(
+                Constants.Alert.deleteJournal,
+                isPresented: $showDeleteDialog,
+                titleVisibility: .visible
+            ) { deleteJournalButton }
+            .onChange(of: viewModel.errorMessage, perform: setupErrorAlert)
+            .onChange(of: viewModel.isJournalCreated, perform: closeSheet)
+            .sheet(isPresented: $isCreatingJournal) { newJournalSheet }
+            .alert(errorTitle, isPresented: $showErrorAlert) {
+                Button("Ok", action: closeAlert)
             }
-        }
-        .loadingOverlay(if: viewModel.isLoading)
-        .background(Color.swBackground)
-        .confirmationDialog(
-            Constants.Alert.deleteJournal,
-            isPresented: $showDeleteDialog,
-            titleVisibility: .visible
-        ) { deleteJournalButton }
-        .onChange(of: viewModel.errorMessage, perform: setupErrorAlert)
-        .onChange(of: viewModel.isJournalCreated, perform: closeSheet)
-        .sheet(isPresented: $isCreatingJournal) { newJournalSheet }
-        .alert(errorTitle, isPresented: $showErrorAlert) {
-            Button("Ok", action: closeAlert)
-        }
-        .task { await askForJournals() }
-        .refreshable { await askForJournals(refresh: true) }
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                refreshButton
-            }
-            ToolbarItem(placement: .navigationBarTrailing) {
-                addJournalButton
+            .task { await askForJournals() }
+            .refreshable { await askForJournals(refresh: true) }
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    refreshButton
+                }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    addJournalButton
+                }
             }
-        }
-        .onDisappear(perform: cancelTasks)
+            .onDisappear(perform: cancelTasks)
     }
 }
 
@@ -93,7 +88,6 @@ private extension JournalsListView {
             action: showNewJournalSheet
         )
         .opacity(showEmptyView ? 1 : 0)
-        .disabled(viewModel.isLoading)
     }
 
     var journalsList: some View {
@@ -118,9 +112,6 @@ private extension JournalsListView {
             .padding([.top, .horizontal])
         }
         .sheet(item: $journalToEdit, content: showSettingsSheet)
-        .opacity(viewModel.isLoading ? 0.5 : 1)
-        .animation(.default, value: viewModel.isLoading)
-        .disabled(viewModel.isLoading)
     }
 
     var showEmptyView: Bool {
diff --git a/SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListView.swift b/SwiftUI-WorkoutApp/Screens/Messages/DialogList/DialogListView.swift
@@ -17,35 +17,30 @@ struct DialogListView: View {
     @State private var deleteDialogTask: Task<Void, Never>?
 
     var body: some View {
-        Group {
-            if viewModel.list.isEmpty {
-                emptyContentView
-            } else {
-                dialogList
-            }
-        }
-        .loadingOverlay(if: viewModel.isLoading)
-        .background(Color.swBackground)
-        .confirmationDialog(
-            Constants.Alert.deleteDialog,
-            isPresented: $showDeleteConfirmation,
-            titleVisibility: .visible
-        ) { deleteDialogButton }
-        .onChange(of: viewModel.errorMessage, perform: setupErrorAlert)
-        .alert(errorTitle, isPresented: $showErrorAlert) {
-            Button("Ok", action: closeAlert)
-        }
-        .task { await askForDialogs() }
-        .refreshable { await askForDialogs(refresh: true) }
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                refreshButton
+        dialogList
+            .overlay { emptyContentView }
+            .loadingOverlay(if: viewModel.isLoading)
+            .background(Color.swBackground)
+            .confirmationDialog(
+                Constants.Alert.deleteDialog,
+                isPresented: $showDeleteConfirmation,
+                titleVisibility: .visible
+            ) { deleteDialogButton }
+            .onChange(of: viewModel.errorMessage, perform: setupErrorAlert)
+            .alert(errorTitle, isPresented: $showErrorAlert) {
+                Button("Ok", action: closeAlert)
             }
-            ToolbarItem(placement: .navigationBarTrailing) {
-                friendListButton
+            .task { await askForDialogs() }
+            .refreshable { await askForDialogs(refresh: true) }
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    refreshButton
+                }
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    friendListButton
+                }
             }
-        }
-        .onDisappear(perform: cancelTasks)
+            .onDisappear(perform: cancelTasks)
     }
 }
 
@@ -126,9 +121,6 @@ private extension DialogListView {
             }
             .padding([.top, .horizontal])
         }
-        .opacity(viewModel.isLoading ? 0.5 : 1)
-        .animation(.default, value: viewModel.isLoading)
-        .disabled(viewModel.isLoading)
     }
 
     var deleteDialogButton: some View {
diff --git a/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift b/SwiftUI-WorkoutApp/Screens/SportsGrounds/Map/SportsGroundsMapView.swift
@@ -116,7 +116,6 @@ private extension SportsGroundsMapView {
                 }
                 .padding([.top, .horizontal])
             }
-            .opacity(viewModel.isLoading ? 0.5 : 1)
         case .map:
             MapViewUI(
                 "SportsGroundsMapView",
@@ -127,7 +126,7 @@ private extension SportsGroundsMapView {
                 $viewModel.needUpdateRegion,
                 openDetailsClbk: openDetailsView
             )
-            .opacity(mapOpacity)
+            .opacity(viewModel.shouldHideMap ? 0 : 1)
             .overlay(alignment: viewModel.isRegionSet ? .bottom : .center) {
                 NavigationLink(isActive: $showDetailsView) {
                     SportsGroundDetailView(
@@ -147,11 +146,6 @@ private extension SportsGroundsMapView {
         }
     }
 
-    var mapOpacity: Double {
-        guard !viewModel.shouldHideMap else { return .zero }
-        return viewModel.isLoading ? 0.5 : 1
-    }
-
     var locationSettingsReminder: some View {
         VStack(spacing: 12) {
             Text(viewModel.locationErrorMessage)

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ private extension SportsGroundsMapView {`
`116`	`116`	`}`
`117`	`117`	`.padding([.top, .horizontal])`
`118`	`118`	`}`
`119`		`- .opacity(viewModel.isLoading ? 0.5 : 1)`
`120`	`119`	`case .map:`
`121`	`120`	`MapViewUI(`
`122`	`121`	`"SportsGroundsMapView",`
`@@ -127,7 +126,7 @@ private extension SportsGroundsMapView {`
`127`	`126`	`$viewModel.needUpdateRegion,`
`128`	`127`	`openDetailsClbk: openDetailsView`
`129`	`128`	`)`
`130`		`- .opacity(mapOpacity)`
	`129`	`+ .opacity(viewModel.shouldHideMap ? 0 : 1)`
`131`	`130`	`.overlay(alignment: viewModel.isRegionSet ? .bottom : .center) {`
`132`	`131`	`NavigationLink(isActive: $showDetailsView) {`
`133`	`132`	`SportsGroundDetailView(`
`@@ -147,11 +146,6 @@ private extension SportsGroundsMapView {`
`147`	`146`	`}`
`148`	`147`	`}`
`149`	`148`
`150`		`- var mapOpacity: Double {`
`151`		`- guard !viewModel.shouldHideMap else { return .zero }`
`152`		`- return viewModel.isLoading ? 0.5 : 1`
`153`		`- }`
`154`		`-`
`155`	`149`	`var locationSettingsReminder: some View {`
`156`	`150`	`VStack(spacing: 12) {`
`157`	`151`	`Text(viewModel.locationErrorMessage)`