Migrate welcome screen presenter to shared features (#398)

* Migrate welcome screen presenter to shared features

* Add more tests for welcome presenter

* Delete old welcome screen

Author: newmskywalker

android/app-newm/src/main/java/io/newm/LoginActivity.kt

@@ -28,16 +28,12 @@ import com.slack.circuit.runtime.presenter.Presenter
 import com.slack.circuit.runtime.ui.Ui
 import io.newm.core.theme.NewmTheme
 import io.newm.core.ui.LocalSnackBarHostState
-import io.newm.feature.login.screen.createaccount.CreateAccountScreen
 import io.newm.feature.login.screen.createaccount.CreateAccountScreenPresenter
 import io.newm.feature.login.screen.createaccount.CreateAccountUi
 import io.newm.feature.login.screen.createaccount.CreateAccountUiState
 import io.newm.feature.login.screen.resetpassword.ResetPasswordScreenPresenter
 import io.newm.feature.login.screen.resetpassword.ResetPasswordScreenUi
 import io.newm.feature.login.screen.resetpassword.ResetPasswordScreenUiState
-import io.newm.feature.login.screen.welcome.WelcomeScreenPresenter
-import io.newm.feature.login.screen.welcome.WelcomeScreenUi
-import io.newm.feature.login.screen.welcome.WelcomeScreenUiState
 import io.newm.screens.forceupdate.ForceAppUpdateState
 import io.newm.screens.forceupdate.ForceAppUpdateUi
 import io.newm.screens.forceupdate.openAppPlayStore
@@ -50,11 +46,14 @@ import io.newm.sharedfeatures.devmenu.FeatureFlagsListPresenter
 import io.newm.sharedfeatures.devmenu.FeatureFlagsListUi
 import io.newm.sharedfeatures.login.LoginPresenter
 import io.newm.sharedfeatures.login.LoginUi
+import io.newm.sharedfeatures.screens.CreateAccountScreen
 import io.newm.sharedfeatures.screens.DevMenuMainScreen
 import io.newm.sharedfeatures.screens.FeatureFlagsListScreen
 import io.newm.sharedfeatures.screens.LoginScreen
 import io.newm.sharedfeatures.screens.ResetPasswordScreen
 import io.newm.sharedfeatures.screens.WelcomeScreen
+import io.newm.sharedfeatures.welcome.WelcomePresenter
+import io.newm.sharedfeatures.welcome.WelcomeUi
 import io.newm.utils.DynamicStatusBarSideEffect
 import io.newm.utils.ForceAppUpdateViewModel
 import io.newm.utils.ui
@@ -77,7 +76,7 @@ class LoginActivity : ComponentActivity() {
         Presenter.Factory { screen, navigator, _ ->
             when (screen) {
                 is CreateAccountScreen -> inject<CreateAccountScreenPresenter> { parametersOf(::launchHomeActivity) }.value
-                is WelcomeScreen -> inject<WelcomeScreenPresenter> { parametersOf(navigator) }.value
+                is WelcomeScreen -> inject<WelcomePresenter> { parametersOf(navigator) }.value
                 is LoginScreen -> inject<LoginPresenter> { parametersOf(navigator) }.value
                 is ResetPasswordScreen -> inject<ResetPasswordScreenPresenter> {
                     parametersOf(
@@ -103,8 +102,8 @@ class LoginActivity : ComponentActivity() {
                     CreateAccountUi(state, modifier)
                 }
 
-                is WelcomeScreen -> ui<WelcomeScreenUiState> { state, modifier ->
-                    WelcomeScreenUi(modifier, state)
+                is WelcomeScreen -> ui<WelcomeScreen.UiState> { state, modifier ->
+                    WelcomeUi(state, modifier)
                 }
 
                 is LoginScreen -> ui<LoginScreen.UiState> { state, modifier ->

android/app-newm/src/main/java/io/newm/di/android/Dependencies.kt

@@ -14,11 +14,8 @@ import com.google.android.gms.common.Scopes
 import com.google.android.gms.common.api.Scope
 import io.newm.Logout
 import io.newm.RestartApp
-import io.newm.feature.login.screen.authproviders.google.GoogleSignInLauncher
-import io.newm.feature.login.screen.authproviders.google.GoogleSignInLauncherImpl
 import io.newm.feature.login.screen.createaccount.CreateAccountScreenPresenter
 import io.newm.feature.login.screen.resetpassword.ResetPasswordScreenPresenter
-import io.newm.feature.login.screen.welcome.WelcomeScreenPresenter
 import io.newm.feature.musicplayer.service.DownloadManager
 import io.newm.feature.musicplayer.service.DownloadManagerImpl
 import io.newm.feature.musicplayer.service.DownloadStateManager
@@ -42,6 +39,9 @@ import io.newm.sharedfeatures.login.LoginPresenter
 import io.newm.sharedfeatures.login.RecaptchaClientProvider
 import io.newm.sharedfeatures.login.RecaptchaManager
 import io.newm.sharedfeatures.login.RecaptchaManagerImpl
+import io.newm.sharedfeatures.welcome.SocialLoginManager
+import io.newm.sharedfeatures.welcome.SocialLoginManagerImpl
+import io.newm.sharedfeatures.welcome.WelcomePresenter
 import io.newm.utils.AndroidFeatureFlagManager
 import io.newm.utils.ForceAppUpdateViewModel
 import org.koin.android.ext.koin.androidContext
@@ -90,16 +90,16 @@ val viewModule = module {
                 .build()
         )
     }
-    single<GoogleSignInLauncher> { GoogleSignInLauncherImpl(get()) }
+    single<SocialLoginManager> { SocialLoginManagerImpl(get()) }
+
     factory { params ->
-        WelcomeScreenPresenter(
+        WelcomePresenter(
             navigator = params.get(),
-            googleSignInLauncher = get(),
-            recaptchaClientProvider = get(),
             loginUseCase = get(),
-            activityResultContract = ActivityResultContracts.StartActivityForResult(),
+            socialLoginManager = get(),
+            recaptchaManager = get(),
+            analyticsTracker = get(),
             logger = get(),
-            analyticsTracker = get()
         )
     }
     factory { params ->

android/features/login/build.gradle.kts

@@ -49,7 +49,6 @@ kotlin {
             implementation(libs.androidx.material)
             implementation(libs.androidx.material.icons.extended)
             implementation(libs.koin.android)
-            implementation(libs.play.services.auth)
             implementation(libs.recaptcha)
             implementation(project(Modules.coreResources))
             implementation(project(Modules.coreTheme))