sensory feedback updates (#68)

erolburak · Feb 1, 2024 · e205311 · e205311
1 parent 307d688
commit e205311
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/BobbysNews/Presentation/ContentView.swift b/BobbysNews/Presentation/ContentView.swift
@@ -170,10 +170,8 @@ struct ContentView: View {
 		.onChange(of: viewModel.selectedCountry) { _, newValue in
 			country = newValue
 		}
-		.sensoryFeedback(viewModel.sensoryFeedback,
-						 trigger: viewModel.sensoryFeedbackTrigger) { _, newValue in
-			viewModel.sensoryFeedbackTrigger = false
-			return newValue == true
+		.sensoryFeedback(trigger: viewModel.sensoryFeedbackBool) { _, _ in
+			viewModel.sensoryFeedback
 		}
     }
 

diff --git a/BobbysNews/Presentation/ContentViewModel.swift b/BobbysNews/Presentation/ContentViewModel.swift
@@ -45,7 +45,7 @@ class ContentViewModel {
 	var apiKeyTotalAmount = 5
 	var apiKeyVersion = 1 {
 		didSet {
-			sensoryFeedback(feedback: .selection)
+			sensoryFeedbackTrigger(feedback: .selection)
 		}
 	}
 	var articles: [Article]?
@@ -61,12 +61,12 @@ class ContentViewModel {
 		}
 		willSet {
 			if !newValue.isEmpty {
-				sensoryFeedback(feedback: .selection)
+				sensoryFeedbackTrigger(feedback: .selection)
 			}
 		}
 	}
-	var sensoryFeedback: SensoryFeedback = .success
-	var sensoryFeedbackTrigger = false
+	var sensoryFeedback: SensoryFeedback?
+	var sensoryFeedbackBool = false
 	var showAlert = false
 	var showConfirmationDialog = false
 	var stateSources: StateSources = .isLoading
@@ -147,7 +147,7 @@ class ContentViewModel {
 				.delete(country: selectedCountry)
 			articles = nil
 			stateTopHeadlines = .emptyRead
-			sensoryFeedback(feedback: .success)
+			sensoryFeedbackTrigger(feedback: .success)
 		} catch {
 			showAlert(error: .reset)
 		}
@@ -195,15 +195,15 @@ class ContentViewModel {
 			.store(in: &cancellable)
 	}
 
-	private func sensoryFeedback(feedback: SensoryFeedback) {
+	private func sensoryFeedbackTrigger(feedback: SensoryFeedback) {
 		sensoryFeedback = feedback
-		sensoryFeedbackTrigger = true
+		sensoryFeedbackBool.toggle()
 	}
 
 	private func showAlert(error: Errors) {
 		alertError = error
 		showAlert = true
-		sensoryFeedback(feedback: .error)
+		sensoryFeedbackTrigger(feedback: .error)
 	}
 
 	private func updateStateSources(completion: Subscribers.Completion<Error>,