diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt index 057a36c4..d939e692 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/AccountSettingScreen.kt @@ -27,6 +27,7 @@ import com.bff.wespot.entire.R import com.bff.wespot.entire.screen.state.EntireAction import com.bff.wespot.entire.screen.state.EntireSideEffect import com.bff.wespot.entire.screen.viewmodel.EntireViewModel +import com.bff.wespot.navigation.Navigator import com.ramcosta.composedestinations.annotation.Destination import org.orbitmvi.orbit.compose.collectSideEffect @@ -40,6 +41,7 @@ interface AccountSettingNavigator { @Composable fun AccountSettingScreen( navigator: AccountSettingNavigator, + activityNavigator: Navigator, viewModel: EntireViewModel = hiltViewModel(), ) { val context = LocalContext.current @@ -50,7 +52,7 @@ fun AccountSettingScreen( viewModel.collectSideEffect { when (it) { is EntireSideEffect.NavigateToAuth -> { - val intent = it.navigator.navigateToAuth(context) + val intent = activityNavigator.navigateToAuth(context) context.startActivity(intent) } } diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt index a754b5f0..1d6d2262 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/screen/revoke/RevokeConfirmScreen.kt @@ -38,6 +38,7 @@ import com.bff.wespot.entire.R import com.bff.wespot.entire.screen.state.EntireAction import com.bff.wespot.entire.screen.state.EntireSideEffect import com.bff.wespot.entire.screen.viewmodel.EntireViewModel +import com.bff.wespot.navigation.Navigator import com.bff.wespot.navigation.util.EXTRA_TOAST_MESSAGE import com.bff.wespot.ui.WSBottomSheet import com.ramcosta.composedestinations.annotation.Destination @@ -54,6 +55,7 @@ interface RevokeConfirmNavigator { @Composable fun RevokeConfirmScreen( navigator: RevokeConfirmNavigator, + activityNavigator: Navigator, viewModel: EntireViewModel = hiltViewModel(), ) { val context = LocalContext.current @@ -66,7 +68,7 @@ fun RevokeConfirmScreen( viewModel.collectSideEffect { when (it) { is EntireSideEffect.NavigateToAuth -> { - val intent = it.navigator.navigateToAuth(context) + val intent = activityNavigator.navigateToAuth(context) intent.putExtra(EXTRA_TOAST_MESSAGE, context.getString(R.string.revoke_done)) context.startActivity(intent) } diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/state/EntireSideEffect.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/state/EntireSideEffect.kt index c54521de..521ee8d4 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/state/EntireSideEffect.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/state/EntireSideEffect.kt @@ -1,7 +1,5 @@ package com.bff.wespot.entire.screen.state -import com.bff.wespot.navigation.Navigator - sealed class EntireSideEffect { - data class NavigateToAuth(val navigator: Navigator) : EntireSideEffect() + data object NavigateToAuth : EntireSideEffect() } diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/viewmodel/EntireViewModel.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/viewmodel/EntireViewModel.kt index 8fe4d304..3afea8ac 100644 --- a/feature/entire/src/main/java/com/bff/wespot/entire/screen/viewmodel/EntireViewModel.kt +++ b/feature/entire/src/main/java/com/bff/wespot/entire/screen/viewmodel/EntireViewModel.kt @@ -9,7 +9,6 @@ import com.bff.wespot.domain.repository.user.UserRepository import com.bff.wespot.entire.screen.state.EntireAction import com.bff.wespot.entire.screen.state.EntireSideEffect import com.bff.wespot.entire.screen.state.EntireUiState -import com.bff.wespot.navigation.Navigator import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import org.orbitmvi.orbit.ContainerHost @@ -26,7 +25,6 @@ class EntireViewModel @Inject constructor( private val authRepository: AuthRepository, private val messageRepository: MessageRepository, private val messageStorageRepository: MessageStorageRepository, - private val navigator: Navigator, ) : ViewModel(), ContainerHost { override val container = container(EntireUiState()) @@ -59,7 +57,7 @@ class EntireViewModel @Inject constructor( // TODO Token 삭제 authRepository.revoke(state.revokeReasonList) .onSuccess { - postSideEffect(EntireSideEffect.NavigateToAuth(navigator)) + postSideEffect(EntireSideEffect.NavigateToAuth) } .onFailure { Timber.e(it) @@ -70,7 +68,7 @@ class EntireViewModel @Inject constructor( private fun signOut() = intent { viewModelScope.launch { // TODO Token 삭제 - postSideEffect(EntireSideEffect.NavigateToAuth(navigator)) + postSideEffect(EntireSideEffect.NavigateToAuth) } }