Merge pull request #88 from OlegEremenko991/refactor

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

Author: easydev991

SwiftUI-WorkoutApp/Screens/Common/SportsGroundLocation/MapSnapshotView.swift

@@ -10,7 +10,7 @@ struct MapSnapshotView: View {
 
     var body: some View {
         GeometryReader { geometry in
-            contentView(placeholderSize: geometry.size)
+            contentView
                 .animation(.easeInOut, value: snapshotImage)
                 .onAppear {
                     generateSnapshot(for: geometry.size)
@@ -23,8 +23,7 @@ struct MapSnapshotView: View {
 }
 
 private extension MapSnapshotView {
-    @ViewBuilder
-    func contentView(placeholderSize _: CGSize) -> some View {
+    var contentView: some View {
         ZStack {
             if let image = snapshotImage {
                 Image(uiImage: image)

SwiftUI-WorkoutApp/Screens/Common/TextEntry/TextEntryView.swift

@@ -117,9 +117,11 @@ private extension TextEntryView {
         isFocused.toggle()
     }
 
-    func dismissOnSuccess(isSuccess _: Bool) {
-        refreshClbk()
-        dismiss()
+    func dismissOnSuccess(isSuccess: Bool) {
+        if isSuccess {
+            refreshClbk()
+            dismiss()
+        }
     }
 
     func closeAlert() {

SwiftUI-WorkoutApp/Screens/Events/Form/EventFormView.swift

@@ -182,9 +182,11 @@ private extension EventFormView {
         viewModel.clearErrorMessage()
     }
 
-    func dismiss(isSuccess _: Bool) {
-        refreshClbk?()
-        dismiss()
+    func dismiss(isSuccess: Bool) {
+        if isSuccess {
+            refreshClbk?()
+            dismiss()
+        }
     }
 
     func cancelTask() {

SwiftUI-WorkoutApp/Screens/Journals/EntriesList/JournalEntriesList.swift

@@ -152,8 +152,10 @@ private extension JournalEntriesList {
         errorTitle = message
     }
 
-    func closeNewEntrySheet(isSuccess _: Bool) {
-        showEntrySheet.toggle()
+    func closeNewEntrySheet(isSuccess: Bool) {
+        if isSuccess {
+            showEntrySheet.toggle()
+        }
     }
 
     func closeAlert() {

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

@@ -192,9 +192,11 @@ private extension JournalsListView {
         showDeleteDialog.toggle()
     }
 
-    func closeSheet(isSuccess _: Bool) {
-        isCreatingJournal.toggle()
-        defaults.setUserNeedUpdate(true)
+    func closeSheet(isSuccess: Bool) {
+        if isSuccess {
+            isCreatingJournal.toggle()
+            defaults.setUserNeedUpdate(true)
+        }
     }
 
     func setupErrorAlert(with message: String) {

SwiftUI-WorkoutApp/Screens/Journals/Settings/JournalSettingsView.swift

@@ -115,9 +115,11 @@ private extension JournalSettingsView {
         viewModel.clearErrorMessage()
     }
 
-    func finishSettings(isSuccess _: Bool) {
-        updateOnSuccess(journal.id)
-        dismiss()
+    func finishSettings(isSuccess: Bool) {
+        if isSuccess {
+            updateOnSuccess(journal.id)
+            dismiss()
+        }
     }
 
     func cancelTask() {

SwiftUI-WorkoutApp/Screens/Profile/SearchUsers/SearchUsersView.swift

@@ -47,7 +47,7 @@ struct SearchUsersView: View {
             content: messageSheet
         )
         .alert(errorMessage, isPresented: $showErrorAlert) {
-            Button("Ok", action: closeAlert)
+            Button("Ok", action: onCloseAlert)
         }
         .onChange(of: errorMessage, perform: setupErrorAlert)
         .onChange(of: messagingViewModel.errorMessage, perform: setupErrorAlert)
@@ -105,7 +105,7 @@ private extension SearchUsersView {
             sendAction: { sendMessage(to: recipient.id) },
             showErrorAlert: $showErrorAlert,
             errorTitle: $errorMessage,
-            dismissError: closeAlert
+            dismissError: onCloseAlert
         )
     }
 
@@ -145,7 +145,7 @@ private extension SearchUsersView {
         errorMessage = message
     }
 
-    func closeAlert() {
+    func onCloseAlert() {
         errorMessage = ""
         messagingViewModel.clearErrorMessage()
     }

SwiftUI-WorkoutApp/Screens/Profile/Settings/ChangePasswordView.swift

@@ -34,7 +34,7 @@ struct ChangePasswordView: View {
         .loadingOverlay(if: isLoading)
         .background(Color.swBackground)
         .alert(errorMessage, isPresented: $showErrorAlert) {
-            Button("Ok", action: clearErrorMessage)
+            Button("Ok") { errorMessage = "" }
         }
         .onChange(of: isChangeSuccessful, perform: performLogout)
         .onChange(of: errorMessage, perform: setupErrorAlert)
@@ -154,10 +154,6 @@ private extension ChangePasswordView {
         }
     }
 
-    func clearErrorMessage() {
-        errorMessage = ""
-    }
-
     func performLogout(needRelogin: Bool) {
         if needRelogin {
             defaults.triggerLogout()

SwiftUI-WorkoutApp/Screens/Profile/Settings/LoginView.swift

@@ -34,7 +34,7 @@ struct LoginView: View {
         .padding([.horizontal, .bottom])
         .loadingOverlay(if: isLoading)
         .background(Color.swBackground)
-        .onChange(of: credentials, perform: clearErrorMessage)
+        .onChange(of: credentials) { _ in errorMessage = "" }
         .alert(Constants.Alert.resetSuccessful, isPresented: $showResetSuccessfulAlert) {
             Button("Ok") { showResetSuccessfulAlert = false }
         }
@@ -148,10 +148,6 @@ private extension LoginView {
         focus = credentials.canRestorePassword ? nil : .username
     }
 
-    func clearErrorMessage(_: Credentials) {
-        errorMessage = ""
-    }
-
     func cancelTasks() {
         [loginTask, resetPasswordTask].forEach { $0?.cancel() }
     }