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

[FIX] Picker bounces back when dragging to last date or time #52

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FIX] Picker bounces back when dragging to last date or time #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions ...compose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelDatePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ internal fun DefaultWheelDatePicker(
startIndex = dayOfMonths.find { it.value== startDate.dayOfMonth }?.index ?: 0,
onScrollFinished = { snappedIndex ->

val newDayOfMonth = dayOfMonths.find { it.index == snappedIndex }?.value
val newDayOfMonth =
if (snappedIndex >= dayOfMonths.size) dayOfMonths.last().value
else dayOfMonths.find { it.index == snappedIndex }?.value

newDayOfMonth?.let {
val newDate = snappedDate.withDayOfMonth(newDayOfMonth)
Expand Down Expand Up @@ -119,7 +121,8 @@ internal fun DefaultWheelDatePicker(
startIndex = months.find { it.value== startDate.monthValue }?.index ?: 0,
onScrollFinished = { snappedIndex ->

val newMonth = months.find { it.index == snappedIndex }?.value
val newMonth = if (snappedIndex >= months.size) months.last().value
else months.find { it.index == snappedIndex }?.value

newMonth?.let {

Expand Down Expand Up @@ -164,7 +167,8 @@ internal fun DefaultWheelDatePicker(
startIndex = years.find { it.value == startDate.year }?.index ?:0,
onScrollFinished = { snappedIndex ->

val newYear = years.find { it.index == snappedIndex }?.value
val newYear = if (snappedIndex >= years.size) years.last().value
else years.find { it.index == snappedIndex }?.value

newYear?.let {

Expand Down
18 changes: 12 additions & 6 deletions ...compose/src/main/java/com/commandiron/wheel_picker_compose/core/DefaultWheelTimePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,15 @@ internal fun DefaultWheelTimePicker(
),
onScrollFinished = { snappedIndex ->

val newHour = if(timeFormat == TimeFormat.HOUR_24) {
hours.find { it.index == snappedIndex }?.value
val newHour = if (timeFormat == TimeFormat.HOUR_24) {
if (snappedIndex >= hours.size) hours.last().value
else
hours.find { it.index == snappedIndex }?.value
} else {
amPmHourToHour24(
amPmHours.find { it.index == snappedIndex }?.value ?: 0,
if (snappedIndex >= amPmHours.size) amPmHours.last().value
else
amPmHours.find { it.index == snappedIndex }?.value ?: 0,
snappedTime.minute,
snappedAmPm.value
)
Expand Down Expand Up @@ -162,10 +166,12 @@ internal fun DefaultWheelTimePicker(
),
onScrollFinished = { snappedIndex ->

val newMinute = minutes.find { it.index == snappedIndex }?.value
val newMinute = if (snappedIndex >= minutes.size) minutes.last().value
else minutes.find { it.index == snappedIndex }?.value

val newHour = if(timeFormat == TimeFormat.HOUR_24) {
hours.find { it.value == snappedTime.hour }?.value
val newHour = if (timeFormat == TimeFormat.HOUR_24) {
if (snappedIndex >= hours.size) hours.last().value
else hours.find { it.value == snappedTime.hour }?.value
} else {
amPmHourToHour24(
amPmHours.find { it.value == localTimeToAmPmHour(snappedTime) }?.value ?: 0,
Expand Down