Merge pull request #123 from uswLectureEvaluation/refactor/#122-resource

Refactor/#122 컴포넌트, 리소스 분리
uswLectureEvaluation · Jan 28, 2024 · 3eca90b · 3eca90b
2 parents 4d58a84 + 7c1b9aa
commit 3eca90b
Show file tree

Hide file tree

Showing 52 changed files with 364 additions and 539 deletions.
diff --git a/...ignsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiAlignButton.kt b/...ignsystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiAlignButton.kt
diff --git a/...ystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiSelectContainer.kt b/...ystem/src/main/java/com/suwiki/core/designsystem/component/align/SuwikiSelectContainer.kt
diff --git a/...tem/src/main/java/com/suwiki/core/designsystem/component/appbar/SuwikiEvaluationAppBar.kt b/...tem/src/main/java/com/suwiki/core/designsystem/component/appbar/SuwikiEvaluationAppBar.kt
diff --git a/...ore/designsystem/component/badge/Badge.kt → ...signsystem/component/badge/SuwikiBadge.kt b/...ore/designsystem/component/badge/Badge.kt → ...signsystem/component/badge/SuwikiBadge.kt
diff --git a/...c/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt b/...c/main/java/com/suwiki/core/designsystem/component/bottomsheet/SuwikiSelectBottomSheet.kt
@@ -1,16 +1,28 @@
 package com.suwiki.core.designsystem.component.bottomsheet
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import com.suwiki.core.designsystem.component.align.SuwikiSelectContainer
+import com.suwiki.core.designsystem.R
+import com.suwiki.core.designsystem.theme.Gray6A
 import com.suwiki.core.designsystem.theme.Gray95
+import com.suwiki.core.designsystem.theme.Primary
 import com.suwiki.core.designsystem.theme.SuwikiTheme
+import com.suwiki.core.designsystem.theme.White
+import com.suwiki.core.ui.extension.suwikiClickable
 import kotlinx.collections.immutable.PersistentList
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -39,6 +51,46 @@ fun SuwikiSelectBottomSheet(
   }
 }
 
+@Composable
+private fun SuwikiSelectContainer(
+  modifier: Modifier = Modifier,
+  text: String,
+  isChecked: Boolean = false,
+  onClick: () -> Unit = {},
+) {
+  val textColor = if (isChecked) Primary else Gray6A
+  Box(
+    modifier = modifier
+      .background(White)
+      .fillMaxWidth()
+      .wrapContentHeight()
+      .suwikiClickable(
+        onClick = onClick,
+        rippleColor = Gray6A,
+      ),
+  ) {
+    Text(
+      text = text,
+      color = textColor,
+      style = SuwikiTheme.typography.body2,
+      modifier = Modifier
+        .align(Alignment.CenterStart)
+        .padding(top = 13.dp, bottom = 14.dp, start = 24.dp, end = 52.dp),
+    )
+    if (isChecked) {
+      Icon(
+        painter = painterResource(id = R.drawable.ic_align_checked),
+        contentDescription = "",
+        modifier = Modifier
+          .align(Alignment.CenterEnd)
+          .padding(end = 16.dp)
+          .size(24.dp),
+        tint = Primary,
+      )
+    }
+  }
+}
+
 @Composable
 fun SuwikiSelectBottomSheetContent(
   selectedPosition: Int?,