[CHORE/#71] solving conflict

teamterning · Jul 15, 2024 · 2072ba5 · 2072ba5
2 parents 126b5c8 + b1a803b
commit 2072ba5
Show file tree

Hide file tree

Showing 17 changed files with 575 additions and 380 deletions.
diff --git a/core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt b/core/src/main/java/com/terning/core/designsystem/component/dialog/ScrapDialogContent.kt
diff --git a/core/src/main/java/com/terning/core/designsystem/component/dialog/TerningBasicDialog.kt b/core/src/main/java/com/terning/core/designsystem/component/dialog/TerningBasicDialog.kt
@@ -1,9 +1,27 @@
 package com.terning.core.designsystem.component.dialog
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import com.terning.core.R
+import com.terning.core.designsystem.component.button.RoundButton
+import com.terning.core.designsystem.theme.Grey300
+import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
+import com.terning.core.extension.noRippleClickable
 
 @Composable
 fun TerningBasicDialog(
@@ -20,21 +38,35 @@ fun TerningBasicDialog(
         onDismissRequest = { onDismissRequest() },
         properties = properties,
     ) {
-        content()
-    }
-}
-
-@Preview(showBackground = true, showSystemUi = true)
-@Composable
-fun TerningBasicDialogPreview() {
-    TerningBasicDialog(
-        onDismissRequest = {},
-        content = {
-            ScrapDialogContent(
-                onDismissRequest = {},
-                isScrapped = false,
-                internInfoList = listOf()
-            )
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+                .padding(30.dp)
+                .background(
+                    color = White,
+                    shape = RoundedCornerShape(20.dp)
+                ),
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.End
+            ) {
+                IconButton(
+                    onClick = { onDismissRequest() },
+                    modifier = Modifier
+                        .padding(6.dp)
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_dialog_x_32),
+                        contentDescription = null,
+                        tint = Grey300,
+                        modifier = Modifier
+                            .noRippleClickable { onDismissRequest() }
+                    )
+                }
+            }
+            content()
         }
-    )
+    }
 }
diff --git a/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt b/core/src/main/java/com/terning/core/designsystem/component/textfield/NameTextField.kt
@@ -1,9 +1,11 @@
 package com.terning.core.designsystem.component.textfield
 
+import androidx.annotation.StringRes
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.res.stringResource
 import com.terning.core.designsystem.theme.Black
 import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey400
@@ -15,7 +17,8 @@ fun NameTextField(
     onValueChange: (String) -> Unit,
     hint: String,
     drawLineColor: Color,
-    helperMessage: String,
+    @StringRes
+    helperMessage: Int,
     helperColor: Color,
     helperIcon: Int? = null,
 ) {
@@ -31,7 +34,7 @@ fun NameTextField(
         hintColor = Grey300,
         showTextLength = true,
         maxTextLength = 12,
-        helperMessage = helperMessage,
+        helperMessage = stringResource(id = helperMessage),
         helperIcon = helperIcon,
         helperColor = helperColor,
     )