Skip to content

Fix/datepicker utc offset #368

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
John-Swindell wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix/datepicker utc offset #368

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
5 changes: 3 additions & 2 deletions core/ui/src/main/java/com/mhss/app/ui/components/common/DateTimeDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.mhss.app.ui.R
import com.mhss.app.util.date.at
import com.mhss.app.util.date.hour
import com.mhss.app.util.date.minute
import com.mhss.app.util.date.utcDateAt

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand All @@ -54,7 +55,7 @@ fun DateTimeDialog(
onClick = {
if (showTime) {
onDatePicked(
datePickerState.selectedDateMillis?.at(
datePickerState.selectedDateMillis?.utcDateAt(
timePickerState.hour,
timePickerState.minute
) ?: initialDate
Expand Down Expand Up @@ -108,7 +109,7 @@ fun DateDialog(
TextButton(
onClick = {
onDatePicked(
datePickerState.selectedDateMillis?.at(
datePickerState.selectedDateMillis?.utcDateAt(
initialDate.hour,
initialDate.minute
) ?: initialDate
Expand Down
13 changes: 13 additions & 0 deletions core/util/src/main/java/com/mhss/app/util/date/DateUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,19 @@ fun Long.at(hours: Int, minutes: Int): Long {
).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
}

fun Long.utcDateAt(hours: Int, minutes: Int): Long {
val date = Instant.fromEpochMilliseconds(this).toLocalDateTime(TimeZone.UTC).date
return LocalDateTime(
year = date.year,
month = date.month,
day = date.day,
hour = hours,
minute = minutes,
second = 0,
nanosecond = 0
).toInstant(TimeZone.currentSystemDefault()).toEpochMilliseconds()
}

fun Long.toDayOfWeek(): DayOfWeek {
return Instant
.fromEpochMilliseconds(this)
Expand Down