🔨 인자 위치 컨벤션에 맞게 수정 및 finish 로 코드 수정

mash-up-kr · Aug 12, 2024 · 9b3d790 · 9b3d790
1 parent 5d0dbc2
commit 9b3d790
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/...tion/src/main/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/VoteActivity.kt b/...tion/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/...ain/java/com/mashup/gabbangzip/sharedalbum/presentation/ui/vote/navigation/VoteNavHost.kt b/...ain/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,