Fixed #6 + some imporvements

oolxg · Jul 12, 2023 · c038c91 · c038c91
1 parent 306a46b
commit c038c91
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/Hanami/App/Core/Search/Filter/FiltersFeature.swift b/Hanami/App/Core/Search/Filter/FiltersFeature.swift
@@ -115,29 +115,40 @@ struct FiltersFeature: ReducerProtocol {
 
             return .none
 
-        case .mangaStatusButtonTapped(let tag):
-            if tag.state == .selected {
-                state.mangaStatuses[id: tag.id]!.state = .notSelected
+        case .mangaStatusButtonTapped(let tagContainer):
+            if tagContainer.state == .selected {
+                state.mangaStatuses[id: tagContainer.id]!.state = .notSelected
             } else {
-                state.mangaStatuses[id: tag.id]!.state = .selected
+                state.mangaStatuses[id: tagContainer.id]!.state = .selected
             }
 
             return hapticClient.generateFeedback(.light).fireAndForget()
 
-        case .contentRatingButtonTapped(let tag):
-            if tag.state == .selected {
-                state.contentRatings[id: tag.id]!.state = .notSelected
+        case .contentRatingButtonTapped(let tagContainer):
+            if tagContainer.state == .selected {
+                state.contentRatings[id: tagContainer.id]!.state = .notSelected
             } else {
-                state.contentRatings[id: tag.id]!.state = .selected
+                state.contentRatings[id: tagContainer.id]!.state = .selected
+            }
+
+            // setting all tags to notSelected when user tapped on `safe`
+            if tagContainer.tag == .safe && tagContainer.state != .selected {
+                for tagID in state.contentRatings.ids {
+                    state.contentRatings[id: tagID]!.state = .notSelected
+                }
+                state.contentRatings[id: tagContainer.id]!.state = .selected
+            } else {
+                let safeTagID = state.contentRatings.first(where: { $0.tag == .safe })!.id
+                state.contentRatings[id: safeTagID]!.state = .notSelected
             }
 
             return hapticClient.generateFeedback(.light).fireAndForget()
 
-        case .publicationDemographicButtonTapped(let tag):
-            if tag.state == .selected {
-                state.publicationDemographics[id: tag.id]!.state = .notSelected
+        case .publicationDemographicButtonTapped(let tagContainer):
+            if tagContainer.state == .selected {
+                state.publicationDemographics[id: tagContainer.id]!.state = .notSelected
             } else {
-                state.publicationDemographics[id: tag.id]!.state = .selected
+                state.publicationDemographics[id: tagContainer.id]!.state = .selected
             }
 
             return hapticClient.generateFeedback(.light).fireAndForget()

diff --git a/Hanami/Tools/Defaults.swift b/Hanami/Tools/Defaults.swift
@@ -41,13 +41,13 @@ enum Defaults {
     }
 
     enum Feedback {
-        static var feedbackDomain: URL? {
+        static let apiURL: URL? = {
             if AppUtil.appConfiguration != .debug, var urlString = Bundle.main.infoDictionary?["API_URL"] as? String {
                 urlString = "https://" + urlString
                 return URL(string: urlString)
             }
 
             return nil
-        }
+        }()
     }
 }