[refactor]: PR에 맞게 기타 코드 수정 (#44)

rbqks529 · rbqks529 · commit f90a225e8ed6 · 2025-07-16T20:51:46.000+09:00
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoom.kt
@@ -46,8 +46,6 @@ fun CardItemRoom(
     hasBorder: Boolean = false,
     onClick: () -> Unit = {}
 ) {
-    val paddingValues = if (endDate == null) 27.5.dp else 16.dp
-
     Card(
         modifier = modifier
             .fillMaxWidth()
@@ -93,10 +91,11 @@ fun CardItemRoom(
                 Spacer(modifier = Modifier.width(16.dp))
 
                 Column(
-                    modifier = Modifier.fillMaxWidth()
+                    modifier = Modifier
+                    .fillMaxWidth()
+                    .height(107.dp), // 이미지와 높이 맞추면 더 정확
+                    verticalArrangement = Arrangement.Center // 여기!
                 ) {
-
-                    Spacer(modifier = Modifier.height(paddingValues))
                     Text(
                         text = title,
                         color = colors.White,
@@ -143,7 +142,7 @@ fun CardItemRoom(
                             ) {
                                 Text(
                                     text = stringResource(
-                                        R.string.card_item_participant,
+                                        R.string.card_item_participating_count,
                                         participants
                                     ),
                                     style = typography.menu_sb600_s12,
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoomSmall.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoomSmall.kt
@@ -48,15 +48,15 @@ fun CardItemRoomSmall(
     val cardModifier = if (isWide) {
         modifier
             .fillMaxWidth()
-            .height(104.dp)
     } else {
         modifier
-            .size(width = 232.dp, height = 104.dp)
+            .width(232.dp)
     }
     val bgColor = if (isWide) colors.Black else colors.DarkGrey50
 
     Card(
         modifier = cardModifier
+            .height(104.dp)
             .clickable { onClick() },
         colors = CardDefaults.cardColors(
             containerColor = bgColor
diff --git a/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt b/app/src/main/java/com/texthip/thip/ui/common/forms/SearchBookTextField.kt
@@ -2,15 +2,25 @@ package com.texthip.thip.ui.common.forms
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -20,7 +30,6 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.texthip.thip.R
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
@@ -35,19 +44,16 @@ fun SearchBookTextField(
     onSearch: (String) -> Unit = {}
 ) {
     val myStyle = typography.menu_r400_s14_h24.copy(
-        fontSize = 14.sp,
-        lineHeight = 16.sp,
         color = colors.White
     )
     val shape = RoundedCornerShape(12.dp)
-    val backgroundColor = colors.DarkGrey02
 
     Box(
         modifier = modifier
             .fillMaxWidth()
             .height(40.dp)
             .clip(shape)
-            .background(backgroundColor),
+            .background(colors.DarkGrey02),
         contentAlignment = Alignment.CenterStart
     ) {
         Row(
diff --git a/app/src/main/java/com/texthip/thip/ui/common/forms/SingleDigitTextBox.kt b/app/src/main/java/com/texthip/thip/ui/common/forms/SingleDigitTextBox.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.common.forms
 
+import android.view.KeyEvent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
@@ -17,6 +18,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.input.key.KeyEventType
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.input.key.type
 import androidx.compose.ui.text.input.KeyboardType
@@ -63,8 +65,8 @@ fun SingleDigitBox(
                 .background(containerColor, RoundedCornerShape(12.dp))
                 .border(1.dp, borderColor, RoundedCornerShape(12.dp))
                 .onKeyEvent { keyEvent ->
-                    if (keyEvent.nativeKeyEvent.keyCode == android.view.KeyEvent.KEYCODE_DEL &&
-                        keyEvent.type == androidx.compose.ui.input.key.KeyEventType.KeyDown
+                    if (keyEvent.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_DEL &&
+                        keyEvent.type == KeyEventType.KeyDown
                     ) {
                         if (value.isEmpty()) {
                             onBackspace?.invoke()
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupDeadlineRoomSection.kt
@@ -103,7 +103,7 @@ fun GroupRoomDeadlineSection(
                         )
                         Spacer(Modifier.height(20.dp))
 
-                        val cards = section.rooms.filter { it.genreIndex == selectedGenre }.take(4)
+                        val cards = section.rooms.filter { it.genreIndex == selectedGenre }
                         Column(
                             verticalArrangement = Arrangement.spacedBy(20.dp),
                             modifier = Modifier
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyCard.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyCard.kt
@@ -1,32 +1,21 @@
 package com.texthip.thip.ui.group.myroom.component
 
-import android.R.attr.data
-import android.R.attr.top
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
-import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableFloatStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
@@ -37,7 +26,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
-import com.texthip.thip.ui.group.myroom.mock.GroupCardData
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
diff --git a/app/src/main/java/com/texthip/thip/ui/group/screen/GroupDoneScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/screen/GroupDoneScreen.kt
@@ -36,7 +36,6 @@ fun GroupDoneScreen(
 
     Column(
         Modifier
-            .background(colors.Black)
             .fillMaxSize()
     ) {
         DefaultTopAppBar(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -42,7 +42,7 @@
     <string name="card_item_end_date">"%1$s일 뒤 "</string>
     <string name="card_item_end">모집 마감</string>
     <string name="card_item_finish">종료</string>
-    <string name="card_item_participant">%1$s명</string>
+    <string name="card_item_participating_count">%1$s명</string>
     <string name="card_item_participant_string">참여</string>
     <string name="card_item_participant_count">%1$s</string>
     <string name="card_item_participant_count_max"> / %1$s명</string>

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ fun GroupRoomDeadlineSection(`
`103`	`103`	`)`
`104`	`104`	`Spacer(Modifier.height(20.dp))`
`105`	`105`
`106`		`- val cards = section.rooms.filter { it.genreIndex == selectedGenre }.take(4)`
	`106`	`+ val cards = section.rooms.filter { it.genreIndex == selectedGenre }`
`107`	`107`	`Column(`
`108`	`108`	`verticalArrangement = Arrangement.spacedBy(20.dp),`
`109`	`109`	`modifier = Modifier`