From 2cb16f489f782029936217a85fcebd4647e4d256 Mon Sep 17 00:00:00 2001
From: "Murugan, Vimal" <vimal.murugan@one.verizon.com>
Date: Wed, 11 Nov 2020 23:14:17 +0530
Subject: [PATCH] date picker updated

---
 .../Atomic/Extensions/UIDatePicker+Extension.swift     | 10 ++++++++++
 MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift |  2 +-
 MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m        | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/MVMCoreUI/Atomic/Extensions/UIDatePicker+Extension.swift b/MVMCoreUI/Atomic/Extensions/UIDatePicker+Extension.swift
index 4c1acfcb..1d17b194 100644
--- a/MVMCoreUI/Atomic/Extensions/UIDatePicker+Extension.swift
+++ b/MVMCoreUI/Atomic/Extensions/UIDatePicker+Extension.swift
@@ -20,6 +20,11 @@ public extension UIDatePicker {
         let locale = NSLocale.current as NSLocale
         datePicker.locale = locale as Locale
         datePicker.calendar = locale.object(forKey: .calendar) as? Calendar
+        //To support old style wheel
+        if #available(iOS 13.4, *) {
+            datePicker.preferredDatePickerStyle = .wheels
+            datePicker.sizeToFit()
+        }
         textField.inputView = datePicker
         
         return datePicker
@@ -30,6 +35,11 @@ public extension UIDatePicker {
         let datePicker = UIDatePicker()
         datePicker.backgroundColor = .mvmWhite
         datePicker.datePickerMode = .time
+        //To support old style wheel
+        if #available(iOS 13.4, *) {
+            datePicker.preferredDatePickerStyle = .wheels
+            datePicker.sizeToFit()
+        }
         textField.inputView = datePicker
 
         return datePicker
diff --git a/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift b/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
index ba464f68..a7c92a08 100644
--- a/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
+++ b/MVMCoreUI/Atomic/Templates/ListPageTemplateModel.swift
@@ -67,7 +67,7 @@ import Foundation
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encodeModelsIfPresent(molecules, forKey: .molecules)
         try container.encode(line, forKey: .line)
-        try container.encode(scrollToRowIndex, forKey: .scrollToRowIndex)
+        try container.encodeIfPresent(scrollToRowIndex, forKey: .scrollToRowIndex)
     }
 }
 
diff --git a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
index 84ad5f5d..cbfa8193 100644
--- a/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
+++ b/MVMCoreUI/Utility/MVMCoreUICommonViewsUtility.m
@@ -118,6 +118,11 @@ static const CGFloat VertialShadowOffset = 6;
     NSLocale *locale = [NSLocale currentLocale];
     datePicker.locale = locale;
     datePicker.calendar = [locale objectForKey:NSLocaleCalendar];
+    //To handle new style in ios 13.4 and above
+    if (@available(iOS 13.4, *)) {
+        [datePicker setPreferredDatePickerStyle:UIDatePickerStyleWheels];
+        [datePicker sizeToFit];
+    }
     datePicker = datePicker;
     textField.inputView = datePicker;
     return datePicker;
@@ -128,6 +133,11 @@ static const CGFloat VertialShadowOffset = 6;
     datePicker.backgroundColor = [UIColor whiteColor];
     datePicker.datePickerMode = UIDatePickerModeTime;
     datePicker = datePicker;
+    //To handle new style in ios 13.4 and above
+    if (@available(iOS 13.4, *)) {
+        [datePicker setPreferredDatePickerStyle:UIDatePickerStyleWheels];
+        [datePicker sizeToFit];
+    }
     textField.inputView = datePicker;
     
     return datePicker;