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.

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

locale support #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import com.commandiron.wheel_picker_compose.core.TimeFormat
import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
import com.commandiron.wheelpickercompose.ui.theme.WheelPickerComposeTheme
import java.time.LocalDateTime
import java.util.Locale

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down Expand Up @@ -49,6 +50,7 @@ class MainActivity : ComponentActivity() {
startDateTime = LocalDateTime.of(
2025, 10, 20, 5, 30
),
dateLocale = Locale.US,
minDateTime = LocalDateTime.now(),
maxDateTime = LocalDateTime.of(
2025, 10, 20, 5, 30
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ import com.commandiron.wheel_picker_compose.core.DefaultWheelDatePicker
import com.commandiron.wheel_picker_compose.core.SelectorProperties
import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
import java.time.LocalDate
import java.util.Locale

@Composable
fun WheelDatePicker(
modifier: Modifier = Modifier,
startDate: LocalDate = LocalDate.now(),
dateLocale: Locale = Locale.getDefault(),
minDate: LocalDate = LocalDate.MIN,
maxDate: LocalDate = LocalDate.MAX,
yearsRange: IntRange? = IntRange(1922, 2122),
Expand All @@ -30,6 +32,7 @@ fun WheelDatePicker(
DefaultWheelDatePicker(
modifier,
startDate,
dateLocale,
minDate,
maxDate,
yearsRange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import com.commandiron.wheel_picker_compose.core.SelectorProperties
import com.commandiron.wheel_picker_compose.core.TimeFormat
import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
import java.time.LocalDateTime
import java.util.Locale

@Composable
fun WheelDateTimePicker(
modifier: Modifier = Modifier,
startDateTime: LocalDateTime = LocalDateTime.now(),
dateLocale: Locale = Locale.getDefault(),
minDateTime: LocalDateTime = LocalDateTime.MIN,
maxDateTime: LocalDateTime = LocalDateTime.MAX,
yearsRange: IntRange? = IntRange(1922, 2122),
Expand All @@ -32,6 +34,7 @@ fun WheelDateTimePicker(
DefaultWheelDateTimePicker(
modifier,
startDateTime,
dateLocale,
minDateTime,
maxDateTime,
yearsRange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ import com.commandiron.wheel_picker_compose.core.SelectorProperties
import com.commandiron.wheel_picker_compose.core.TimeFormat
import com.commandiron.wheel_picker_compose.core.WheelPickerDefaults
import java.time.LocalTime
import java.util.Locale

@Composable
fun WheelTimePicker(
modifier: Modifier = Modifier,
startTime: LocalTime = LocalTime.now(),
dateLocale: Locale = Locale.getDefault(),
minTime: LocalTime = LocalTime.MIN,
maxTime: LocalTime = LocalTime.MAX,
timeFormat: TimeFormat = TimeFormat.HOUR_24,
Expand All @@ -31,6 +33,7 @@ fun WheelTimePicker(
DefaultWheelTimePicker(
modifier,
startTime,
dateLocale,
minTime,
maxTime,
timeFormat,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import java.text.DateFormatSymbols
import java.time.LocalDate
import java.util.Locale

@Composable
internal fun DefaultWheelDatePicker(
modifier: Modifier = Modifier,
startDate: LocalDate = LocalDate.now(),
dateLocale: Locale = Locale.getDefault(),
minDate: LocalDate = LocalDate.MIN,
maxDate: LocalDate = LocalDate.MAX,
yearsRange: IntRange? = IntRange(1922, 2122),
Expand All @@ -37,8 +39,8 @@ internal fun DefaultWheelDatePicker(
val months = (1..12).map {
Month(
text = if(size.width / 3 < 55.dp){
DateFormatSymbols().shortMonths[it - 1]
} else DateFormatSymbols().months[it - 1],
DateFormatSymbols(dateLocale).shortMonths[it - 1]
} else DateFormatSymbols(dateLocale).months[it - 1],
value = it,
index = it - 1
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import java.time.LocalDateTime
import java.time.temporal.ChronoUnit
import java.util.Locale

@Composable
internal fun DefaultWheelDateTimePicker(
modifier: Modifier = Modifier,
startDateTime: LocalDateTime = LocalDateTime.now(),
dateLocale: Locale = Locale.getDefault(),
minDateTime: LocalDateTime = LocalDateTime.MIN,
maxDateTime: LocalDateTime = LocalDateTime.MAX,
yearsRange: IntRange? = IntRange(1922, 2122),
Expand Down Expand Up @@ -50,6 +52,7 @@ internal fun DefaultWheelDateTimePicker(
//Date
DefaultWheelDatePicker(
startDate = startDateTime.toLocalDate(),
dateLocale = dateLocale,
yearsRange = yearsRange,
size = DpSize(
width = if(yearsRange == null ) size.width * 3 / 6 else size.width * 3 / 5 ,
Expand Down Expand Up @@ -98,6 +101,7 @@ internal fun DefaultWheelDateTimePicker(
//Time
DefaultWheelTimePicker(
startTime = startDateTime.toLocalTime(),
dateLocale = dateLocale,
timeFormat = timeFormat,
size = DpSize(
width = if(yearsRange == null ) size.width * 3 / 6 else size.width * 2 / 5 ,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,17 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import java.time.LocalDate
import java.time.LocalTime
import java.time.format.DateTimeFormatter
import java.time.temporal.ChronoUnit
import java.util.Locale

@Composable
internal fun DefaultWheelTimePicker(
modifier: Modifier = Modifier,
startTime: LocalTime = LocalTime.now(),
dateLocale: Locale = Locale.getDefault(),
minTime: LocalTime = LocalTime.MIN,
maxTime: LocalTime = LocalTime.MAX,
timeFormat: TimeFormat = TimeFormat.HOUR_24,
Expand Down Expand Up @@ -59,12 +63,12 @@ internal fun DefaultWheelTimePicker(

val amPms = listOf(
AmPm(
text = "AM",
text = amPmStringByLocale(AmPmValue.AM, dateLocale),
value = AmPmValue.AM,
index = 0
),
AmPm(
text = "PM",
text = amPmStringByLocale(AmPmValue.PM, dateLocale),
value = AmPmValue.PM,
index = 1
)
Expand Down Expand Up @@ -389,6 +393,19 @@ private fun amPmValueFromTime(time: LocalTime): AmPmValue {
return if(time.hour > 11) AmPmValue.PM else AmPmValue.AM
}

private fun amPmStringByLocale(amPmValue: AmPmValue, locale: Locale): String {
val amPmTime = with(LocalDate.now()) {
if (amPmValue == AmPmValue.AM) {
atTime(0, 0)
} else {
atTime(12, 0)
}
}
val timeFormat = DateTimeFormatter.ofPattern("a", locale)

return amPmTime.format(timeFormat)
}




Expand Down