[feat]: 투표 수정 api 연결 로직 작성 (#133)

Author: Nico1eKim

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsPostsResponse.kt

@@ -35,6 +35,6 @@ data class PostList(
 data class VoteItems(
     val voteItemId: Int,
     val itemName: String,
-    val percentage: Int,
+    val count: Int,
     val isVoted: Boolean,
 )

app/src/main/java/com/texthip/thip/ui/common/buttons/GroupVoteButton.kt

@@ -39,13 +39,19 @@ fun GroupVoteButton(
     hasVoted: Boolean = false, // 투표 여부
     onOptionSelected: (Int?) -> Unit
 ) {
+    val totalVotes = voteItems.sumOf { it.count }
+
     Column(
         modifier = modifier.fillMaxWidth(),
         verticalArrangement = Arrangement.spacedBy(10.dp)
     ) {
         voteItems.forEachIndexed { index, item ->
             val isSelected = selectedIndex == index
-            val votePercent = if (hasVoted) item.percentage.coerceIn(0, 100) else 0
+            val votePercent = if (totalVotes > 0) {
+                (item.count.toFloat() / totalVotes * 100).toInt()
+            } else {
+                0
+            }
 
             val animatedPercent by animateFloatAsState(
                 targetValue = votePercent / 100f,
@@ -104,7 +110,7 @@ fun GroupVoteButton(
                     )
                     if (hasVoted) {
                         Text(
-                            text = "${item.percentage}%",
+                            text = "${item.count}표",
                             color = textColor,
                             style = fontStyle
                         )

app/src/main/java/com/texthip/thip/ui/common/forms/BorderedTextField.kt

@@ -38,6 +38,7 @@ fun BorderedTextField(
     hint: String,
     text: String,
     canRemove: Boolean = true,
+    isEnabled: Boolean = true,
     onTextChange: (String) -> Unit,
     onDelete: () -> Unit,
     onRemoveField: () -> Unit
@@ -46,11 +47,15 @@ fun BorderedTextField(
     val interactionSource = remember { MutableInteractionSource() }
     val isFocused by interactionSource.collectIsFocusedAsState()
 
-    val iconRes = when {
-        isFocused && text.isEmpty() -> R.drawable.ic_x_circle_darkgrey
-        isFocused && text.isNotEmpty() -> R.drawable.ic_x_circle_grey
-        !isFocused && canRemove -> R.drawable.ic_delete
-        else -> null
+    val iconRes = if (isEnabled) {
+        when {
+            isFocused && text.isEmpty() -> R.drawable.ic_x_circle_darkgrey
+            isFocused && text.isNotEmpty() -> R.drawable.ic_x_circle_grey
+            !isFocused && canRemove -> R.drawable.ic_delete
+            else -> null
+        }
+    } else {
+        null
     }
 
     val iconEnabled = when (iconRes) {
@@ -74,6 +79,7 @@ fun BorderedTextField(
         BasicTextField(
             value = text,
             onValueChange = onTextChange,
+            enabled = isEnabled,
             textStyle = myStyle.copy(color = colors.White),
             singleLine = true,
             modifier = Modifier

app/src/main/java/com/texthip/thip/ui/group/note/component/VoteInputSection.kt

@@ -37,6 +37,7 @@ fun VoteInputSection(
     onAddOption: () -> Unit,
     onRemoveOption: (index: Int) -> Unit,
     modifier: Modifier = Modifier,
+    isEnabled: Boolean = true,
     maxOptionLength: Int = 20,
     maxOptions: Int = 5
 ) {
@@ -45,6 +46,7 @@ fun VoteInputSection(
     Column(
         modifier = modifier
             .clickable(
+                enabled = isEnabled,
                 indication = null,
                 interactionSource = remember { MutableInteractionSource() }
             ) {
@@ -55,6 +57,7 @@ fun VoteInputSection(
         BasicTextField(
             value = title,
             onValueChange = { if (it.length <= maxOptionLength) onTitleChange(it) },
+//            enabled = isEnabled,
             textStyle = typography.smalltitle_m500_s18_h24.copy(color = colors.White),
             modifier = Modifier
                 .fillMaxWidth(),
@@ -81,11 +84,12 @@ fun VoteInputSection(
                 onDelete = { onOptionChange(index, "") }, // x 버튼 클릭 시 내용 삭제
                 onRemoveField = { if (canRemove) onRemoveOption(index) }, // 쓰레기통 클릭 시 항목 제거
                 canRemove = canRemove,
+                isEnabled = isEnabled,
                 hint = stringResource(R.string.vote_content_placeholder)
             )
         }
 
-        if (options.size < maxOptions) {
+        if (options.size < maxOptions && isEnabled) {
             Button(
                 onClick = {
                     focusManager.clearFocus() // 항목 추가 시 포커스 해제

app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupVoteCreateScreen.kt

@@ -45,14 +45,22 @@ fun GroupVoteCreateScreen(
     recentPage: Int,
     totalPage: Int,
     isOverviewPossible: Boolean,
+    postId: Int?,
+    page: Int?,
+    isOverview: Boolean?,
+    title: String?,
+    options: List<String>?,
     onBackClick: () -> Unit,
     onNavigateBackWithResult: () -> Unit,
     viewModel: GroupVoteCreateViewModel = hiltViewModel()
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     LaunchedEffect(Unit) {
-        viewModel.initialize(roomId, recentPage, totalPage, isOverviewPossible)
+        viewModel.initialize(
+            roomId, recentPage, totalPage, isOverviewPossible,
+            postId, page, isOverview, title, options
+        )
     }
 
     LaunchedEffect(uiState.isSuccess) {
@@ -85,7 +93,8 @@ fun GroupVoteCreateContent(
     ) {
         Column {
             InputTopAppBar(
-                title = stringResource(R.string.create_vote),
+                title = if (uiState.isEditMode) stringResource(R.string.edit_vote)
+                else stringResource(R.string.create_vote),
                 isRightButtonEnabled = uiState.isFormFilled,
                 onLeftClick = onBackClick,
                 onRightClick = { onEvent(GroupVoteCreateEvent.CreateVoteClicked) }
@@ -106,7 +115,8 @@ fun GroupVoteCreateContent(
                     isEligible = uiState.isGeneralReviewEnabled,
                     bookTotalPage = uiState.bookTotalPage,
                     onInfoClick = { showTooltip = true },
-                    onInfoPositionCaptured = { iconCoordinates.value = it }
+                    onInfoPositionCaptured = { iconCoordinates.value = it },
+                    isEnabled = !uiState.isEditMode
                 )
 
                 VoteInputSection(
@@ -119,7 +129,8 @@ fun GroupVoteCreateContent(
                     onAddOption = { onEvent(GroupVoteCreateEvent.AddOptionClicked) },
                     onRemoveOption = { index ->
                         onEvent(GroupVoteCreateEvent.RemoveOptionClicked(index))
-                    }
+                    },
+                    isEnabled = !uiState.isEditMode
                 )
             }
         }