Update v4.0.7

build-logic/convention/src/main/java/in/koreatech/convention/AndroidProject.kt

@@ -20,7 +20,7 @@ internal fun configureAndroidProject(
             it.defaultConfig.targetSdk = 34
         }
         defaultConfig {
-            minSdk = 24
+            minSdk = 26
             testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"
             vectorDrawables.useSupportLibrary = true
         }

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
     }
 
     extra.apply {
-        set("versionName", "4.0.5")
-        set("versionCode", 40005)
+        set("versionName", "4.0.6")
+        set("versionCode", 40006)
         // 코인 버전 관리
 
         set("versionBusinessName", "1.0.1")

core/designsystem/src/main/java/in/koreatech/koin/core/designsystem/ComposeExtensions.kt

@@ -5,7 +5,18 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.PathEffect
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.graphics.drawOutline
+import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 
 /**
  * 리플 효과 없는 Clickable
@@ -24,4 +35,44 @@ fun Modifier.noRippleClickable(
         role = role,
         onClick = onClick
     )
+}
+
+/**
+ * 점선(-) 테두리
+ */
+fun Modifier.dashedBorder(
+    color: Color,
+    shape: Shape,
+    strokeWidth: Dp = 1.dp,
+    dashLength: Dp = 3.dp,
+    gapLength: Dp = 3.dp,
+    cap: StrokeCap = StrokeCap.Round
+) = dashedBorder(brush = SolidColor(color), shape, strokeWidth, dashLength, gapLength, cap)
+
+private fun Modifier.dashedBorder(
+    brush: Brush,
+    shape: Shape,
+    strokeWidth: Dp,
+    dashLength: Dp,
+    gapLength: Dp,
+    cap: StrokeCap = StrokeCap.Round
+) = this.drawWithContent {
+
+    val outline = shape.createOutline(size, layoutDirection, density = this)
+
+    val dashedStroke = Stroke(
+        cap = cap,
+        width = strokeWidth.toPx(),
+        pathEffect = PathEffect.dashPathEffect(
+            intervals = floatArrayOf(dashLength.toPx(), gapLength.toPx())
+        )
+    )
+
+    drawContent()
+
+    drawOutline(
+        outline = outline,
+        style = dashedStroke,
+        brush = brush
+    )
 }

core/designsystem/src/main/java/in/koreatech/koin/core/designsystem/component/button/FilledButton.kt

@@ -21,6 +21,7 @@ enum class FilledButtonColors {
     Primary,
     Warning,
     Danger,
+    Success
 }
 
 @Composable
@@ -99,6 +100,13 @@ internal fun filledButtonColorByType(type: FilledButtonColors): ButtonColors = w
         disabledContainerColor = KoinTheme.colors.neutral300,
         disabledContentColor = KoinTheme.colors.neutral600
     )
+
+    FilledButtonColors.Success -> ButtonColors(
+        containerColor = KoinTheme.colors.success700,
+        contentColor = KoinTheme.colors.neutral0,
+        disabledContainerColor = KoinTheme.colors.neutral300,
+        disabledContentColor = KoinTheme.colors.neutral600
+    )
 }
 
 @Preview

core/designsystem/src/main/java/in/koreatech/koin/core/designsystem/component/picker/KoinPicker.kt

@@ -0,0 +1,140 @@
+package `in`.koreatech.koin.core.designsystem.component.picker
+
+import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Brush.Companion.verticalGradient
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
+import kotlinx.coroutines.flow.map
+
+/**
+ * 아이템 피커
+ * @param items 아이템 리스트
+ * @param pickerState PickerState
+ * @param visibleItemsCount 보여질 아이템 수
+ * @param modifier Modifier
+ * @param infiniteScroll 무한 스크롤 여부
+ * @param brushVerticalGradient vertical Brush 그라디언트 설정
+ * @param startIndex 시작 인덱스
+ * @param contentPadding 아이템 내부 Padding
+ * @param selectedTextStyle 선택 아이템 텍스트 스타일
+ * @param unselectedTextStyle 선택되지 않은 아이템 텍스트 스타일
+ * @param selectedItemColor 선택 아이템 색상
+ * @param unselectedItemColor 선택되지 않은 아이템 색상
+ */
+@Composable
+fun KoinPicker(
+    items: List<String>,
+    pickerState: PickerState,
+    visibleItemsCount: Int,
+    modifier: Modifier = Modifier,
+    infiniteScroll: Boolean = true,
+    brushVerticalGradient: Brush = verticalGradient(),
+    startIndex: Int = 0,
+    contentPadding: PaddingValues = PaddingValues(vertical = 2.dp),
+    selectedTextStyle: TextStyle = KoinTheme.typography.medium16,
+    unselectedTextStyle: TextStyle = KoinTheme.typography.medium16,
+    selectedItemColor: Color = KoinTheme.colors.primary500,
+    unselectedItemColor: Color = KoinTheme.colors.neutral500,
+) {
+
+    val newItems = if (infiniteScroll) items
+        else List(visibleItemsCount / 2) { "" } + items + List(visibleItemsCount / 2) { "" }
+
+    val visibleItemsMiddle = visibleItemsCount / 2
+    val listScrollCount = if (infiniteScroll) Int.MAX_VALUE else newItems.size
+    val listScrollMiddle = listScrollCount / 2
+    val listStartIndex =
+        (listScrollMiddle - listScrollMiddle % newItems.size - visibleItemsMiddle + startIndex).coerceAtLeast(startIndex)
+
+    val listState = rememberLazyListState(initialFirstVisibleItemIndex = listStartIndex)
+    val flingBehavior = rememberSnapFlingBehavior(lazyListState = listState)
+
+    var selectedItemIndex by remember { mutableIntStateOf(startIndex) }
+
+    var itemHeight by remember { mutableStateOf(0.dp) }
+    val density = LocalDensity.current
+
+    val fadingEdgeGradient = remember { brushVerticalGradient }
+
+    LazyColumn(
+        state = listState,
+        flingBehavior = flingBehavior,
+        modifier = modifier
+            .height(itemHeight * visibleItemsCount)
+            .fadingEdge(fadingEdgeGradient),
+    ) {
+        items(listScrollCount) { index ->
+            Text(
+                text = newItems.getItem(index),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+                style = if (selectedItemIndex == index) selectedTextStyle else unselectedTextStyle,
+                color = if (selectedItemIndex == index) selectedItemColor else unselectedItemColor,
+                modifier = Modifier
+                    .fillMaxSize()
+                    .onSizeChanged {
+                        itemHeight = with(density) {
+                            it.height.toDp()
+                        }
+                    }
+                    .padding(contentPadding)
+            )
+        }
+    }
+
+    LaunchedEffect(listState) {
+        snapshotFlow {
+            listState.firstVisibleItemIndex
+        }.map { index ->
+            index + visibleItemsMiddle
+        }.collect { middle ->
+            selectedItemIndex = middle
+            pickerState.selectedItem = newItems.getItem(middle)
+            pickerState.selectedItemIndex = middle % newItems.size - if (infiniteScroll.not()) visibleItemsMiddle else 0
+        }
+    }
+}
+
+@Composable
+fun rememberPickerState() = remember { PickerState() }
+
+class PickerState internal constructor() {
+    var selectedItem by mutableStateOf("")
+    var selectedItemIndex by mutableIntStateOf(0)
+}
+
+private fun Modifier.fadingEdge(brush: Brush) = this
+    .graphicsLayer(compositingStrategy = CompositingStrategy.Offscreen)
+    .drawWithContent {
+        drawContent()
+        drawRect(brush = brush, blendMode = BlendMode.DstIn)
+    }
+
+
+private fun List<String>.getItem(index: Int) = this[index % this.size]

core/designsystem/src/main/java/in/koreatech/koin/core/designsystem/component/snackbar/CustomSnackBarHost.kt

@@ -0,0 +1,146 @@
+package `in`.koreatech.koin.core.designsystem.component.snackbar
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+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.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import `in`.koreatech.koin.core.designsystem.noRippleClickable
+import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
+
+// Surface 사용하지 않을 경우, SnackBar 커스텀
+@Composable
+fun CustomSnackBarHost(
+    hotState: SnackbarHostState,
+    radius: Dp = 0.dp,
+    messageTextStyle: TextStyle = KoinTheme.typography.regular12.copy(
+        color = Color.White
+    ),
+    actionLabelTextStyle: TextStyle = KoinTheme.typography.regular12.copy(
+        color = Color.White
+    ),
+    background: Color = Color.Black,
+    alignment: Alignment = Alignment.BottomCenter,
+    paddingValues: PaddingValues = PaddingValues(bottom = 20.dp, start = 10.dp, end = 10.dp),
+    innerPaddingValues: PaddingValues = PaddingValues(horizontal = 10.dp, vertical = 16.dp)
+) {
+    SnackbarHost(
+        hostState = hotState,
+    ) { snackbarData ->
+        SnackBarContent(
+            messageText = snackbarData.visuals.message,
+            actionLabelText = snackbarData.visuals.actionLabel ?: "",
+            radius = radius,
+            background = background,
+            messageTextStyle = messageTextStyle,
+            actionLabelTextStyle = actionLabelTextStyle,
+            alignment = alignment,
+            paddingValues = paddingValues,
+            innerPaddingValues = innerPaddingValues,
+            onAction = { snackbarData.dismiss() }
+        )
+    }
+
+}
+
+@Composable
+private fun SnackBarContent(
+    messageText: String,
+    actionLabelText: String,
+    modifier: Modifier = Modifier,
+    radius: Dp = 0.dp,
+    background: Color = Color.Black,
+    messageTextStyle: TextStyle = KoinTheme.typography.regular12.copy(
+        color = Color.White
+    ),
+    actionLabelTextStyle: TextStyle = KoinTheme.typography.regular12.copy(
+        color = Color.White
+    ),
+    alignment: Alignment = Alignment.BottomCenter,
+    paddingValues: PaddingValues = PaddingValues(bottom = 20.dp, start = 10.dp, end = 10.dp),
+    innerPaddingValues: PaddingValues = PaddingValues(horizontal = 10.dp, vertical = 16.dp),
+    onAction: () -> Unit = {}
+) {
+    Box(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(paddingValues),
+        contentAlignment = alignment
+    ) {
+        Box(
+            modifier = modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(radius))
+                .background(background)
+                .padding(innerPaddingValues)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Spacer(modifier = Modifier.width(4.dp))
+                Text(
+                    text = messageText,
+                    style = messageTextStyle,
+                    modifier = Modifier.weight(1f),
+                )
+                Spacer(modifier = Modifier.weight(0.05f))
+                if (actionLabelText.isNotEmpty()) {
+                    Text(
+                        text = actionLabelText,
+                        style = actionLabelTextStyle,
+                        modifier = Modifier.weight(0.1f).noRippleClickable { onAction() }
+                    )
+                }
+
+            }
+        }
+    }
+}
+
+fun SnackbarHostState.dismissIfShown() {
+    if (currentSnackbarData != null) {
+        currentSnackbarData?.dismiss()
+    }
+}
+
+suspend fun SnackbarHostState.showSnackBarWithDismiss(
+    message: String,
+    actionLabel: String = "",
+    duration: SnackbarDuration = SnackbarDuration.Short
+) {
+    dismissIfShown()
+    showSnackbar(
+        message = message,
+        actionLabel = actionLabel,
+        duration = duration
+    )
+}
+
+@Preview(showBackground = true, showSystemUi = true)
+@Composable
+private fun SnackBarContentPreview() {
+    SnackBarContent(
+        messageText = "스낵바 메시지",
+        actionLabelText = "닫기",
+    )
+}