[FIX]#155 : 메세지 카드 최소 / 최대 높이 수정

wespot-bff · Sep 9, 2024 · 7b4149b · 7b4149b
1 parent 4bb325a
commit 7b4149b
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt b/feature/message/src/main/kotlin/com/bff/wespot/message/screen/MessageStorageScreen.kt
@@ -37,6 +37,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.zIndex
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.LoadState
 import androidx.paging.compose.collectAsLazyPagingItems
@@ -387,11 +388,17 @@ private fun MessageContentDialog(
     closeButtonClick: () -> Unit,
 ) {
     Dialog(onDismissRequest = { }) {
-        Box(
-            modifier = Modifier
-                .width(296.dp)
-                .heightIn(min = 376.dp, max = 424.dp),
-        ) {
+        Box(modifier = Modifier.width(296.dp)) {
+            Image(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .padding(top = 8.dp, end = 8.dp)
+                    .clickable { closeButtonClick() }
+                    .zIndex(1f),
+                painter = painterResource(id = R.drawable.close),
+                contentDescription = stringResource(id = R.string.close),
+            )
+
             Column(
                 modifier = Modifier
                     .clip(WeSpotThemeManager.shapes.extraLarge)
@@ -401,44 +408,37 @@ private fun MessageContentDialog(
                         color = Primary400,
                         shape = WeSpotThemeManager.shapes.extraLarge,
                     )
-                    .fillMaxSize()
-                    .padding(horizontal = 24.dp, vertical = 20.dp),
-                verticalArrangement = Arrangement.spacedBy(20.dp),
+                    .padding(start = 24.dp, end = 24.dp, bottom = 24.dp),
+                verticalArrangement = Arrangement.SpaceBetween,
             ) {
-                MessageDialogText("To.\n" + message.receiver)
+                Column {
+                    MessageDialogText("To.\n" + message.receiver)
 
-                MessageDialogText(message.content, Modifier.weight(1f))
+                    MessageDialogText(message.content, isMessageContent = true)
+                }
 
                 MessageDialogText(
                     text = "From.\n" + message.sender,
                     textAlign = TextAlign.End,
                 )
             }
-
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 8.dp, end = 8.dp),
-                contentAlignment = Alignment.CenterEnd,
-            ) {
-                Image(
-                    modifier = Modifier.clickable { closeButtonClick() },
-                    painter = painterResource(id = R.drawable.close),
-                    contentDescription = stringResource(id = R.string.close),
-                )
-            }
         }
     }
 }
 
 @Composable
 private fun MessageDialogText(
     text: String,
-    modifier: Modifier = Modifier,
     textAlign: TextAlign = TextAlign.Start,
+    isMessageContent: Boolean = false,
 ) {
     Text(
-        modifier = modifier.fillMaxWidth(),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(top = 20.dp)
+            .let {
+                if (isMessageContent) it.heightIn(min = 192.dp, max = 240.dp) else it
+            },
         text = text,
         style = StaticTypeScale.Default.body4,
         color = WeSpotThemeManager.colors.txtTitleColor,