From c5f7a9fd2b3a2e4a3393129612a3c404a2a5353f Mon Sep 17 00:00:00 2001 From: AQ Date: Sun, 27 Sep 2020 15:17:25 -0700 Subject: [PATCH 1/2] Fix carb date picker --- Loop/View Controllers/CarbEntryViewController.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Loop/View Controllers/CarbEntryViewController.swift b/Loop/View Controllers/CarbEntryViewController.swift index 44801929fc..76d3f486b5 100644 --- a/Loop/View Controllers/CarbEntryViewController.swift +++ b/Loop/View Controllers/CarbEntryViewController.swift @@ -219,6 +219,9 @@ final class CarbEntryViewController: ChartsTableViewController, IdentifiableClas cell.titleLabel.text = NSLocalizedString("Date", comment: "Title of the carb entry date picker cell") cell.datePicker.isEnabled = isSampleEditable cell.datePicker.datePickerMode = .dateAndTime + if #available(iOS 14.0, *) { + cell.datePicker.preferredDatePickerStyle = .wheels + } cell.datePicker.maximumDate = Date(timeIntervalSinceNow: maximumDateFutureInterval) cell.datePicker.minuteInterval = 1 cell.date = date From 60b44ad8b55ddb68a2e9deea4534f550c43a584d Mon Sep 17 00:00:00 2001 From: AQ Date: Sun, 27 Sep 2020 15:56:54 -0700 Subject: [PATCH 2/2] Fix CI build --- Loop/View Controllers/CarbEntryViewController.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Loop/View Controllers/CarbEntryViewController.swift b/Loop/View Controllers/CarbEntryViewController.swift index 76d3f486b5..9c27f44e11 100644 --- a/Loop/View Controllers/CarbEntryViewController.swift +++ b/Loop/View Controllers/CarbEntryViewController.swift @@ -219,9 +219,11 @@ final class CarbEntryViewController: ChartsTableViewController, IdentifiableClas cell.titleLabel.text = NSLocalizedString("Date", comment: "Title of the carb entry date picker cell") cell.datePicker.isEnabled = isSampleEditable cell.datePicker.datePickerMode = .dateAndTime - if #available(iOS 14.0, *) { - cell.datePicker.preferredDatePickerStyle = .wheels - } + #if swift(>=5.2) + if #available(iOS 14.0, *) { + cell.datePicker.preferredDatePickerStyle = .wheels + } + #endif cell.datePicker.maximumDate = Date(timeIntervalSinceNow: maximumDateFutureInterval) cell.datePicker.minuteInterval = 1 cell.date = date