refactor: address review feedback

openedx · Nov 24, 2023 · 8b748c8 · 8b748c8
1 parent 8454926
commit 8b748c8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift b/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift
@@ -28,11 +28,12 @@ public struct LogistrationBottomView: View {
                 }
                 .frame(maxWidth: .infinity)
 
-                StyledButton(AuthLocalization.SignIn.logInTitle,
-                             action: { viewModel.router.showLoginScreen() },
-                             color: .white,
-                             textColor: Theme.Colors.accentColor,
-                             borderColor: Theme.Colors.textInputStroke
+                StyledButton(
+                    AuthLocalization.SignIn.logInTitle,
+                    action: { viewModel.router.showLoginScreen() },
+                    color: .white,
+                    textColor: Theme.Colors.accentColor,
+                    borderColor: Theme.Colors.textInputStroke
                 )
                 .frame(width: 100)
             }

diff --git a/Discovery/Discovery/Presentation/DiscoveryView.swift b/Discovery/Discovery/Presentation/DiscoveryView.swift
@@ -13,6 +13,7 @@ public struct DiscoveryView: View {
     @StateObject
     private var viewModel: DiscoveryViewModel
     private var router: DiscoveryRouter
+    @State private var searchQuery: String = ""
     @State private var isRefreshing: Bool = false
 
     private var fromStartupScreen: Bool = false
@@ -31,11 +32,16 @@ public struct DiscoveryView: View {
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(DiscoveryLocalization.Header.title1 + DiscoveryLocalization.Header.title2)
 
-    public init(viewModel: DiscoveryViewModel, router: DiscoveryRouter, searchQuery: String? = nil, fromStartupScreen: Bool = false) {
+    public init(
+        viewModel: DiscoveryViewModel,
+        router: DiscoveryRouter,
+        searchQuery: String? = nil,
+        fromStartupScreen: Bool = false
+    ) {
         self._viewModel = StateObject(wrappedValue: { viewModel }())
         self.router = router
         self.fromStartupScreen = fromStartupScreen
-        viewModel.searchQuery = searchQuery
+        self._searchQuery = State<String>(initialValue: searchQuery ?? "")
     }
 
     public var body: some View {
@@ -54,7 +60,7 @@ public struct DiscoveryView: View {
                     Spacer()
                 }
                 .onTapGesture {
-                    router.showDiscoverySearch(searchQuery: viewModel.searchQuery)
+                    router.showDiscoverySearch(searchQuery: searchQuery)
                     viewModel.discoverySearchBarClicked()
                 }
                 .frame(minHeight: 48)
@@ -68,7 +74,7 @@ public struct DiscoveryView: View {
                         .stroke(lineWidth: 1)
                         .fill(Theme.Colors.textInputUnfocusedStroke)
                 ).onTapGesture {
-                    router.showDiscoverySearch(searchQuery: viewModel.searchQuery)
+                    router.showDiscoverySearch(searchQuery: searchQuery)
                     viewModel.discoverySearchBarClicked()
                 }
                 .padding(.top, 11.5)
@@ -156,17 +162,15 @@ public struct DiscoveryView: View {
         }
         .navigationBarHidden(fromStartupScreen ? false : true)
         .onFirstAppear {
-            if !(viewModel.searchQuery?.isEmpty ?? true) {
-                router.showDiscoverySearch(searchQuery: viewModel.searchQuery)
+            if !(searchQuery.isEmpty) {
+                router.showDiscoverySearch(searchQuery: searchQuery)
+                searchQuery = ""
             }
             Task {
                 await viewModel.discovery(page: 1)
             }
             viewModel.setupNotifications()
         }
-        .onDisappear {
-            viewModel.searchQuery = ""
-        }
         .background(Theme.Colors.background.ignoresSafeArea())
     }
 }

diff --git a/Discovery/Discovery/Presentation/DiscoveryViewModel.swift b/Discovery/Discovery/Presentation/DiscoveryViewModel.swift
@@ -19,7 +19,6 @@ public class DiscoveryViewModel: ObservableObject {
 
     @Published var courses: [CourseItem] = []
     @Published var showError: Bool = false
-    @Published var searchQuery: String?
 
     var errorMessage: String? {
         didSet {

diff --git a/OpenEdX/Router.swift b/OpenEdX/Router.swift
@@ -89,7 +89,6 @@ public class Router: AuthorizationRouter,
     }
 
     public func showStartupScreen() {
-
         if let config = Container.shared.resolve(ConfigProtocol.self), config.features.startupScreenEnabled {
             let view = StartupView(viewModel: Container.shared.resolve(StartupViewModel.self)!)
             let controller = UIHostingController(rootView: view)