diff --git a/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift b/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift index 0615654b8025..63ed216c6e09 100644 --- a/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift +++ b/WordPress/Classes/Extensions/UINavigationController+SplitViewFullscreen.swift @@ -13,7 +13,7 @@ fileprivate let fadeAnimationDuration: TimeInterval = 0.1 // UIKit glitch. extension UINavigationController { @objc func pushFullscreenViewController(_ viewController: UIViewController, animated: Bool) { - guard let splitViewController = splitViewController, splitViewController.preferredDisplayMode != .primaryHidden else { + guard let splitViewController = splitViewController, splitViewController.preferredDisplayMode != .secondaryOnly else { pushViewController(viewController, animated: animated) return } diff --git a/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift b/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift index 566ccbf34de9..306c58c059e4 100644 --- a/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift +++ b/WordPress/Classes/Extensions/UITextField+WorkaroundContinueIssue.swift @@ -9,11 +9,10 @@ extension UITextField { /// Once we drop support for iOS 14, we could remove this extension entirely. /// public class func shouldActivateWorkaroundForBulgarianKeyboardCrash() -> Bool { - if #available(iOS 14.0, *) { - return true - } - - return false + // FIXME: Do _all_ versions above iOS 14 require the workaround? + // + // This code was changed to `true` at the time of making iOS 14 the minimum target. + true } /// We're swizzling `UITextField.becomeFirstResponder()` so that we can fix an issue with diff --git a/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift b/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift index de425f54c692..8caf37010046 100644 --- a/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift +++ b/WordPress/Classes/Services/Stories/WPMediaPicker+MediaPicker.swift @@ -60,8 +60,7 @@ class WPMediaPickerForKanvas: WPNavigationMediaPickerViewController, MediaPicker photoPicker.dataSource = WPPHAssetDataSource.sharedInstance() photoPicker.tabBarItem = UITabBarItem(title: Constants.photosTabBarTitle, image: Constants.photosTabBarIcon, tag: 0) - if #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled { + if FeatureFlag.mediaPickerPermissionsNotice.enabled { photoPicker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self) } @@ -182,8 +181,7 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate { } func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool { - guard #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled, + guard FeatureFlag.mediaPickerPermissionsNotice.enabled, picker.dataSource is WPPHAssetDataSource else { return false } @@ -192,10 +190,6 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate { } func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize { - guard #available(iOS 14.0, *) else { - return .zero - } - let header = DeviceMediaPermissionsHeader() header.translatesAutoresizingMaskIntoConstraints = false @@ -203,8 +197,7 @@ class MediaPickerDelegate: NSObject, WPMediaPickerViewControllerDelegate { } func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) { - guard #available(iOS 14.0, *), - let headerView = headerView as? DeviceMediaPermissionsHeader else { + guard let headerView = headerView as? DeviceMediaPermissionsHeader else { return } diff --git a/WordPress/Classes/Stores/StatsWidgetsStore.swift b/WordPress/Classes/Stores/StatsWidgetsStore.swift index 44a795a6b4e9..6f3f9a50c372 100644 --- a/WordPress/Classes/Stores/StatsWidgetsStore.swift +++ b/WordPress/Classes/Stores/StatsWidgetsStore.swift @@ -19,33 +19,24 @@ class StatsWidgetsStore { if let newTodayData = refreshStats(type: HomeWidgetTodayData.self) { HomeWidgetTodayData.write(items: newTodayData) - if #available(iOS 14.0, *) { - WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.todayKind) - } + WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.todayKind) } if let newAllTimeData = refreshStats(type: HomeWidgetAllTimeData.self) { HomeWidgetAllTimeData.write(items: newAllTimeData) - if #available(iOS 14.0, *) { - WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.allTimeKind) - } + WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.allTimeKind) } if let newThisWeekData = refreshStats(type: HomeWidgetThisWeekData.self) { HomeWidgetThisWeekData.write(items: newThisWeekData) - if #available(iOS 14.0, *) { - WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.thisWeekKind) - } + WidgetCenter.shared.reloadTimelines(ofKind: AppConfiguration.Widget.Stats.thisWeekKind) } } /// Initialize the local cache for widgets, if it does not exist func initializeStatsWidgetsIfNeeded() { - guard #available(iOS 14.0, *) else { - return - } if HomeWidgetTodayData.read() == nil { DDLogInfo("StatsWidgets: Writing initialization data into HomeWidgetTodayData.plist") HomeWidgetTodayData.write(items: initializeHomeWidgetData(type: HomeWidgetTodayData.self)) @@ -70,8 +61,7 @@ class StatsWidgetsStore { /// - widgetType: concrete type of the widget /// - stats: stats to be stored func storeHomeWidgetData(widgetType: T.Type, stats: Codable) { - guard #available(iOS 14.0, *), - let siteID = SiteStatsInformation.sharedInstance.siteID else { + guard let siteID = SiteStatsInformation.sharedInstance.siteID else { return } @@ -243,9 +233,6 @@ private extension StatsWidgetsStore { // MARK: - Extract this week data extension StatsWidgetsStore { func updateThisWeekHomeWidget(summary: StatsSummaryTimeIntervalData?) { - guard #available(iOS 14.0, *) else { - return - } switch summary?.period { case .day: guard summary?.periodEndDate == StatsDataHelper.currentDateForSite().normalizedDate() else { @@ -269,10 +256,6 @@ private extension StatsWidgetsStore { /// Observes WPAccountDefaultWordPressComAccountChanged notification and reloads widget data based on the state of account. /// The site data is not yet loaded after this notification and widget data cannot be cached for newly signed in account. func observeAccountChangesForWidgets() { - guard #available(iOS 14.0, *) else { - return - } - NotificationCenter.default.addObserver(forName: .WPAccountDefaultWordPressComAccountChanged, object: nil, queue: nil) { notification in @@ -294,10 +277,6 @@ private extension StatsWidgetsStore { /// Observes WPSigninDidFinishNotification notification and initializes the widget. /// The site data is loaded after this notification and widget data can be cached. func observeAccountSignInForWidgets() { - guard #available(iOS 14.0, *) else { - return - } - NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: WordPressAuthenticator.WPSigninDidFinishNotification), object: nil, queue: nil) { [weak self] _ in @@ -307,10 +286,6 @@ private extension StatsWidgetsStore { /// Observes applicationLaunchCompleted notification and runs migration. func observeApplicationLaunched() { - guard #available(iOS 14.0, *) else { - return - } - NotificationCenter.default.addObserver(forName: NSNotification.Name.applicationLaunchCompleted, object: nil, queue: nil) { [weak self] _ in diff --git a/WordPress/Classes/Utility/InteractiveNotificationsManager.swift b/WordPress/Classes/Utility/InteractiveNotificationsManager.swift index 2e08482c9f6c..8c328e43a563 100644 --- a/WordPress/Classes/Utility/InteractiveNotificationsManager.swift +++ b/WordPress/Classes/Utility/InteractiveNotificationsManager.swift @@ -618,11 +618,7 @@ extension InteractiveNotificationsManager: UNUserNotificationCenterDelegate { if notification.request.content.categoryIdentifier == NoteCategoryDefinition.bloggingReminderWeekly.rawValue || notification.request.content.categoryIdentifier == NoteCategoryDefinition.weeklyRoundup.rawValue { - if #available(iOS 14.0, *) { - completionHandler([.banner, .list, .sound]) - } else { - completionHandler([.alert, .sound]) - } + completionHandler([.banner, .list, .sound]) return } diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift index 15e254aefe10..74a5db4809da 100644 --- a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift +++ b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift @@ -636,8 +636,7 @@ class AztecPostViewController: UIViewController, PostEditor { // Required to work around an issue present in iOS 14 beta 2 // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460 - if #available(iOS 14.0, *), - presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier { + if presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier { dismiss(animated: true) } } @@ -1326,8 +1325,7 @@ private extension AztecPostViewController { alert.addCancelActionWithTitle(MoreSheetAlert.keepEditingTitle) - if #available(iOS 14.0, *), - let button = navigationBarManager.moreBarButtonItem.customView { + if let button = navigationBarManager.moreBarButtonItem.customView { // Required to work around an issue present in iOS 14 beta 2 // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460 alert.popoverPresentationController?.sourceRect = button.convert(button.bounds, to: navigationController?.navigationBar) diff --git a/WordPress/Classes/ViewRelated/Blog/Blogging Reminders/Time Selector/TimeSelectionView.swift b/WordPress/Classes/ViewRelated/Blog/Blogging Reminders/Time Selector/TimeSelectionView.swift index 56292412b4a8..584a0ee484c5 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blogging Reminders/Time Selector/TimeSelectionView.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blogging Reminders/Time Selector/TimeSelectionView.swift @@ -8,10 +8,7 @@ class TimeSelectionView: UIView { private lazy var timePicker: UIDatePicker = { let datePicker = UIDatePicker() - if #available(iOS 13.4, *) { - datePicker.preferredDatePickerStyle = .wheels - } - + datePicker.preferredDatePickerStyle = .wheels datePicker.datePickerMode = .time datePicker.translatesAutoresizingMaskIntoConstraints = false datePicker.setDate(selectedTime, animated: false) diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift index 3e9d25caf070..2e33865e0d89 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift +++ b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController+SiteIcon.swift @@ -92,10 +92,6 @@ extension SitePickerViewController { } func showEmojiPicker() { - guard #available(iOS 14.0, *) else { - return - } - var pickerView = SiteIconPickerView() pickerView.onCompletion = { [weak self] image in diff --git a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift index 440cd9ea79af..ae1fa97619a5 100644 --- a/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift +++ b/WordPress/Classes/ViewRelated/Blog/Site Picker/SitePickerViewController.swift @@ -88,11 +88,7 @@ extension SitePickerViewController: BlogDetailHeaderViewDelegate { showUpdateSiteIconAlert() } - if #available(iOS 14.0, *) { - showSiteIconSelectionAlert() - } else { - showUpdateSiteIconAlert() - } + showSiteIconSelectionAlert() } func siteIconReceivedDroppedImage(_ image: UIImage?) { diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift index 84f501fd34f8..6569b268d15c 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift @@ -68,8 +68,7 @@ class GutenbergMediaPickerHelper: NSObject { picker.delegate = self picker.mediaPicker.registerClass(forReusableCellOverlayViews: DisabledVideoOverlay.self) - if #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled { + if FeatureFlag.mediaPickerPermissionsNotice.enabled { picker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self) } @@ -137,8 +136,7 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate { } func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool { - guard #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled, + guard FeatureFlag.mediaPickerPermissionsNotice.enabled, picker !== cameraPicker else { return false } @@ -147,10 +145,6 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate { } func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize { - guard #available(iOS 14.0, *) else { - return .zero - } - let header = DeviceMediaPermissionsHeader() header.translatesAutoresizingMaskIntoConstraints = false @@ -158,8 +152,7 @@ extension GutenbergMediaPickerHelper: WPMediaPickerViewControllerDelegate { } func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) { - guard #available(iOS 14.0, *), - let headerView = headerView as? DeviceMediaPermissionsHeader else { + guard let headerView = headerView as? DeviceMediaPermissionsHeader else { return } diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift index 80adc4f61813..491aebcda43d 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController+MoreActions.swift @@ -73,8 +73,7 @@ extension GutenbergViewController { ActionDispatcher.dispatch(NoticeAction.unlock) } - if #available(iOS 14.0, *), - let button = navigationBarManager.moreBarButtonItem.customView { + if let button = navigationBarManager.moreBarButtonItem.customView { // Required to work around an issue present in iOS 14 beta 2 // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460 alert.popoverPresentationController?.sourceRect = button.convert(button.bounds, to: navigationController?.navigationBar) diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index cdbb6949c318..a4160feef7bd 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -402,8 +402,7 @@ class GutenbergViewController: UIViewController, PostEditor, FeaturedImageDelega // Required to work around an issue present in iOS 14 beta 2 // https://github.com/wordpress-mobile/WordPress-iOS/issues/14460 - if #available(iOS 14.0, *), - presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier { + if presentedViewController?.view.accessibilityIdentifier == MoreSheetAlert.accessibilityIdentifier { dismiss(animated: true) } } diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift index d4388acbfd8b..2c714459f22a 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift @@ -74,20 +74,16 @@ extension Gutenberg.MediaType { private func getTypesFrom(_ allTypes: [String], conformingTo uttype: CFString) -> [String] { return allTypes.filter { - if #available(iOS 14.0, *) { - guard let allowedType = UTType($0), let requiredType = UTType(uttype as String) else { - return false - } - // Sometimes the compared type could be a supertype - // For example a self-hosted site without Jetpack may have "public.content" as allowedType - // Although "public.audio" conforms to "public.content", it's not true the other way around - if allowedType.isSupertype(of: requiredType) { - return true - } - return allowedType.conforms(to: requiredType) - } else { - return UTTypeConformsTo($0 as CFString, uttype) + guard let allowedType = UTType($0), let requiredType = UTType(uttype as String) else { + return false } + // Sometimes the compared type could be a supertype + // For example a self-hosted site without Jetpack may have "public.content" as allowedType + // Although "public.audio" conforms to "public.content", it's not true the other way around + if allowedType.isSupertype(of: requiredType) { + return true + } + return allowedType.conforms(to: requiredType) } } diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift index 3e6dcb508c06..db8972367dd4 100644 --- a/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift +++ b/WordPress/Classes/ViewRelated/Media/MediaLibraryPicker.swift @@ -24,8 +24,7 @@ final class MediaLibraryPicker: NSObject { picker.delegate = delegate picker.mediaPicker.registerClass(forReusableCellOverlayViews: DisabledVideoOverlay.self) - if #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled { + if FeatureFlag.mediaPickerPermissionsNotice.enabled { picker.mediaPicker.registerClass(forCustomHeaderView: DeviceMediaPermissionsHeader.self) } diff --git a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift index f269011b9e90..c88443f787e2 100644 --- a/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift +++ b/WordPress/Classes/ViewRelated/Media/MediaLibraryViewController.swift @@ -573,8 +573,7 @@ extension MediaLibraryViewController: WPMediaPickerViewControllerDelegate { } func mediaPickerControllerShouldShowCustomHeaderView(_ picker: WPMediaPickerViewController) -> Bool { - guard #available(iOS 14.0, *), - FeatureFlag.mediaPickerPermissionsNotice.enabled, + guard FeatureFlag.mediaPickerPermissionsNotice.enabled, picker != self else { return false } @@ -584,10 +583,6 @@ extension MediaLibraryViewController: WPMediaPickerViewControllerDelegate { } func mediaPickerControllerReferenceSize(forCustomHeaderView picker: WPMediaPickerViewController) -> CGSize { - guard #available(iOS 14.0, *) else { - return .zero - } - let header = DeviceMediaPermissionsHeader() header.translatesAutoresizingMaskIntoConstraints = false @@ -595,8 +590,7 @@ extension MediaLibraryViewController: WPMediaPickerViewControllerDelegate { } func mediaPickerController(_ picker: WPMediaPickerViewController, configureCustomHeaderView headerView: UICollectionReusableView) { - guard #available(iOS 14.0, *), - let headerView = headerView as? DeviceMediaPermissionsHeader else { + guard let headerView = headerView as? DeviceMediaPermissionsHeader else { return } diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift b/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift index d9897d7578c8..b59f9c1b5439 100644 --- a/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift +++ b/WordPress/Classes/ViewRelated/Reader/ReaderTableCardCell.swift @@ -36,9 +36,7 @@ class ReaderTopicsTableCardCell: UITableViewCell { // iOS 14 puts the contentView in the top of the view hierarchy // This conflicts with the tableView interaction, so we disable it - if #available(iOS 14, *) { - contentView.isUserInteractionEnabled = false - } + contentView.isUserInteractionEnabled = false } required init?(coder: NSCoder) { diff --git a/WordPress/Classes/ViewRelated/Stats/Today Widgets/WidgetStyles.swift b/WordPress/Classes/ViewRelated/Stats/Today Widgets/WidgetStyles.swift index a6a175c84fda..bc53b99e0bad 100644 --- a/WordPress/Classes/ViewRelated/Stats/Today Widgets/WidgetStyles.swift +++ b/WordPress/Classes/ViewRelated/Stats/Today Widgets/WidgetStyles.swift @@ -16,13 +16,16 @@ class WidgetStyles: NSObject { } }() - static var separatorVibrancyEffect: UIVibrancyEffect = { - if #available(iOS 13, *) { - return .widgetEffect(forVibrancyStyle: .separator) - } else { - return .widgetSecondary() - } - }() + // Note: Before supporting only iOS 14+, this used to be: + // + // - .widgetEffect(forVibrancyStyle: .separator) in iOS 13+ + // - .widgetSecondary() in previous versions + // + // Hopefully this information is useful if the current implementation is not visually satisfying. + static var separatorVibrancyEffect = UIVibrancyEffect( + blurEffect: UIBlurEffect(style: .regular), + style: .separator + ) static func configureSeparator(_ separator: UIView) { // Both colors are need for the vibrancy effect. diff --git a/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift b/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift index 81d9191b1476..0d52957f0638 100644 --- a/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift +++ b/WordPress/Classes/ViewRelated/System/Action Sheet/ActionSheetViewController.swift @@ -148,14 +148,7 @@ class ActionSheetViewController: UIViewController { } private func createButton(_ handler: @escaping () -> Void) -> UIButton { - let button: UIButton - if #available(iOS 14.0, *) { - button = UIButton(type: .custom, primaryAction: UIAction(handler: { _ in handler() })) - } else { - button = ClosureButton(frame: .zero, closure: { - handler() - }) - } + let button = UIButton(type: .custom, primaryAction: UIAction(handler: { _ in handler() })) button.titleLabel?.font = Constants.Button.font button.setTitleColor(Constants.Button.textColor, for: .normal) diff --git a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift index a0357f08724d..8ba24a4922c3 100644 --- a/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift +++ b/WordPress/Classes/ViewRelated/System/WPSplitViewController.swift @@ -101,7 +101,7 @@ class WPSplitViewController: UISplitViewController { super.viewDidLoad() delegate = self - preferredDisplayMode = .allVisible + preferredDisplayMode = .oneBesideSecondary extendedLayoutIncludesOpaqueBars = true } @@ -204,7 +204,7 @@ class WPSplitViewController: UISplitViewController { override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { super.traitCollectionDidChange(previousTraitCollection) - if hasHorizontallyCompactView() && preferredDisplayMode == .primaryHidden { + if hasHorizontallyCompactView() && preferredDisplayMode == .secondaryOnly { setPrimaryViewControllerHidden(false, animated: false) } } @@ -377,7 +377,7 @@ class WPSplitViewController: UISplitViewController { } let updateDisplayMode = { - self.preferredDisplayMode = (hidden) ? .primaryHidden : .allVisible + self.preferredDisplayMode = (hidden) ? .secondaryOnly : .oneBesideSecondary } if animated { @@ -564,7 +564,7 @@ extension WPSplitViewController: UINavigationControllerDelegate { } let hasFullscreenViewControllersInStack = navigationController.viewControllers.filter({$0 is PrefersFullscreenDisplay}).count > 0 - let isCurrentlyFullscreen = preferredDisplayMode != .allVisible + let isCurrentlyFullscreen = preferredDisplayMode != .oneBesideSecondary // Handle popping from fullscreen view controllers // diff --git a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift index 7dbe33cc184e..8915f94ccb64 100644 --- a/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift +++ b/WordPress/WordPressUITests/Utils/XCTest+Extensions.swift @@ -18,12 +18,7 @@ extension XCTestCase { app.activate() // Media permissions alert handler - let alertButtonTitle: String - if #available(iOS 14.0, *) { - alertButtonTitle = "Allow Access to All Photos" - } else { - alertButtonTitle = "OK" - } + let alertButtonTitle = "Allow Access to All Photos" systemAlertHandler(alertTitle: "“WordPress” Would Like to Access Your Photos", alertButton: alertButtonTitle) }