From 83a2ffe6bd0ae8851f4adde3d38f65e2a100116a Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 27 Feb 2018 03:24:08 -0300 Subject: [PATCH] Removing #available conditionals (#1578) --- .../ImageUploadTableViewController.swift | 1 - .../Assignees/IssueAssigneeAvatarCell.swift | 5 ++-- .../Assignees/IssueAssigneeUserCell.swift | 5 ++-- .../Details/IssueCommentDetailCell.swift | 5 ++-- .../Images/IssueCommentImageCell.swift | 5 ++-- Classes/Issues/Commit/IssueCommitCell.swift | 5 ++-- Classes/Issues/IssuesViewController.swift | 6 ++--- Classes/Login/LoginSplashViewController.swift | 26 +++++++------------ ...lRequestReviewCommentsViewController.swift | 7 +++-- .../RepositoryIssuesViewController.swift | 4 +-- Classes/Settings/SettingsViewController.swift | 7 ++--- Classes/Systems/Toast.swift | 7 +---- ...llectionViewCell+SafeAreaContentView.swift | 7 +---- .../UIScrollView+LeftRightSafeInset.swift | 18 ++++++------- Classes/Views/UIScrollView+ScrollToTop.swift | 8 +----- Classes/Views/UIView+BottomBorder.swift | 21 +++------------ 16 files changed, 43 insertions(+), 94 deletions(-) diff --git a/Classes/Image Upload/ImageUploadTableViewController.swift b/Classes/Image Upload/ImageUploadTableViewController.swift index 93e9d8a2..0aab2ad7 100755 --- a/Classes/Image Upload/ImageUploadTableViewController.swift +++ b/Classes/Image Upload/ImageUploadTableViewController.swift @@ -18,7 +18,6 @@ class ImageUploadTableViewController: UITableViewController { @IBOutlet private var previewImageView: UIImageView! { didSet { - guard #available(iOS 11, *) else { return } previewImageView.accessibilityIgnoresInvertColors = true } } diff --git a/Classes/Issues/Assignees/IssueAssigneeAvatarCell.swift b/Classes/Issues/Assignees/IssueAssigneeAvatarCell.swift index a133d8dc..b60eb91d 100644 --- a/Classes/Issues/Assignees/IssueAssigneeAvatarCell.swift +++ b/Classes/Issues/Assignees/IssueAssigneeAvatarCell.swift @@ -21,9 +21,8 @@ final class IssueAssigneeAvatarCell: UICollectionViewCell { imageView.layer.borderColor = Styles.Colors.Gray.light.color.cgColor imageView.layer.borderWidth = 1.0 / UIScreen.main.scale imageView.clipsToBounds = true - if #available(iOS 11, *) { - imageView.accessibilityIgnoresInvertColors = true - } + imageView.accessibilityIgnoresInvertColors = true + contentView.addSubview(imageView) } diff --git a/Classes/Issues/Assignees/IssueAssigneeUserCell.swift b/Classes/Issues/Assignees/IssueAssigneeUserCell.swift index dadd0d36..e4452263 100644 --- a/Classes/Issues/Assignees/IssueAssigneeUserCell.swift +++ b/Classes/Issues/Assignees/IssueAssigneeUserCell.swift @@ -24,9 +24,8 @@ final class IssueAssigneeUserCell: UICollectionViewCell, ListBindable { imageView.layer.borderColor = Styles.Colors.Gray.light.color.cgColor imageView.layer.borderWidth = 1.0 / UIScreen.main.scale imageView.clipsToBounds = true - if #available(iOS 11, *) { - imageView.accessibilityIgnoresInvertColors = true - } + imageView.accessibilityIgnoresInvertColors = true + contentView.addSubview(imageView) imageView.snp.makeConstraints { make in make.centerY.equalTo(contentView) diff --git a/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift b/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift index 33cda3b8..92810220 100644 --- a/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift +++ b/Classes/Issues/Comments/Details/IssueCommentDetailCell.swift @@ -32,9 +32,8 @@ final class IssueCommentDetailCell: IssueCommentBaseCell, ListBindable { imageView.configureForAvatar() imageView.isUserInteractionEnabled = true - if #available(iOS 11, *) { - imageView.accessibilityIgnoresInvertColors = true - } + imageView.accessibilityIgnoresInvertColors = true + imageView.addGestureRecognizer(UITapGestureRecognizer( target: self, action: #selector(IssueCommentDetailCell.onTapAvatar)) diff --git a/Classes/Issues/Comments/Images/IssueCommentImageCell.swift b/Classes/Issues/Comments/Images/IssueCommentImageCell.swift index ce75ac0b..92b0bc94 100644 --- a/Classes/Issues/Comments/Images/IssueCommentImageCell.swift +++ b/Classes/Issues/Comments/Images/IssueCommentImageCell.swift @@ -33,9 +33,8 @@ final class IssueCommentImageCell: IssueCommentBaseCell, ListBindable { super.init(frame: frame) imageView.contentMode = .scaleAspectFit - if #available(iOS 11, *) { - imageView.accessibilityIgnoresInvertColors = true - } + imageView.accessibilityIgnoresInvertColors = true + contentView.addSubview(imageView) spinner.hidesWhenStopped = true diff --git a/Classes/Issues/Commit/IssueCommitCell.swift b/Classes/Issues/Commit/IssueCommitCell.swift index 4f3ee22c..596389f3 100644 --- a/Classes/Issues/Commit/IssueCommitCell.swift +++ b/Classes/Issues/Commit/IssueCommitCell.swift @@ -47,9 +47,8 @@ final class IssueCommitCell: UICollectionViewCell { target: self, action: #selector(IssueCommitCell.onAvatar)) ) - if #available(iOS 11, *) { - avatarImageView.accessibilityIgnoresInvertColors = true - } + avatarImageView.accessibilityIgnoresInvertColors = true + contentView.addSubview(avatarImageView) avatarImageView.snp.makeConstraints { make in make.centerY.equalTo(contentView) diff --git a/Classes/Issues/IssuesViewController.swift b/Classes/Issues/IssuesViewController.swift index 6acb6256..28af145d 100644 --- a/Classes/Issues/IssuesViewController.swift +++ b/Classes/Issues/IssuesViewController.swift @@ -184,10 +184,8 @@ IssueManagingNavSectionControllerDelegate { } override func viewSafeAreaInsetsDidChange() { - if #available(iOS 11.0, *) { - super.viewSafeAreaInsetsDidChange() - feed.collectionView.updateSafeInset(container: view, base: Styles.Sizes.threadInset) - } + super.viewSafeAreaInsetsDidChange() + feed.collectionView.updateSafeInset(container: view, base: Styles.Sizes.threadInset) } // MARK: Private API diff --git a/Classes/Login/LoginSplashViewController.swift b/Classes/Login/LoginSplashViewController.swift index 60c0fc60..fdbedb7a 100644 --- a/Classes/Login/LoginSplashViewController.swift +++ b/Classes/Login/LoginSplashViewController.swift @@ -63,23 +63,17 @@ final class LoginSplashViewController: UIViewController, GithubSessionListener { // MARK: Private API @IBAction func onSignInButton(_ sender: Any) { - if #available(iOS 11.0, *) { - self.authSession = SFAuthenticationSession(url: loginURL, callbackURLScheme: callbackURLScheme, completionHandler: { [weak self] (callbackUrl, error) in - guard error == nil, let callbackUrl = callbackUrl else { - switch error! { - case SFAuthenticationError.canceledLogin: break - default: self?.handleError() - } - return + self.authSession = SFAuthenticationSession(url: loginURL, callbackURLScheme: callbackURLScheme, completionHandler: { [weak self] (callbackUrl, error) in + guard error == nil, let callbackUrl = callbackUrl else { + switch error! { + case SFAuthenticationError.canceledLogin: break + default: self?.handleError() } - self?.client.sessionManager.receivedCodeRedirect(url: callbackUrl) - }) - self.authSession?.start() - } else { - guard let safariController = try? SFSafariViewController.configured(with: loginURL) else { return } - self.safariController = safariController - present(safariController, animated: trueUnlessReduceMotionEnabled) - } + return + } + self?.client.sessionManager.receivedCodeRedirect(url: callbackUrl) + }) + self.authSession?.start() } @IBAction func onPersonalAccessTokenButton(_ sender: Any) { diff --git a/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift b/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift index 80ea8aa7..6db1d011 100644 --- a/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift +++ b/Classes/PullRequestReviews/PullRequestReviewCommentsViewController.swift @@ -86,10 +86,9 @@ PullRequestReviewReplySectionControllerDelegate { } override func viewSafeAreaInsetsDidChange() { - if #available(iOS 11.0, *) { - super.viewSafeAreaInsetsDidChange() - feed.collectionView.updateSafeInset(container: view, base: Styles.Sizes.threadInset) - } + super.viewSafeAreaInsetsDidChange() + feed.collectionView.updateSafeInset(container: view, base: Styles.Sizes.threadInset) + } // MARK: FeedDelegate diff --git a/Classes/Repository/RepositoryIssuesViewController.swift b/Classes/Repository/RepositoryIssuesViewController.swift index b2c24f7a..e36d47e6 100644 --- a/Classes/Repository/RepositoryIssuesViewController.swift +++ b/Classes/Repository/RepositoryIssuesViewController.swift @@ -52,9 +52,7 @@ SearchBarSectionControllerDelegate { // set the frame in -viewDidLoad is required when working with TabMan feed.collectionView.frame = view.bounds - if #available(iOS 11.0, *) { - feed.collectionView.contentInsetAdjustmentBehavior = .never - } + feed.collectionView.contentInsetAdjustmentBehavior = .never } // MARK: Overrides diff --git a/Classes/Settings/SettingsViewController.swift b/Classes/Settings/SettingsViewController.swift index bdeae604..531b694f 100644 --- a/Classes/Settings/SettingsViewController.swift +++ b/Classes/Settings/SettingsViewController.swift @@ -93,11 +93,8 @@ NewIssueTableViewControllerDelegate { guard let url = URL(string: "https://github.com/settings/connections/applications/\(Secrets.GitHub.clientId)") else { fatalError("Should always create GitHub issue URL") } // iOS 11 login uses SFAuthenticationSession which shares credentials with Safari.app - if #available(iOS 11.0, *) { - UIApplication.shared.open(url, options: [:]) - } else { - presentSafari(url: url) - } + UIApplication.shared.open(url, options: [:]) + } func onAccounts() { diff --git a/Classes/Systems/Toast.swift b/Classes/Systems/Toast.swift index 53e1083e..054ac241 100644 --- a/Classes/Systems/Toast.swift +++ b/Classes/Systems/Toast.swift @@ -175,12 +175,7 @@ private func rubberBandDistance(offset: CGFloat, dimension: CGFloat) -> CGFloat } private func anchor(view: UIView, referenceView: UIView) -> CGPoint { - let safeBottom: CGFloat - if #available(iOS 11.0, *) { - safeBottom = referenceView.safeAreaInsets.bottom - } else { - safeBottom = 0 - } + let safeBottom: CGFloat = referenceView.safeAreaInsets.bottom let bounds = referenceView.bounds let tabBarHeight: CGFloat = 49 diff --git a/Classes/Views/UICollectionViewCell+SafeAreaContentView.swift b/Classes/Views/UICollectionViewCell+SafeAreaContentView.swift index 3decc9e9..4dec077d 100644 --- a/Classes/Views/UICollectionViewCell+SafeAreaContentView.swift +++ b/Classes/Views/UICollectionViewCell+SafeAreaContentView.swift @@ -15,12 +15,7 @@ extension UICollectionViewCell { } func layoutContentViewForSafeAreaInsets(bounds: CGRect) { - let insets: UIEdgeInsets - if #available(iOS 11.0, *) { - insets = safeAreaInsets - } else { - insets = .zero - } + let insets: UIEdgeInsets = safeAreaInsets contentView.frame = CGRect( x: insets.left, y: bounds.minY, diff --git a/Classes/Views/UIScrollView+LeftRightSafeInset.swift b/Classes/Views/UIScrollView+LeftRightSafeInset.swift index a17564f1..0a5353a8 100644 --- a/Classes/Views/UIScrollView+LeftRightSafeInset.swift +++ b/Classes/Views/UIScrollView+LeftRightSafeInset.swift @@ -9,17 +9,15 @@ import UIKit extension UIScrollView { - + func updateSafeInset(container view: UIView, base inset: UIEdgeInsets) { - if #available(iOS 11.0, *) { - let safe = view.safeAreaInsets - contentInset = UIEdgeInsets( - top: inset.top, - left: inset.left + safe.left, - bottom: inset.bottom, - right: inset.right + safe.right - ) - } + let safe = view.safeAreaInsets + contentInset = UIEdgeInsets( + top: inset.top, + left: inset.left + safe.left, + bottom: inset.bottom, + right: inset.right + safe.right + ) } } diff --git a/Classes/Views/UIScrollView+ScrollToTop.swift b/Classes/Views/UIScrollView+ScrollToTop.swift index f6a77020..17bcd923 100644 --- a/Classes/Views/UIScrollView+ScrollToTop.swift +++ b/Classes/Views/UIScrollView+ScrollToTop.swift @@ -11,13 +11,7 @@ import UIKit extension UIScrollView { func scrollToTop(animated: Bool) { - let topInset: CGFloat - if #available(iOS 11.0, *) { - topInset = adjustedContentInset.top - } else { - topInset = contentInset.top - } - setContentOffset(CGPoint(x: 0, y: -topInset), animated: animated) + setContentOffset(CGPoint(x: 0, y: -adjustedContentInset.top), animated: animated) } } diff --git a/Classes/Views/UIView+BottomBorder.swift b/Classes/Views/UIView+BottomBorder.swift index 300e1c0f..1a18e57d 100644 --- a/Classes/Views/UIView+BottomBorder.swift +++ b/Classes/Views/UIView+BottomBorder.swift @@ -36,13 +36,8 @@ extension UIView { switch position { case .top, .bottom: make.height.equalTo(size) - if useSafeMargins, #available(iOS 11.0, *) { - make.left.equalTo(safeAreaLayoutGuide.snp.leftMargin).offset(left) - make.right.equalTo(safeAreaLayoutGuide.snp.rightMargin).offset(right) - } else { - make.left.equalTo(left) - make.right.equalTo(right) - } + make.left.equalTo(safeAreaLayoutGuide.snp.leftMargin).offset(left) + make.right.equalTo(safeAreaLayoutGuide.snp.rightMargin).offset(right) case .left, .right: make.width.equalTo(size) make.top.equalTo(top) @@ -53,17 +48,9 @@ extension UIView { case .top: make.top.equalTo(self) case .bottom: make.bottom.equalTo(self) case .left: - if useSafeMargins, #available(iOS 11.0, *) { - make.left.equalTo(safeAreaLayoutGuide.snp.leftMargin) - } else { - make.left.equalTo(self) - } + make.left.equalTo(safeAreaLayoutGuide.snp.leftMargin) case .right: - if useSafeMargins, #available(iOS 11.0, *) { - make.right.equalTo(safeAreaLayoutGuide.snp.rightMargin) - } else { - make.right.equalTo(self) - } + make.right.equalTo(safeAreaLayoutGuide.snp.rightMargin) } } return view