From ee9c05e51863b62aa33f85c9061c83fff87899c1 Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Tue, 15 Feb 2022 22:43:16 +0100
Subject: [PATCH] Implemented DateFormatter for iOS

---
 .../utils/multiplatform/DateFormatter.kt       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/multiplatform-utils/src/iosMain/kotlin/net/dankito/utils/multiplatform/DateFormatter.kt b/multiplatform-utils/src/iosMain/kotlin/net/dankito/utils/multiplatform/DateFormatter.kt
index b9ffed3a..df97b71c 100644
--- a/multiplatform-utils/src/iosMain/kotlin/net/dankito/utils/multiplatform/DateFormatter.kt
+++ b/multiplatform-utils/src/iosMain/kotlin/net/dankito/utils/multiplatform/DateFormatter.kt
@@ -1,7 +1,6 @@
 package net.dankito.utils.multiplatform
 
-import kotlinx.datetime.LocalDate
-import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.*
 import platform.Foundation.*
 
 
@@ -36,20 +35,19 @@ actual class DateFormatter actual constructor(val pattern: String): NSDateFormat
 
 
     actual fun format(date: LocalDateTime): String {
-        return stringFromDate(date) // TODO: convert to NSDate when back on Mac
+        val instant = date.toInstant(TimeZone.currentSystemDefault())
+        val nsDate = instant.toNSDate()
+
+        return this.stringFromDate(nsDate)
     }
 
     actual fun parseDate(dateString: String): LocalDate? {
-        super.dateFromString(dateString)?.let { nsDate ->
-            return LocalDate(nsDate) // TODO: convert to NSDate when back on Mac
-        }
-
-        return null
+        return parse(dateString)?.date
     }
 
     actual fun parse(dateString: String): LocalDateTime? {
-        super.dateFromString(dateString)?.let { nsDate ->
-            return LocalDateTime(nsDate) // TODO: convert to NSDate when back on Mac
+        this.dateFromString(dateString)?.let { nsDate ->
+            return nsDate.toKotlinInstant().toLocalDateTime(TimeZone.currentSystemDefault())
         }
 
         return null