-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #175 from TimerTiTi/release-1.3.1
Release 1.3.1
- Loading branch information
Showing
20 changed files
with
195 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 53 additions & 61 deletions
114
core/designsystem/src/main/kotlin/com/titi/app/core/designsystem/component/TdsTimePicker.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,81 @@ | ||
| package com.titi.app.core.designsystem.component | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.TimePicker | ||
| import androidx.compose.material3.TimePickerState | ||
| 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.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import com.chargemap.compose.numberpicker.AMPMHours | ||
| import com.chargemap.compose.numberpicker.HoursNumberPicker | ||
| import com.skydoves.balloon.ArrowPositionRules | ||
| import com.skydoves.balloon.BalloonAnimation | ||
| import com.skydoves.balloon.BalloonSizeSpec | ||
| import com.skydoves.balloon.compose.Balloon | ||
| import com.skydoves.balloon.compose.rememberBalloonBuilder | ||
| import com.skydoves.balloon.compose.setBackgroundColor | ||
| import com.titi.app.core.designsystem.R | ||
| import com.titi.app.core.designsystem.model.TdsDialogInfo | ||
| import com.titi.app.core.designsystem.theme.TdsColor | ||
| import com.titi.app.core.designsystem.theme.TdsTextStyle | ||
| import com.titi.app.core.util.toOnlyTime | ||
| import java.time.LocalDateTime | ||
|
|
||
| @SuppressLint("DefaultLocale") | ||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun TdsTimePicker( | ||
| state: TimePickerState, | ||
| themeColor: TdsColor, | ||
| localDateTime: LocalDateTime, | ||
| pickerValue: AMPMHours, | ||
| onValueChange: (AMPMHours) -> Unit, | ||
| onTimeChanged: (LocalDateTime) -> Unit, | ||
| ) { | ||
| val builder = rememberBalloonBuilder { | ||
| setArrowSize(10) | ||
| setArrowPosition(0.5f) | ||
| setArrowPositionRules(ArrowPositionRules.ALIGN_ANCHOR) | ||
| setWidth(BalloonSizeSpec.WRAP) | ||
| setHeight(BalloonSizeSpec.WRAP) | ||
| setPadding(12) | ||
| setMarginHorizontal(12) | ||
| setCornerRadius(8f) | ||
| setBackgroundColor(color = Color(0xCCFFFFFF)) | ||
| setBalloonAnimation(BalloonAnimation.ELASTIC) | ||
| var showTimePicker by remember { | ||
| mutableStateOf(false) | ||
| } | ||
|
|
||
| Balloon( | ||
| builder = builder, | ||
| balloonContent = { | ||
| HoursNumberPicker( | ||
| modifier = Modifier | ||
| .width(180.dp) | ||
| .height(120.dp), | ||
| value = pickerValue, | ||
| dividersColor = Color.Transparent, | ||
| onValueChange = { | ||
| onValueChange(it as AMPMHours) | ||
| if (showTimePicker) { | ||
| TdsDialog( | ||
| tdsDialogInfo = TdsDialogInfo.Confirm( | ||
| title = "", | ||
| positiveText = stringResource(R.string.common_text_ok), | ||
| negativeText = stringResource(R.string.common_text_cancel), | ||
| onPositive = { | ||
| onTimeChanged( | ||
| localDateTime.withHour(state.hour).withMinute(state.minute), | ||
| ) | ||
| }, | ||
| ) | ||
| }, | ||
| ) { balloonWindow -> | ||
| TdsText( | ||
| modifier = Modifier | ||
| .width(90.dp) | ||
| .background( | ||
| color = themeColor | ||
| .getColor() | ||
| .copy(0.5f), | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| .border( | ||
| width = 2.dp, | ||
| color = themeColor.getColor(), | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| .padding(vertical = 4.dp) | ||
| .clickable { balloonWindow.showAlignBottom() }, | ||
| text = localDateTime.toOnlyTime(), | ||
| textStyle = TdsTextStyle.SEMI_BOLD_TEXT_STYLE, | ||
| color = TdsColor.TEXT, | ||
| fontSize = 22.sp, | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| ), | ||
| onShowDialog = { showTimePicker = it }, | ||
| ) { | ||
| TimePicker(state = state) | ||
| } | ||
| } | ||
|
|
||
| TdsText( | ||
| modifier = Modifier | ||
| .width(90.dp) | ||
| .background( | ||
| color = themeColor | ||
| .getColor() | ||
| .copy(0.5f), | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| .border( | ||
| width = 2.dp, | ||
| color = themeColor.getColor(), | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| .padding(vertical = 4.dp) | ||
| .clickable { showTimePicker = true }, | ||
| text = localDateTime.toOnlyTime(), | ||
| textStyle = TdsTextStyle.SEMI_BOLD_TEXT_STYLE, | ||
| color = TdsColor.TEXT, | ||
| fontSize = 22.sp, | ||
| textAlign = TextAlign.Center, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 0 additions & 27 deletions
27
feature/edit/src/main/kotlin/com/titi/app/feature/edit/mapper/TimeMapper.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.