Merge pull request #202 from DevTchernov/hotfix/ios-datetime-picker-bug

Hotfix/ios datetime picker bug

Author: Alex009

README.md

@@ -12,7 +12,8 @@ Current version - `0.1.0-dev-18`. Dev version is not tested in production tasks
 
 ## Roadmap
 - December-January: Test library in real project;
-- February: 0.1.0 release with flexible API; production usage at IceRock;
+- February: production usage at IceRock;
+- March: 0.1.0 release with flexible API;
 - First half of 2020: more widgets, more factories; figma template and generation of screens.
 
 ## Sample Screen

widgets-datetime-picker/src/iosMain/kotlin/dev/icerock/moko/widgets/datetimepicker/ShowDatePickerExt.kt

@@ -30,6 +30,7 @@ import platform.UIKit.UIControlEventTouchUpInside
 import platform.UIKit.UIApplication
 import platform.Foundation.NSBundle
 import platform.Foundation.NSDate
+import platform.Foundation.NSTimeIntervalSince1970
 
 actual class DatePickerDialogHandler(
     val positive: ((dialogId: Int, date: DateTime) -> Unit)?,
@@ -212,35 +213,31 @@ class DatePickerController(
             anchor = controlPanel.topAnchor
         ).active = true
 
-        val nsDate = NSDate()
-        val date = DateTime.nowUnix()
-        val diffDate = date - nsDate.timeIntervalSinceReferenceDate
-
-        if (startDate != null) {
-            startDate.unixMillis
-            datePicker.minimumDate = NSDate(startDate.unixMillis - diffDate)
-        }
-
-        if (endDate != null) {
-            endDate.unixMillis
-            datePicker.maximumDate = NSDate(endDate.unixMillis - diffDate)
-        }
+        datePicker.minimumDate = startDate?.toNSDate()
+        datePicker.maximumDate = endDate?.toNSDate()
 
         if (selectedDate != null) {
-            datePicker.setDate(NSDate(selectedDate.unixMillis - diffDate))
+            datePicker.setDate(selectedDate.toNSDate())
         }
 
         doneButton.setEventHandler(UIControlEventTouchUpInside) {
             this.dismissViewControllerAnimated(flag = true, completion = null)
             handler.positive?.invoke(
                 dialogId,
-                DateTime(diffDate + datePicker.date.timeIntervalSinceReferenceDate)
+                datePicker.date.toKlock()
             )
         }
         cancelButton.setEventHandler(UIControlEventTouchUpInside) {
             this.dismissViewControllerAnimated(flag = true, completion = null)
             handler.negative?.invoke(dialogId)
         }
     }
+}
+
+internal fun DateTime.toNSDate(): NSDate {
+    return NSDate((unixMillis / 1000) - NSTimeIntervalSince1970)
+}
 
+internal fun NSDate.toKlock(): DateTime {
+    return DateTime(unixMillis = (this.timeIntervalSinceReferenceDate() + NSTimeIntervalSince1970) * 1000)
 }