feat: added login and register capebility in discovery for pre login …

…exploration
openedx · Dec 11, 2023 · 57529b6 · 57529b6
1 parent e7eb4c8
commit 57529b6
Show file tree

Hide file tree

Showing 24 changed files with 596 additions and 446 deletions.
diff --git a/Authorization/Authorization/Presentation/Login/SignInView.swift b/Authorization/Authorization/Presentation/Login/SignInView.swift
@@ -102,7 +102,7 @@ public struct SignInView: View {
                                 if !viewModel.config.features.startupScreenEnabled {
                                     Button(AuthLocalization.SignIn.registerBtn) {
                                         viewModel.trackSignUpClicked()
-                                        viewModel.router.showRegisterScreen()
+                                        viewModel.router.showRegisterScreen(sourceScreen: viewModel.sourceScreen)
                                     }.foregroundColor(Theme.Colors.accentColor)
 
                                     Spacer()

diff --git a/Authorization/Authorization/Presentation/Login/SignInViewModel.swift b/Authorization/Authorization/Presentation/Login/SignInViewModel.swift
@@ -19,6 +19,8 @@ public class SignInViewModel: ObservableObject {
     @Published private(set) var isShowProgress = false
     @Published private(set) var showError: Bool = false
     @Published private(set) var showAlert: Bool = false
+    public var sourceScreen: LogistrationSourceScreen = .default
+
     var errorMessage: String? {
         didSet {
             withAnimation {
@@ -77,7 +79,7 @@ public class SignInViewModel: ObservableObject {
             let user = try await interactor.login(username: username, password: password)
             analytics.setUserID("\(user.id)")
             analytics.userLogin(method: .password)
-            router.showMainOrWhatsNewScreen()
+            router.showMainOrWhatsNewScreen(sourceScreen: sourceScreen)
         } catch let error {
             failure(error)
         }
@@ -108,7 +110,7 @@ public class SignInViewModel: ObservableObject {
             let user = try await interactor.login(externalToken: externalToken, backend: backend)
             analytics.setUserID("\(user.id)")
             analytics.userLogin(method: authMethod)
-            router.showMainOrWhatsNewScreen()
+            router.showMainOrWhatsNewScreen(sourceScreen: sourceScreen)
         } catch let error {
             failure(error, authMethod: authMethod)
         }

diff --git a/Authorization/Authorization/Presentation/Registration/SignUpViewModel.swift b/Authorization/Authorization/Presentation/Registration/SignUpViewModel.swift
@@ -19,6 +19,8 @@ public class SignUpViewModel: ObservableObject {
     @Published var scrollTo: Int?
     @Published var showError: Bool = false
     @Published var thirdPartyAuthSuccess: Bool = false
+    public var sourceScreen: LogistrationSourceScreen = .default
+
     var errorMessage: String? {
         didSet {
             withAnimation {
@@ -114,7 +116,7 @@ public class SignUpViewModel: ObservableObject {
             analytics.setUserID("\(user.id)")
             analytics.registrationSuccess()
             isShowProgress = false
-            router.showMainOrWhatsNewScreen()
+            router.showMainOrWhatsNewScreen(sourceScreen: sourceScreen)
 
         } catch let error {
             isShowProgress = false
@@ -171,7 +173,7 @@ public class SignUpViewModel: ObservableObject {
             analytics.setUserID("\(user.id)")
             analytics.userLogin(method: authMethod)
             isShowProgress = false
-            router.showMainOrWhatsNewScreen()
+            router.showMainOrWhatsNewScreen(sourceScreen: sourceScreen)
         } catch {
             update(fullName: response.name, email: response.email)
             self.externalToken = response.token

diff --git a/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift b/Authorization/Authorization/Presentation/Startup/LogistrationBottomView.swift
@@ -13,25 +13,27 @@ import Theme
 public struct LogistrationBottomView: View {
     @ObservedObject
     private var viewModel: StartupViewModel
+    private var sourceScreen: LogistrationSourceScreen
 
     @Environment(\.isHorizontal) private var isHorizontal
 
-    public init(viewModel: StartupViewModel) {
+    public init(viewModel: StartupViewModel, sourceScreen: LogistrationSourceScreen) {
         self.viewModel = viewModel
+        self.sourceScreen = sourceScreen
     }
 
     public var body: some View {
         VStack(alignment: .leading) {
             HStack(spacing: 24) {
                 StyledButton(AuthLocalization.SignIn.registerBtn) {
-                    viewModel.router.showRegisterScreen()
+                    viewModel.router.showRegisterScreen(sourceScreen: sourceScreen)
                     viewModel.tracksignUpClicked()
                 }
                 .frame(maxWidth: .infinity)
 
                 StyledButton(
                     AuthLocalization.SignIn.logInTitle,
-                    action: { viewModel.router.showLoginScreen() },
+                    action: { viewModel.router.showLoginScreen(sourceScreen: sourceScreen) },
                     color: .white,
                     textColor: Theme.Colors.accentColor,
                     borderColor: Theme.Colors.textInputStroke
@@ -52,12 +54,12 @@ struct LogistrationBottomView_Previews: PreviewProvider {
             router: AuthorizationRouterMock(),
             analytics: AuthorizationAnalyticsMock()
         )
-        LogistrationBottomView(viewModel: vm)
+        LogistrationBottomView(viewModel: vm, sourceScreen: .startup)
             .preferredColorScheme(.light)
             .previewDisplayName("StartupView Light")
             .loadFonts()
 
-        LogistrationBottomView(viewModel: vm)
+        LogistrationBottomView(viewModel: vm, sourceScreen: .startup)
             .preferredColorScheme(.dark)
             .previewDisplayName("StartupView Dark")
             .loadFonts()

diff --git a/Authorization/Authorization/Presentation/Startup/StartupView.swift b/Authorization/Authorization/Presentation/Startup/StartupView.swift
@@ -53,7 +53,10 @@ public struct StartupView: View {
                                 .padding(.top, 1)
                             TextField(AuthLocalization.Startup.searchPlaceholder, text: $searchQuery, onCommit: {
                                 if searchQuery.isEmpty { return }
-                                viewModel.router.showDiscoveryScreen(searchQuery: searchQuery, fromStartupScreen: true)
+                                viewModel.router.showDiscoveryScreen(
+                                    searchQuery: searchQuery,
+                                    sourceScreen: LogistrationSourceScreen.startup
+                                )
                             })
                             .autocapitalization(.none)
                             .autocorrectionDisabled()
@@ -71,7 +74,10 @@ public struct StartupView: View {
                         )
 
                         Button {
-                            viewModel.router.showDiscoveryScreen(searchQuery: searchQuery, fromStartupScreen: true)
+                            viewModel.router.showDiscoveryScreen (
+                                searchQuery: searchQuery,
+                                sourceScreen: LogistrationSourceScreen.startup
+                            )
                         } label: {
                             Text(AuthLocalization.Startup.exploreAllCourses)
                                 .underline()
@@ -83,7 +89,7 @@ public struct StartupView: View {
                     }
                     .padding(.horizontal, isHorizontal ? 10 : 24)
 
-                    LogistrationBottomView(viewModel: viewModel)
+                    LogistrationBottomView(viewModel: viewModel, sourceScreen: .startup)
                 }
                 .padding(.top, 10)
                 .padding(.bottom, 2)