From faac6a9f1172c6a6c846f8a696a43644a60723ef Mon Sep 17 00:00:00 2001
From: crisp5 <96925442+crisp5@users.noreply.github.com>
Date: Thu, 12 Sep 2024 00:50:24 +0000
Subject: [PATCH] Set DatePicker state based on UTC time, not local time

---
 .../core/ui/common/datetimepicker/DatePickerDialog.kt         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ui/src/main/java/app/myzel394/numberhub/core/ui/common/datetimepicker/DatePickerDialog.kt b/core/ui/src/main/java/app/myzel394/numberhub/core/ui/common/datetimepicker/DatePickerDialog.kt
index 904c7315..b91440d1 100644
--- a/core/ui/src/main/java/app/myzel394/numberhub/core/ui/common/datetimepicker/DatePickerDialog.kt
+++ b/core/ui/src/main/java/app/myzel394/numberhub/core/ui/common/datetimepicker/DatePickerDialog.kt
@@ -60,7 +60,7 @@ fun DatePickerDialog(
     onConfirm: (ZonedDateTime) -> Unit,
 ) {
     val pickerState = rememberDatePickerState(
-        initialSelectedDateMillis = localDateTime.toEpochSecond() * 1000,
+        initialSelectedDateMillis = localDateTime.withZoneSameLocal(ZoneId.of("Z")).toEpochSecond() * 1000,
         yearRange = 0..9999,
     )
 
@@ -100,7 +100,7 @@ fun DatePickerDialog(
 
                                 val date = LocalDateTime.ofInstant(
                                     Instant.ofEpochMilli(millis),
-                                    ZoneId.systemDefault(),
+                                    ZoneId.of("Z"),
                                 )
 
                                 onConfirm(