From 16512f2b58b92df64fef419ebad34a54795d9f19 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 25 Oct 2022 22:47:06 +1100 Subject: [PATCH] Remove redundant `#available(iOS 12, *)` checks They always return `true` since the deployment version is higher than iOS 12. --- WordPress/Classes/Models/ValueTransformers.swift | 4 ---- .../SearchableActivityConvertable.swift | 9 +++------ .../Gutenberg/Views/GutenGhostView.swift | 6 ++---- .../App Settings/AppSettingsViewController.swift | 16 ++++++---------- .../ViewRelated/NUX/SignupEpilogueCell.swift | 4 ---- .../FloatingActionButton.swift | 6 +----- .../System/WPSplitViewController.swift | 4 +--- 7 files changed, 13 insertions(+), 36 deletions(-) diff --git a/WordPress/Classes/Models/ValueTransformers.swift b/WordPress/Classes/Models/ValueTransformers.swift index ae74873b85fd..36a69c0e0fa2 100644 --- a/WordPress/Classes/Models/ValueTransformers.swift +++ b/WordPress/Classes/Models/ValueTransformers.swift @@ -3,10 +3,6 @@ import Foundation extension ValueTransformer { @objc static func registerCustomTransformers() { - guard #available(iOS 12.0, *) else { - return - } - CoordinateValueTransformer.register() NSErrorValueTransformer.register() SetValueTransformer.register() diff --git a/WordPress/Classes/Utility/Spotlight/SearchableActivityConvertable.swift b/WordPress/Classes/Utility/Spotlight/SearchableActivityConvertable.swift index e4545af5d547..1b5fa1c150a2 100644 --- a/WordPress/Classes/Utility/Spotlight/SearchableActivityConvertable.swift +++ b/WordPress/Classes/Utility/Spotlight/SearchableActivityConvertable.swift @@ -103,13 +103,10 @@ extension SearchableActivityConvertable where Self: UIViewController { activity.isEligibleForSearch = true activity.isEligibleForHandoff = false + activity.isEligibleForPrediction = true - if #available(iOS 12.0, *) { - activity.isEligibleForPrediction = true - - if let wpActivityType = WPActivityType(rawValue: activityType) { - activity.suggestedInvocationPhrase = wpActivityType.suggestedInvocationPhrase - } + if let wpActivityType = WPActivityType(rawValue: activityType) { + activity.suggestedInvocationPhrase = wpActivityType.suggestedInvocationPhrase } // Set the UIViewController's userActivity property, which is defined in UIResponder. Doing this allows diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Views/GutenGhostView.swift b/WordPress/Classes/ViewRelated/Gutenberg/Views/GutenGhostView.swift index 5c6d30ce3b23..feeb473d9eff 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/Views/GutenGhostView.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/Views/GutenGhostView.swift @@ -14,10 +14,8 @@ class GutenGhostView: UIView { @IBOutlet var toolbarViews: [UIView]! @IBOutlet weak var toolbarTopBorderView: UIView! { didSet { - if #available(iOS 12.0, *) { - let isDarkStyle = traitCollection.userInterfaceStyle == .dark - toolbarTopBorderView.isHidden = isDarkStyle - } + let isDarkStyle = traitCollection.userInterfaceStyle == .dark + toolbarTopBorderView.isHidden = isDarkStyle } } diff --git a/WordPress/Classes/ViewRelated/Me/App Settings/AppSettingsViewController.swift b/WordPress/Classes/ViewRelated/Me/App Settings/AppSettingsViewController.swift index 757d97d6adb5..c3c41c02cf64 100644 --- a/WordPress/Classes/ViewRelated/Me/App Settings/AppSettingsViewController.swift +++ b/WordPress/Classes/ViewRelated/Me/App Settings/AppSettingsViewController.swift @@ -287,9 +287,7 @@ class AppSettingsViewController: UITableViewController { tableView?.deselectSelectedRowWithAnimation(true) - if #available(iOS 12.0, *) { - NSUserActivity.deleteAllSavedUserActivities {} - } + NSUserActivity.deleteAllSavedUserActivities {} let notice = Notice(title: NSLocalizedString("Siri Reset Confirmation", value: "Successfully cleared Siri Shortcut Suggestions", comment: "Notice displayed to the user after clearing the Siri activity donations."), feedbackType: .success) ActionDispatcher.dispatch(NoticeAction.post(notice)) @@ -460,14 +458,12 @@ private extension AppSettingsViewController { spotlightClearCacheRow ] - if #available(iOS 12.0, *) { - let siriClearCacheRow = BrandedNavigationRow( - title: NSLocalizedString("Siri Reset Prompt", value: "Clear Siri Shortcut Suggestions", comment: "Label for button that clears user activities donated to Siri."), - action: clearSiriActivityDonations(), - accessibilityIdentifier: "spotlightClearCacheButton") + let siriClearCacheRow = BrandedNavigationRow( + title: NSLocalizedString("Siri Reset Prompt", value: "Clear Siri Shortcut Suggestions", comment: "Label for button that clears user activities donated to Siri."), + action: clearSiriActivityDonations(), + accessibilityIdentifier: "spotlightClearCacheButton") - tableRows.append(siriClearCacheRow) - } + tableRows.append(siriClearCacheRow) tableRows.append(mediaRemoveLocation) let removeLocationFooterText = NSLocalizedString("Removes location metadata from photos before uploading them to your site.", comment: "Explanatory text for removing the location from uploaded media.") diff --git a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift index 0875b8d283b9..86ded546898e 100644 --- a/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift +++ b/WordPress/Classes/ViewRelated/NUX/SignupEpilogueCell.swift @@ -188,10 +188,6 @@ private extension SignupEpilogueCell { } func configureTextContentTypeIfNeeded(for cellType: EpilogueCellType) { - guard #available(iOS 12, *) else { - return - } - switch cellType { case .displayName: cellField.textContentType = .name diff --git a/WordPress/Classes/ViewRelated/System/Floating Create Button/FloatingActionButton.swift b/WordPress/Classes/ViewRelated/System/Floating Create Button/FloatingActionButton.swift index 8b9d1a28bba8..f3e8af77c2e2 100644 --- a/WordPress/Classes/ViewRelated/System/Floating Create Button/FloatingActionButton.swift +++ b/WordPress/Classes/ViewRelated/System/Floating Create Button/FloatingActionButton.swift @@ -36,11 +36,7 @@ class FloatingActionButton: UIButton { layer.shadowColor = Constants.shadowColor.cgColor layer.shadowOffset = .zero layer.shadowRadius = Constants.shadowRadius - if #available(iOS 12.0, *) { - layer.shadowOpacity = traitCollection.userInterfaceStyle == .light ? 1 : 0 - } else { - layer.shadowOpacity = 1 - } + layer.shadowOpacity = traitCollection.userInterfaceStyle == .light ? 1 : 0 } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { diff --git a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift index 938b9ab72dde..a0357f08724d 100644 --- a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift +++ b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift @@ -146,9 +146,7 @@ class WPSplitViewController: UISplitViewController { // This is to work around an apparent bug in iOS 13 where the detail view is assuming the system is in dark // mode when switching out of the app and then back in. Here we ensure the overridden user interface style // traits are replaced with the correct current traits before we use them. - if #available(iOS 12.0, *) { - traits.append(UITraitCollection(userInterfaceStyle: traitCollection.userInterfaceStyle)) - } + traits.append(UITraitCollection(userInterfaceStyle: traitCollection.userInterfaceStyle)) return UITraitCollection(traitsFrom: traits) }