Skip to content
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.

Sign up for GitHub

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

[UI/YAF-30] 알람 설정 시 'Time / Hour / Minute' 을 조정하도록 한다 #28

Merged
merged 5 commits into from
Jan 12, 2025
Merged

[UI/YAF-30] 알람 설정 시 'Time / Hour / Minute' 을 조정하도록 한다 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be982af
[REFACTOR/#20] OrbitPicker, OrbitYearMonthPicker 상태 호이스팅
DongChyeon Jan 12, 2025
efc1e6d
[UI/#20] 알람 설정 화면 OrbitPicker 추가
DongChyeon Jan 12, 2025
cea2c33
[FEAT/#20] 기존 사용 중인 OrbitPicker, OrbitYearMonthPicker에 onValueChange …
DongChyeon Jan 12, 2025
2a56a0a
[REFACTOR/#20] ktlint formatting
DongChyeon Jan 12, 2025
c5e2f58
[REFACTOR/#20] OrbitPickerItem 값 변경 시에만 onValueChange 호출
DongChyeon Jan 12, 2025
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
67 changes: 54 additions & 13 deletions core/ui/src/main/java/com/yapp/ui/component/timepicker/OrbitPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.yapp.ui.component.timepicker

import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand All @@ -26,6 +27,7 @@ import java.util.Locale
fun OrbitPicker(
modifier: Modifier = Modifier,
itemSpacing: Dp = 2.dp,
onValueChange: (String, Int, Int) -> Unit,
) {
Surface(
modifier = modifier
Expand All @@ -47,9 +49,7 @@ fun OrbitPicker(
val hourPickerState = rememberPickerState()
val minutePickerState = rememberPickerState()

Box(
modifier = Modifier.fillMaxWidth(),
) {
Box(modifier = Modifier.fillMaxWidth()) {
Box(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -58,6 +58,7 @@ fun OrbitPicker(
.height(50.dp)
.background(OrbitTheme.colors.gray_700, shape = RoundedCornerShape(12.dp)),
)

Row(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -68,40 +69,80 @@ fun OrbitPicker(
state = amPmPickerState,
items = amPmItems,
visibleItemsCount = 3,
infiniteScroll = false,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2Medium,
modifier = Modifier.weight(1f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2Medium,
itemSpacing = itemSpacing,
infiniteScroll = false,
onValueChange = {
onPickerValueChange(
amPmPickerState,
hourPickerState,
minutePickerState,
onValueChange,
)
},
)

OrbitPickerItem(
state = hourPickerState,
items = hourItems,
visibleItemsCount = 5,
infiniteScroll = true,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2Medium,
modifier = Modifier.weight(1f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2Medium,
itemSpacing = itemSpacing,
infiniteScroll = true,
onValueChange = {
onPickerValueChange(
amPmPickerState,
hourPickerState,
minutePickerState,
onValueChange,
)
},
)

OrbitPickerItem(
state = minutePickerState,
items = minuteItems,
visibleItemsCount = 5,
infiniteScroll = true,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2Medium,
modifier = Modifier.weight(1f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2Medium,
itemSpacing = itemSpacing,
infiniteScroll = true,
onValueChange = {
onPickerValueChange(
amPmPickerState,
hourPickerState,
minutePickerState,
onValueChange,
)
},
)
}
}
}
}
}

private fun onPickerValueChange(
amPmState: PickerState,
hourState: PickerState,
minuteState: PickerState,
onValueChange: (String, Int, Int) -> Unit,
) {
val amPm = amPmState.selectedItem
val hour = hourState.selectedItem.toIntOrNull() ?: 0
val minute = minuteState.selectedItem.toIntOrNull() ?: 0
onValueChange(amPm, hour, minute)
}

@Preview(showBackground = true)
@Composable
fun BottomSheetPickerPreview() {
OrbitPicker()
OrbitPicker { amPm, hour, minute ->
Log.d("OrbitPicker", "amPm: $amPm, hour: $hour, minute: $minute")
}
}
8 changes: 7 additions & 1 deletion core/ui/src/main/java/com/yapp/ui/component/timepicker/OrbitPickerItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ fun OrbitPickerItem(
infiniteScroll: Boolean = true,
textStyle: TextStyle,
itemSpacing: Dp,
onValueChange: (String) -> Unit,
) {
val visibleItemsMiddle = visibleItemsCount / 2
val listScrollCount = if (infiniteScroll) Int.MAX_VALUE else items.size + visibleItemsMiddle * 2
Expand Down Expand Up @@ -71,7 +72,11 @@ fun OrbitPickerItem(
.collect { centerIndex ->
if (centerIndex != null) {
val adjustedIndex = centerIndex % items.size
state.selectedItem = items[adjustedIndex]
val newValue = items[adjustedIndex]
if (newValue != state.selectedItem) {
state.selectedItem = newValue
onValueChange(newValue)
}
}
}
}
Expand Down Expand Up @@ -157,6 +162,7 @@ fun OrbitPickerPreview() {
visibleItemsCount = 5,
textStyle = TextStyle.Default,
itemSpacing = 8.dp,
onValueChange = {},
)
}
}
54 changes: 38 additions & 16 deletions core/ui/src/main/java/com/yapp/ui/component/timepicker/OrbitYearMonthPicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.yapp.ui.component.timepicker

import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -28,6 +29,7 @@ import java.util.Locale
fun OrbitYearMonthPicker(
modifier: Modifier = Modifier,
itemSpacing: Dp = 12.dp,
onValueChange: (String, Int, Int, Int) -> Unit,
) {
val screenWidth = LocalConfiguration.current.screenWidthDp.dp

Expand All @@ -46,9 +48,7 @@ fun OrbitYearMonthPicker(
val lunarItems = remember { listOf("음력", "양력") }
val yearItems = remember { (1900..2025).map { it.toString() } }
val monthItems = remember { (1..12).map { it.toString() } }
val dayItems = remember {
(1..31).map { String.format(Locale.ROOT, "%02d", it) }
}
val dayItems = remember { (1..31).map { String.format(Locale.ROOT, "%02d", it) } }

val lunarPickerState = rememberPickerState()
val yearPickerState = rememberPickerState()
Expand All @@ -67,6 +67,7 @@ fun OrbitYearMonthPicker(
.height(totalItemHeight)
.background(OrbitTheme.colors.gray_700, shape = RoundedCornerShape(12.dp)),
)

Row(
modifier = Modifier
.fillMaxWidth()
Expand All @@ -77,51 +78,72 @@ fun OrbitYearMonthPicker(
state = lunarPickerState,
items = lunarItems,
visibleItemsCount = 3,
infiniteScroll = false,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2SemiBold,
modifier = Modifier.width(screenWidth * 0.2f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2SemiBold,
itemSpacing = itemSpacing,
infiniteScroll = false,
onValueChange = { onPickerValueChange(lunarPickerState, yearPickerState, monthPickerState, dayPickerState, onValueChange) },
)
OrbitPickerItem(
state = yearPickerState,
items = yearItems,
visibleItemsCount = 5,
infiniteScroll = true,
startIndex = 90,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2SemiBold,
modifier = Modifier.width(screenWidth * 0.25f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2SemiBold,
itemSpacing = itemSpacing,
infiniteScroll = true,
onValueChange = { onPickerValueChange(lunarPickerState, yearPickerState, monthPickerState, dayPickerState, onValueChange) },
)
OrbitPickerItem(
state = monthPickerState,
items = monthItems,
visibleItemsCount = 5,
infiniteScroll = true,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2SemiBold,
modifier = Modifier.width(screenWidth * 0.16f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2SemiBold,
itemSpacing = itemSpacing,
infiniteScroll = true,
onValueChange = { onPickerValueChange(lunarPickerState, yearPickerState, monthPickerState, dayPickerState, onValueChange) },
)
OrbitPickerItem(
state = dayPickerState,
items = dayItems,
visibleItemsCount = 5,
infiniteScroll = true,
itemSpacing = itemSpacing,
textStyle = OrbitTheme.typography.title2SemiBold,
modifier = Modifier.width(screenWidth * 0.16f),
textModifier = Modifier.padding(8.dp),
textStyle = OrbitTheme.typography.title2SemiBold,
itemSpacing = itemSpacing,
infiniteScroll = true,
onValueChange = { onPickerValueChange(lunarPickerState, yearPickerState, monthPickerState, dayPickerState, onValueChange) },
)
}
}
}
}
}

private fun onPickerValueChange(
lunarPickerState: PickerState,
yearPickerState: PickerState,
monthPickerState: PickerState,
dayPickerState: PickerState,
onValueChange: (String, Int, Int, Int) -> Unit,
) {
val lunar = lunarPickerState.selectedItem
val year = yearPickerState.selectedItem.toIntOrNull() ?: 1900
val month = monthPickerState.selectedItem.toIntOrNull() ?: 1
val day = dayPickerState.selectedItem.toIntOrNull() ?: 1

onValueChange(lunar, year, month, day)
}

@Preview(showBackground = true)
@Composable
fun OrbitYearMonthPickerPreview() {
OrbitYearMonthPicker()
OrbitYearMonthPicker { lunar, year, month, day ->
Log.d("OrbitYearMonthPicker", "lunar: $lunar, year: $year, month: $month, day: $day")
}
}
80 changes: 80 additions & 0 deletions feature/home/src/main/java/com/yapp/alarm/AlarmAddEditScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package com.yapp.alarm

import android.util.Log
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
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.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.yapp.designsystem.theme.OrbitTheme
import com.yapp.ui.component.timepicker.OrbitPicker

@Composable
fun AlarmAddEditRoute() {
AlarmAddEditScreen()
}

@Composable
fun AlarmAddEditScreen() {
Column(
modifier = Modifier.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
) {
AlarmAddEditTopBar(
title = "1일 12시간 후에 울려요",
onBack = { },
)
OrbitPicker(
modifier = Modifier.padding(top = 40.dp),
) { amPm, hour, minute ->
Log.d("AlarmAddEditScreen", "amPm: $amPm, hour: $hour, minute: $minute")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p3
�나중에 지우기 기억하기

}
}
}

@Composable
private fun AlarmAddEditTopBar(
title: String,
onBack: () -> Unit,
) {
Box(
modifier = Modifier
.fillMaxWidth()
.height(56.dp)
.statusBarsPadding(),
contentAlignment = Alignment.Center,
) {
Icon(
painter = painterResource(id = core.designsystem.R.drawable.ic_back),
contentDescription = "Back",
tint = OrbitTheme.colors.white,
modifier = Modifier
.clickable(onClick = onBack)
.padding(start = 20.dp)
.align(Alignment.CenterStart),
)

Text(
title,
style = OrbitTheme.typography.body1SemiBold,
color = OrbitTheme.colors.white,
)
}
}

@Preview
@Composable
fun AlarmAddEditScreenPreview() {
AlarmAddEditScreen()
}
6 changes: 2 additions & 4 deletions feature/home/src/main/java/com/yapp/home/HomeNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
import androidx.navigation.compose.composable
import com.yapp.alarm.AlarmAddEditRoute

fun NavController.navigateHome(navOptions: NavOptions) {
navigate(HomeRoute.HOME, navOptions)
Expand All @@ -16,10 +17,7 @@ fun NavGraphBuilder.homeNavGraph(
modifier: Modifier = Modifier,
) {
composable(route = HomeRoute.HOME) {
HomeRoute(
padding = padding,
modifier = modifier,
)
AlarmAddEditRoute()
}
}

Expand Down
4 changes: 2 additions & 2 deletions feature/navigator/src/main/java/com/yapp/navigator/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import android.content.pm.ActivityInfo
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import com.kms.onboarding.OnboardingRoute
import com.yapp.designsystem.theme.OrbitTheme
import dagger.hilt.android.AndroidEntryPoint

Expand All @@ -17,7 +16,8 @@ class MainActivity : ComponentActivity() {
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
setContent {
OrbitTheme {
OnboardingRoute(onFinishOnboarding = {})
MainScreen()
// OnboardingRoute(onFinishOnboarding = {})
}
}
}
Expand Down
Loading
Loading