FEAT: 모임 만남 제안 화면

eshc123 · eshc123 · commit 4f1429f43acd · 2025-08-09T22:01:27.000+09:00
diff --git a/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/component/CreateProposalPostCard.kt b/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/component/CreateProposalPostCard.kt
@@ -21,6 +21,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.plottwist.core.designsystem.R
@@ -38,7 +39,8 @@ fun CreateProposalPostCard(
     selectedGatheringName: String,
     onSelectGatheringClick: () -> Unit,
     onCloseSelectedGatheringClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    isEnabledEditGatheringName: Boolean = true
 ) {
     PostCard(
         modifier = modifier,
@@ -53,6 +55,7 @@ fun CreateProposalPostCard(
             SelectedGatheringButton(
                 modifier = Modifier.align(Alignment.TopEnd),
                 gatheringName = selectedGatheringName,
+                isEnabledEditGatheringName = isEnabledEditGatheringName,
                 onClick = onCloseSelectedGatheringClick
             )
         } else {
@@ -114,14 +117,18 @@ fun SelectGatheringButton(
 fun SelectedGatheringButton(
     gatheringName: String,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    isEnabledEditGatheringName: Boolean = true
 ) {
     Row(
         modifier = modifier
-            .dashedBorder(
-                color = Color(0xFFA0A0A0),
-                shape = RoundedCornerShape(10.dp),
-                strokeWidth = 1.dp
+            .then(
+                if(isEnabledEditGatheringName) Modifier.dashedBorder(
+                    color = Color(0xFFA0A0A0),
+                    shape = RoundedCornerShape(10.dp),
+                    strokeWidth = 1.dp
+                )
+                else Modifier
             )
             .clip(RoundedCornerShape(10.dp))
             .padding(8.dp)
@@ -135,14 +142,17 @@ fun SelectedGatheringButton(
             modifier = Modifier.weight(1f),
             text = stringResource(R.string.create_proposal_selected_gathering_name, gatheringName),
             style = TukSerifTypography.body14R,
+            textAlign = if(isEnabledEditGatheringName) TextAlign.Start else TextAlign.End,
             color = Color(0xFF888888)
         )
-        Icon(
-            modifier = Modifier.size(20.dp),
-            imageVector = ImageVector.vectorResource(R.drawable.ic_close_small),
-            contentDescription = "close",
-            tint = Color(0xFF888888)
-        )
+        if(isEnabledEditGatheringName){
+            Icon(
+                modifier = Modifier.size(20.dp),
+                imageVector = ImageVector.vectorResource(R.drawable.ic_close_small),
+                contentDescription = "close",
+                tint = Color(0xFF888888)
+            )
+        }
     }
 }
 
diff --git a/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalContract.kt b/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalContract.kt
@@ -9,14 +9,18 @@ data class CreateGatheringProposalState(
     val whatLabel : TextFieldState = TextFieldState(),
     val whenTags : List<String> = emptyList(),
     val whereTags : List<String> = emptyList(),
-    val whatTags : List<String> = emptyList()
+    val whatTags : List<String> = emptyList(),
+    val gatheringName: String,
+    val gatheringId: Long,
+    val isReady: Boolean = false
 )
 
 sealed class CreateGatheringProposalAction {
     data object ClickBack : CreateGatheringProposalAction()
     data object ClickWhenRefresh : CreateGatheringProposalAction()
     data object ClickWhereRefresh : CreateGatheringProposalAction()
     data object ClickWhatRefresh : CreateGatheringProposalAction()
+    data object ClickNext: CreateGatheringProposalAction()
 }
 
 sealed class CreateGatheringProposalSideEffect {
diff --git a/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalScreen.kt b/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalScreen.kt
@@ -19,8 +19,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -34,6 +32,7 @@ import com.plottwist.core.designsystem.foundation.type.TukSerifTypography
 import com.plottwist.core.ui.component.TopAppBarCloseButton
 import com.plottwist.feature.proposal_create.CreateProposalGradientBackgroundImage
 import com.plottwist.feature.proposal_create.component.CreateGatheringProposalPostCard
+import com.plottwist.feature.proposal_create.component.CreateProposalPostCard
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
@@ -45,9 +44,11 @@ fun CreateGatheringProposalScreen(
 ) {
     val state by viewModel.collectAsState()
 
-    viewModel.collectSideEffect {
-        when (it) {
-            CreateGatheringProposalSideEffect.NavigateBack -> onBack()
+    viewModel.collectSideEffect { sideEffect ->
+        when (sideEffect) {
+            CreateGatheringProposalSideEffect.NavigateBack -> {
+                onBack()
+            }
         }
     }
 
@@ -56,10 +57,13 @@ fun CreateGatheringProposalScreen(
         whenLabel = state.whenLabel,
         whereLabel = state.whereLabel,
         whatLabel = state.whatLabel,
+        isReady = state.isReady,
+        selectedGatheringName = state.gatheringName,
         onBackClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickBack) },
         onWhenRefreshClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickWhenRefresh) },
         onWhereRefreshClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickWhereRefresh) },
-        onWhatRefreshClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickWhatRefresh) }
+        onWhatRefreshClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickWhatRefresh) },
+        onNextClick = { viewModel.handleAction(CreateGatheringProposalAction.ClickNext) }
     )
 }
 
@@ -68,10 +72,13 @@ private fun CreateGatheringProposalScreen(
     whenLabel: TextFieldState,
     whereLabel: TextFieldState,
     whatLabel: TextFieldState,
+    isReady: Boolean,
+    selectedGatheringName: String,
     onBackClick: () -> Unit,
     onWhenRefreshClick: () -> Unit,
     onWhereRefreshClick: () -> Unit,
     onWhatRefreshClick: () -> Unit,
+    onNextClick: () -> Unit,
     modifier: Modifier = Modifier,
     verticalState: ScrollState = rememberScrollState(),
 ) {
@@ -105,30 +112,45 @@ private fun CreateGatheringProposalScreen(
                     color = Gray900
                 )
 
-                CreateGatheringProposalPostCard(
-                    modifier = Modifier
-                        .width(300.dp)
-                        .height(370.dp)
-                        .align(Alignment.CenterHorizontally)
-                    ,
-                    whereLabel = whereLabel,
-                    whenLabel = whenLabel,
-                    whatLabel = whatLabel,
-                    onWhenRefreshClick = onWhenRefreshClick,
-                    onWhereRefreshClick = onWhereRefreshClick,
-                    onWhatRefreshClick = onWhatRefreshClick
-                )
+                if(isReady) {
+                    CreateProposalPostCard(
+                        modifier = Modifier
+                            .width(300.dp)
+                            .height(370.dp)
+                            .align(Alignment.CenterHorizontally),
+                        whereLabel = whereLabel.text.toString(),
+                        whenLabel = whenLabel.text.toString(),
+                        whatLabel = whatLabel.text.toString(),
+                        selectedGatheringName = selectedGatheringName,
+                        isEnabledEditGatheringName = false,
+                        onSelectGatheringClick = { },
+                        onCloseSelectedGatheringClick = {}
+                    )
+                } else {
+                    CreateGatheringProposalPostCard(
+                        modifier = Modifier
+                            .width(300.dp)
+                            .height(370.dp)
+                            .align(Alignment.CenterHorizontally)
+                        ,
+                        whereLabel = whereLabel,
+                        whenLabel = whenLabel,
+                        whatLabel = whatLabel,
+                        onWhenRefreshClick = onWhenRefreshClick,
+                        onWhereRefreshClick = onWhereRefreshClick,
+                        onWhatRefreshClick = onWhatRefreshClick
+                    )
+                }
+
             }
 
             TukSolidButton(
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 20.dp, vertical = 16.dp),
-                text = stringResource(R.string.common_next),
+                text = if(isReady) "제안하기" else stringResource(R.string.common_next),
                 buttonType = TukSolidButtonType.ACTIVE,
-                onClick = {
-                    // TODO
-                }
+                onClick = onNextClick
             )
         }
     }
@@ -159,6 +181,9 @@ private fun CreateGatheringProposalScreenPreview() {
         whatLabel = TextFieldState(),
         onWhenRefreshClick = {},
         onWhereRefreshClick = {},
-        onWhatRefreshClick = {}
+        onWhatRefreshClick = {},
+        isReady = false,
+        selectedGatheringName = "",
+        onNextClick = {}
     )
 }
diff --git a/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalViewModel.kt b/feature/proposal-create/src/main/java/com/plottwist/feature/proposal_create/gathering_proposal/CreateGatheringProposalViewModel.kt
@@ -1,19 +1,30 @@
 package com.plottwist.feature.proposal_create.gathering_proposal
 
 import androidx.compose.foundation.text.input.TextFieldState
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
+import androidx.navigation.toRoute
 import com.plottwist.core.domain.gathering.usecase.GetPurposesUseCase
 import com.plottwist.core.domain.model.Purposes
+import com.plottwist.core.ui.navigation.Route
+import com.plottwist.feature.proposal_create.CreateProposalState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import org.orbitmvi.orbit.ContainerHost
 import org.orbitmvi.orbit.viewmodel.container
 import javax.inject.Inject
 
 @HiltViewModel
 class CreateGatheringProposalViewModel @Inject constructor(
-    private val getPurposesUseCase: GetPurposesUseCase
+    private val getPurposesUseCase: GetPurposesUseCase,
+    savedStateHandle: SavedStateHandle
 ) : ContainerHost<CreateGatheringProposalState, CreateGatheringProposalSideEffect>, ViewModel() {
-    override val container = container<CreateGatheringProposalState, CreateGatheringProposalSideEffect>(CreateGatheringProposalState()) {
+    override val container = container<CreateGatheringProposalState, CreateGatheringProposalSideEffect>(
+        savedStateHandle.toRoute<Route.CreateGatheringProposal>().let { route ->
+            CreateGatheringProposalState(
+                gatheringName = route.gatheringName,
+                gatheringId = route.gatheringId
+            )
+        }) {
         getPurposes()
     }
 
@@ -50,6 +61,10 @@ class CreateGatheringProposalViewModel @Inject constructor(
             CreateGatheringProposalAction.ClickWhereRefresh -> {
                 handleWhereRefresh()
             }
+
+            CreateGatheringProposalAction.ClickNext -> {
+                handleNext()
+            }
         }
     }
 
@@ -93,4 +108,11 @@ class CreateGatheringProposalViewModel @Inject constructor(
         }
     }
 
+    private fun handleNext() = intent {
+        reduce {
+            state.copy(
+                isReady = true
+            )
+        }
+    }
 }
