Skip to content

Feature/selections component #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
package com.suwiki.core.designsystem.component.dropdown

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
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.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp
import com.suwiki.core.designsystem.R

@Composable
fun SuwikiDropDownMenu(
label: String = "",
onClickLabel: () -> Unit = {},
onDismissRequest: () -> Unit = {},
expanded: Boolean = false,
content: @Composable ColumnScope.() -> Unit,
) {
Column(
horizontalAlignment = Alignment.Start,
) {
Row(
modifier = Modifier
.clip(RoundedCornerShape(10.dp))
.clickable(onClick = onClickLabel)
.background(Color.LightGray)
.padding(
horizontal = 9.dp,
vertical = 6.dp,
),
verticalAlignment = Alignment.CenterVertically,
) {
Text(
text = label,
)
Image(
painter = painterResource(id = R.drawable.ic_dropdown_arrow_down),
contentDescription = "",
)
}

MaterialTheme(
shapes = MaterialTheme.shapes.copy(extraSmall = RoundedCornerShape(10.dp)),
) {
DropdownMenu(
modifier = Modifier
.width(106.dp)
.background(Color.White)
.padding(vertical = 8.dp)
.clip(RoundedCornerShape(20.dp)),
offset = DpOffset(x = 0.dp, y = 6.dp),
expanded = expanded,
onDismissRequest = onDismissRequest,
content = content,
)
}
}
}

@Preview(showSystemUi = true)
@Composable
fun SuwikiDropDownMenuPreview() {
var isSemesterDropDownExpanded by remember {
mutableStateOf(false)
}

var isExamDropdownExpanded by remember {
mutableStateOf(false)
}

Column {
SuwikiDropDownMenu(
label = "์ˆ˜๊ฐ•ํ•™๊ธฐ ์„ ํƒ",
expanded = isSemesterDropDownExpanded,
onClickLabel = { isSemesterDropDownExpanded = true },
onDismissRequest = { isSemesterDropDownExpanded = false },
) {
repeat(4) {
SuwikiDropdownMenuItem(
text = "menu",
)
}
}

SuwikiDropDownMenu(
label = "์‹œํ—˜์œ ํ˜• ์„ ํƒ",
expanded = isExamDropdownExpanded,
onClickLabel = { isExamDropdownExpanded = true },
onDismissRequest = { isExamDropdownExpanded = false },
) {
repeat(4) {
SuwikiDropdownMenuItem(
text = "menu",
)
}
}
}
}

@Composable
fun SuwikiDropdownMenuItem(
onClick: () -> Unit = {},
text: String = "",
) {
DropdownMenuItem(
modifier = Modifier.fillMaxWidth(),
onClick = onClick,
text = {
Text(
text = text,
textAlign = TextAlign.Start,
)
},
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package com.suwiki.core.designsystem.component.slider

import androidx.annotation.IntRange
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Slider
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableFloatStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
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.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import kotlin.math.round

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun SuwikiSlider(
value: Float = 2.5f,
onValueChange: (Float) -> Unit = { _ -> },
@IntRange(from = 0)
steps: Int = 9,
valueRange: ClosedFloatingPointRange<Float> = 0f..5f,
interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
) {
var isHovering by rememberSaveable {
mutableStateOf(false)
}

val label = (round(value * 100) / 100).toString()

Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
) {
Slider(
modifier = Modifier.weight(1f).height(SUWIKI_THUMB_WIDTH_LABEL_HEIGHT.dp),
value = value,
onValueChange = {
isHovering = true
onValueChange(it)
},
onValueChangeFinished = { isHovering = false },
valueRange = valueRange,
steps = steps,
interactionSource = interactionSource,
thumb = {
if (isHovering) {
SuwikiSliderThumbWithLabel(
label = label,
)
} else {
SuwikiSliderThumb()
}
},
track = {
SuwikiSliderTrack(
value = value,
valueRange = valueRange,
height = 6.dp,
shape = RoundedCornerShape(4.dp),
)
},
)

Text(text = label)
}
}

@Preview(showBackground = true, backgroundColor = 0xFFFFFF)
@Composable
fun SuwikiSliderPreview() {
var sliderPosition by rememberSaveable {
mutableFloatStateOf(2.5f)
}

Box(modifier = Modifier.padding(vertical = 40.dp)) {
SuwikiSlider(
value = sliderPosition,
onValueChange = { sliderPosition = if (it < 0.5) 0.5F else it },
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.suwiki.core.designsystem.component.slider

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
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.tooling.preview.Preview
import androidx.compose.ui.unit.dp

@Composable
fun SuwikiSliderThumb() {
Box(
modifier = Modifier.size(28.dp),
contentAlignment = Alignment.Center,
) {
Spacer(
modifier = Modifier
.size(16.dp)
.clip(CircleShape)
.background(Color.Blue),
)
}
}

@Preview
@Composable
fun SuwikiSliderThumbPreview() {
SuwikiSliderThumb()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.suwiki.core.designsystem.component.slider

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.core.designsystem.R

const val SUWIKI_THUMB_WIDTH_LABEL_HEIGHT = 88

@Composable
fun SuwikiSliderThumbWithLabel(
modifier: Modifier = Modifier,
label: String,
) {
Box(
modifier = modifier.height(SUWIKI_THUMB_WIDTH_LABEL_HEIGHT.dp),
) {
Image(
painter = painterResource(id = R.drawable.ic_slider_thumb_hovered),
contentDescription = "",
)

Box(
modifier = Modifier.size(28.dp),
contentAlignment = Alignment.Center,
) {
Text(
text = label,
textAlign = TextAlign.Center,
color = Color.White,
)
}
}
}

@Preview
@Composable
fun SuwikiSliderThumbWithLabelPreview() {
SuwikiSliderThumbWithLabel(label = "5.0")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package com.suwiki.core.designsystem.component.slider

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp

@Composable
@ExperimentalMaterial3Api
fun SuwikiSliderTrack(
modifier: Modifier = Modifier,
value: Float,
valueRange: ClosedFloatingPointRange<Float>,
height: Dp = 6.dp,
shape: Shape = RoundedCornerShape(4.dp),
) {
Box(
modifier = modifier
.track(height = height, shape = shape)
.background(Color.LightGray),
) {
Box(
modifier = modifier
.progress(
value = value,
valueRange = valueRange,
height = height,
shape = shape,
)
.background(Color.Blue),
)
}
}

private fun Modifier.track(
height: Dp = 6.dp,
shape: Shape = CircleShape,
) = fillMaxWidth()
.heightIn(min = height)
.clip(shape)

private fun Modifier.progress(
value: Float,
valueRange: ClosedFloatingPointRange<Float>,
height: Dp = 6.dp,
shape: Shape = CircleShape,
) =
fillMaxWidth(fraction = value / valueRange.endInclusive - valueRange.start)
.heightIn(min = height)
.clip(shape)
11 changes: 11 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_dropdown_arrow_down.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M5.25,7.5L9,11.25L12.75,7.5H5.25Z"
android:strokeAlpha="0.38"
android:fillColor="#1D1B20"
android:fillAlpha="0.38"/>
</vector>
Loading