Skip to content

Bugfix: DatePicker DST Offset Handling #466

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

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

Bugfix: DatePicker DST Offset Handling #466

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
24 changes: 17 additions & 7 deletions Sources/SkipUI/SkipUI/Controls/DatePicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,31 +193,41 @@ public struct DatePicker : View, Renderable {
guard isPresented.value else {
return
}
let timeZoneOffset = Double(TimeZone.current.secondsFromGMT())
let initialSeconds = selection.wrappedValue.timeIntervalSince1970 + timeZoneOffset
let initialMillis = datePickerMillis(from: selection.wrappedValue)
let displayMode = EnvironmentValues.shared.verticalSizeClass == .compact ? DisplayMode.Input : DisplayMode.Picker

// Create selectable dates filter if range is specified
let minMillis: Long? = minDate != nil ? Long((minDate!.timeIntervalSince1970 + timeZoneOffset) * 1000.0) : nil
let maxMillis: Long? = maxDate != nil ? Long((maxDate!.timeIntervalSince1970 + timeZoneOffset) * 1000.0) : nil
let minMillis: Long? = minDate != nil ? datePickerMillis(from: minDate!) : nil
let maxMillis: Long? = maxDate != nil ? datePickerMillis(from: maxDate!) : nil

let state: DatePickerState
if minMillis != nil || maxMillis != nil {
// SKIP INSERT: val selectableDates = object : SelectableDates { override fun isSelectableDate(utcTimeMillis: Long): Boolean { val min = minMillis; val max = maxMillis; if (min != null && utcTimeMillis < min) return false; if (max != null && utcTimeMillis > max) return false; return true } override fun isSelectableYear(year: Int): Boolean { return true } }
state = rememberDatePickerState(initialSelectedDateMillis: Long(initialSeconds * 1000.0), initialDisplayMode: displayMode, selectableDates: selectableDates)
state = rememberDatePickerState(initialSelectedDateMillis: initialMillis, initialDisplayMode: displayMode, selectableDates: selectableDates)
} else {
state = rememberDatePickerState(initialSelectedDateMillis: Long(initialSeconds * 1000.0), initialDisplayMode: displayMode)
state = rememberDatePickerState(initialSelectedDateMillis: initialMillis, initialDisplayMode: displayMode)
}

let colors = DatePickerDefaults.colors(selectedDayContainerColor: tintColor, selectedYearContainerColor: tintColor, todayDateBorderColor: tintColor, currentYearContentColor: tintColor)
SimpleDatePickerDialog(onDismissRequest: { isPresented.value = false }) {
DatePicker(modifier: context.modifier, state: state, colors: colors)
}
if let millis = state.selectedDateMillis {
dateSelected(Date(timeIntervalSince1970: Double(millis / 1000.0) - timeZoneOffset))
dateSelected(date(fromDatePickerMillis: millis))
}
}

private func datePickerMillis(from date: Date) -> Long {
let timeZoneOffset = Double(TimeZone.current.secondsFromGMT(for: date))
return Long((date.timeIntervalSince1970 + timeZoneOffset) * 1000.0)
}

private func date(fromDatePickerMillis millis: Long) -> Date {
let utcDate = Date(timeIntervalSince1970: Double(millis) / 1000.0)
let timeZoneOffset = Double(TimeZone.current.secondsFromGMT(for: utcDate))
return Date(timeIntervalSince1970: utcDate.timeIntervalSince1970 - timeZoneOffset)
}

// SKIP INSERT: @OptIn(ExperimentalMaterial3Api::class)
@Composable private func RenderTimePicker(context: ComposeContext, isPresented: MutableState<Bool>, tintColor: androidx.compose.ui.graphics.Color, hour: Int, minute: Int, timeSelected: (Int, Int) -> Void) {
guard isPresented.value else {
Expand Down
Loading