lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Remove branches for iOS 12 compatibility

Browse source
This commit is contained in:
Mingshen Sun 2023-02-04 15:27:37 -08:00
parent 7000834575
commit b09bc7444f
7 changed files with 17 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pass/Controllers/PGPKeyFIleImportTableViewController.swift
View file

@ -35,9 +35,7 @@ class PGPKeyFileImportTableViewController: AutoCellHeightUITableViewController,
return
}
picker.delegate = self
if #available(iOS 13.0, *) {
picker.shouldShowFileExtensions = true
}
picker.shouldShowFileExtensions = true
present(picker, animated: true, completion: nil)
}
}

14
pass/Controllers/PasswordDetailTableViewController.swift
View file

@ -550,17 +550,9 @@ extension PasswordDetailTableViewController {
switch error {
case let .yubiKey(yubiKeyError):
let errorMessage = yubiKeyError.localizedDescription
if #available(iOS 13.0, *) {
YubiKitManager.shared.stopNFCConnection(withErrorMessage: errorMessage)
DispatchQueue.main.async {
self.navigationController?.popViewController(animated: true)
}
} else {
DispatchQueue.main.async {
self.presentFailureAlert(message: errorMessage) { _ in
self.navigationController?.popViewController(animated: true)
}
}
YubiKitManager.shared.stopNFCConnection(withErrorMessage: errorMessage)
DispatchQueue.main.async {
self.navigationController?.popViewController(animated: true)
}
default:
DispatchQueue.main.async {

18
pass/Controllers/PasswordNavigationViewController.swift
View file

@ -34,9 +34,7 @@ class PasswordNavigationViewController: UIViewController {
uiSearchController.obscuresBackgroundDuringPresentation = false
uiSearchController.searchBar.sizeToFit()
uiSearchController.searchBar.returnKeyType = .done
if #available(iOS 13.0, *) {
uiSearchController.searchBar.searchTextField.clearButtonMode = .whileEditing
}
uiSearchController.searchBar.searchTextField.clearButtonMode = .whileEditing
return uiSearchController
}()
@ -50,15 +48,11 @@ class PasswordNavigationViewController: UIViewController {
lazy var addPasswordUIBarButtonItem: UIBarButtonItem = {
var addPasswordUIBarButtonItem = UIBarButtonItem()
if #available(iOS 13.0, *) {
let addPasswordButton = UIButton(type: .system)
let plusImage = UIImage(systemName: "plus.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .regular))
addPasswordButton.setImage(plusImage, for: .normal)
addPasswordButton.addTarget(self, action: #selector(self.addPasswordAction), for: .touchDown)
addPasswordUIBarButtonItem.customView = addPasswordButton
} else {
addPasswordUIBarButtonItem = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(self.addPasswordAction))
}
let addPasswordButton = UIButton(type: .system)
let plusImage = UIImage(systemName: "plus.circle", withConfiguration: UIImage.SymbolConfiguration(weight: .regular))
addPasswordButton.setImage(plusImage, for: .normal)
addPasswordButton.addTarget(self, action: #selector(self.addPasswordAction), for: .touchDown)
addPasswordUIBarButtonItem.customView = addPasswordButton
return addPasswordUIBarButtonItem
}()

4
pass/Controllers/SSHKeyFileImportTableViewController.swift
View file

@ -27,9 +27,7 @@ class SSHKeyFileImportTableViewController: AutoCellHeightUITableViewController {
return
}
picker.delegate = self
if #available(iOS 13.0, *) {
picker.shouldShowFileExtensions = true
}
picker.shouldShowFileExtensions = true
present(picker, animated: true, completion: nil)
}
}

4
passAutoFillExtension/Controllers/PasswordsViewController.swift
View file

@ -21,9 +21,7 @@ class PasswordsViewController: UIViewController {
uiSearchController.searchBar.isTranslucent = true
uiSearchController.obscuresBackgroundDuringPresentation = false
uiSearchController.searchBar.sizeToFit()
if #available(iOS 13.0, *) {
uiSearchController.searchBar.searchTextField.clearButtonMode = .whileEditing
}
uiSearchController.searchBar.searchTextField.clearButtonMode = .whileEditing
return uiSearchController
}()

28
passKit/Helpers/Colors.swift
View file

@ -7,33 +7,13 @@
//
public enum Colors {
public static let label: UIColor = {
if #available(iOS 13.0, *) {
return .label
}
return .black
}()
public static let label: UIColor = .black
public static let secondaryLabel: UIColor = {
if #available(iOS 13.0, *) {
return .secondaryLabel
}
return .init(red: 60.0, green: 60.0, blue: 67.0, alpha: 0.6)
}()
public static let secondaryLabel: UIColor = .init(red: 60.0, green: 60.0, blue: 67.0, alpha: 0.6)
public static let systemBackground: UIColor = {
if #available(iOS 13.0, *) {
return .systemBackground
}
return .white
}()
public static let systemBackground: UIColor = .white
public static let secondarySystemBackground: UIColor = {
if #available(iOS 13.0, *) {
return .secondarySystemBackground
}
return .init(red: 242.0, green: 242.0, blue: 247.0, alpha: 1.0)
}()
public static let secondarySystemBackground: UIColor = .init(red: 242.0, green: 242.0, blue: 247.0, alpha: 1.0)
public static let systemRed = UIColor.systemRed

4
passKit/Helpers/YubiKeyConnection.swift
View file

@ -27,9 +27,7 @@ public class YubiKeyConnection: NSObject {
completion(connection)
} else {
connectionCallback = completion
if #available(iOSApplicationExtension 13.0, *) {
YubiKitManager.shared.startNFCConnection()
}
YubiKitManager.shared.startNFCConnection()
}
cancellationCallback = cancellation
}