Skip to content

[FIX/#290] 버전 코드 업데이트 및 사소한 수정 #291

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

Merged
MoonsuKang merged 3 commits into from
Jul 3, 2025
Merged

[FIX/#290] 버전 코드 업데이트 및 사소한 수정 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b34ae87
[FIX/#290] 리마인드 시간 초기값 설정
MoonsuKang Jul 3, 2025
0bf5ae0
[MOD/#290] 타임피커 제목 수정
MoonsuKang Jul 3, 2025
b50bc46
[FIX/#290] 버전 코드 및 버전 이름 업데이트
MoonsuKang Jul 3, 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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ android {
applicationId = "com.sopt.clody"
minSdk = 28
targetSdk = 35
versionCode = 26
versionName = "1.2.0"
versionCode = 27
versionName = "1.3.0"
val kakaoApiKey: String = properties.getProperty("kakao.api.key")
val amplitudeApiKey: String = properties.getProperty("amplitude.api.key")
val googleAdmobAppId: String = properties.getProperty("GOOGLE_ADMOB_APP_ID", "")
Expand Down
28 changes: 17 additions & 11 deletions ...in/java/com/sopt/clody/presentation/ui/auth/component/timepicker/BottomSheetTimePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ fun BottomSheetTimePicker(
onDismissRequest: () -> Unit,
onRemindTimeSelected: (TimePeriod, String, String) -> Unit,
) {
val amPmEnumItems = listOf(TimePeriod.AM, TimePeriod.PM)
val amPmLabelItems = amPmEnumItems.map { it.getLabel() }

val hourItems = remember { (1..12).map { it.toString() } }
val minuteItems = remember { listOf("00", "10", "20", "30", "40", "50") }

val amPmPickerState = rememberPickerState().apply {
selectedItem = amPmLabelItems[1]
}
val hourPickerState = rememberPickerState().apply {
selectedItem = "9"
}
val minutePickerState = rememberPickerState().apply {
selectedItem = "30"
}

Surface(
modifier = Modifier
.fillMaxWidth()
Expand Down Expand Up @@ -76,16 +92,6 @@ fun BottomSheetTimePicker(
}
}

val amPmEnumItems = listOf(TimePeriod.AM, TimePeriod.PM)
val amPmLabelItems = amPmEnumItems.map { it.getLabel() }

val hourItems = remember { (1..12).map { it.toString() } }
val minuteItems = remember { listOf("00", "10", "20", "30", "40", "50") }

val amPmPickerState = rememberPickerState()
val hourPickerState = rememberPickerState()
val minutePickerState = rememberPickerState()

Box(modifier = Modifier.fillMaxWidth()) {
Box(
modifier = Modifier
Expand Down Expand Up @@ -130,7 +136,7 @@ fun BottomSheetTimePicker(
ClodyButton(
onClick = {
val selectedLabel = amPmPickerState.selectedItem
val selectedPeriod = amPmEnumItems.getOrNull(amPmLabelItems.indexOf(selectedLabel)) ?: TimePeriod.PM
val selectedPeriod = amPmEnumItems.getOrElse(amPmLabelItems.indexOf(selectedLabel)) { TimePeriod.PM }
val selectedHour = hourPickerState.selectedItem
val selectedMinute = minutePickerState.selectedItem

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<string name="terms_next">다음</string>

<!-- 타임피커 -->
<string name="time_picker_title">다른 시간 보기</string>
<string name="time_picker_title">발송 시간 변경</string>

<!--온보딩 알림설정-->
<string name="time_reminder_title">몇시에 감사일기\n작성 알림을 드릴까요?</string>
Expand Down