Setup di

app/src/main/java/org/futo/circles/di/DataSourceModule.kt

@@ -13,6 +13,7 @@ import org.futo.circles.feature.circles.following.FollowingDataSource
 import org.futo.circles.feature.groups.GroupsDataSource
 import org.futo.circles.feature.log_in.LoginDataSource
 import org.futo.circles.feature.log_in.stages.LoginStagesDataSource
+import org.futo.circles.feature.log_in.stages.password.DirectLoginPasswordDataSource
 import org.futo.circles.feature.log_in.stages.password.LoginPasswordDataSource
 import org.futo.circles.feature.log_in.stages.terms.LoginAcceptTermsDataSource
 import org.futo.circles.feature.people.PeopleDataSource
@@ -50,7 +51,7 @@ import org.futo.circles.model.CircleRoomTypeArg
 import org.koin.dsl.module
 
 val dataSourceModule = module {
-    factory { LoginDataSource(get()) }
+    factory { LoginDataSource(get(), get()) }
     factory { (roomId: String, type: CircleRoomTypeArg) ->
         TimelineDataSource(roomId, type, get())
     }
@@ -102,6 +103,7 @@ val dataSourceModule = module {
     factory { (userId: String) -> UserDataSource(get(), userId) }
     factory { SubscriptionStageDataSource(get()) }
     factory { (roomType: CircleRoomTypeArg) -> SelectRoomsDataSource(roomType) }
-    factory { LoginPasswordDataSource(get(), get()) }
+    factory { DirectLoginPasswordDataSource(get(), get()) }
+    factory { LoginPasswordDataSource(get()) }
     factory { SignupPasswordDataSource(get()) }
 }
\ No newline at end of file

app/src/main/java/org/futo/circles/di/UiModule.kt

@@ -7,6 +7,7 @@ import org.futo.circles.feature.circles.following.FollowingViewModel
 import org.futo.circles.feature.groups.GroupsViewModel
 import org.futo.circles.feature.log_in.LogInViewModel
 import org.futo.circles.feature.log_in.stages.LoginStagesViewModel
+import org.futo.circles.feature.log_in.stages.password.DirectLoginPasswordDataSource
 import org.futo.circles.feature.log_in.stages.password.LoginPasswordDataSource
 import org.futo.circles.feature.log_in.stages.terms.LoginAcceptTermsDataSource
 import org.futo.circles.feature.notices.SystemNoticesTimelineViewModel
@@ -43,6 +44,7 @@ import org.futo.circles.feature.sign_up.validate_token.ValidateTokenViewModel
 import org.futo.circles.feature.timeline.TimelineViewModel
 import org.futo.circles.feature.timeline.post.report.ReportViewModel
 import org.futo.circles.model.CircleRoomTypeArg
+import org.futo.circles.model.PasswordModeArg
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
@@ -115,10 +117,13 @@ val uiModule = module {
     viewModel { SubscriptionStageViewModel(get()) }
     viewModel { BaseShareViewModel(get()) }
     viewModel { (type: CircleRoomTypeArg) -> SelectRoomsViewModel(get { parametersOf(type) }) }
-    viewModel { (isLoginMode: Boolean) ->
+    viewModel { (passwordMode: PasswordModeArg) ->
         PasswordViewModel(
-            if (isLoginMode) get<LoginPasswordDataSource>()
-            else get<SignupPasswordDataSource>()
+            when(passwordMode){
+                PasswordModeArg.LoginStage -> get<LoginPasswordDataSource>()
+                PasswordModeArg.LoginDirect -> get<DirectLoginPasswordDataSource>()
+                PasswordModeArg.SignupStage -> get<SignupPasswordDataSource>()
+            }
         )
     }
     viewModel { LoginStagesViewModel(get()) }