diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt index 22f2ab252..beb3262d4 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt @@ -9,7 +9,6 @@ import androidx.activity.viewModels import androidx.compose.runtime.getValue import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.compose.rememberNavController -import com.mashup.gabbangzip.sharedalbum.presentation.ui.main.MainActivity import com.mashup.gabbangzip.sharedalbum.presentation.ui.model.PicPhotoFrame import com.mashup.gabbangzip.sharedalbum.presentation.ui.vote.navigation.VoteNavHost import com.mashup.gabbangzip.sharedalbum.presentation.ui.vote.navigation.VoteNavRoute @@ -31,12 +30,11 @@ class VoteActivity : ComponentActivity() { state = state, navController = navController, startDestination = VoteNavRoute.initRoute, + frameResId = PicPhotoFrame.getTypeByKeyword(state.voteResult.groupKeyword.name).frameResId, + thumbnailUrl = state.voteResult.randomImageUrl, onDialogConfirm = { viewModel.updateVoteDialog(isVisible = false) }, onCancelVote = { viewModel.updateVoteDialog(isVisible = true) }, - onVoteExit = { - MainActivity.openActivity(this@VoteActivity) - finish() - }, + onVoteExit = { finish() }, onVoteBySwiped = { voteType, photo -> viewModel.updateVoteEvent(voteType) viewModel.addVoteResult(voteType, photo) @@ -57,8 +55,6 @@ class VoteActivity : ComponentActivity() { // TODO: 향후 논의해서 업로드 실패시 에러토스트..? 스낵바..? 정하기. } }, - frameResId = PicPhotoFrame.getTypeByKeyword(state.voteResult.groupKeyword.name).frameResId, - thumbnailUrl = state.voteResult.randomImageUrl, ) } } diff --git a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/navigation/VoteNavHost.kt b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/navigation/VoteNavHost.kt index 41b0e3510..ac742665b 100644 --- a/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/navigation/VoteNavHost.kt +++ b/presentation/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/navigation/VoteNavHost.kt @@ -14,6 +14,8 @@ fun VoteNavHost( navController: NavHostController, startDestination: String, state: PhotoVoteState, + frameResId: Int, + thumbnailUrl: String, onDialogConfirm: () -> Unit, onCancelVote: () -> Unit, onVoteExit: () -> Unit, @@ -24,8 +26,6 @@ fun VoteNavHost( onCompleteButtonClicked: () -> Unit, onClickNavigationBack: () -> Unit, onUploadPicture: (Boolean) -> Unit, - frameResId: Int, - thumbnailUrl: String, ) { NavHost( modifier = modifier,