WIP - Adapt UI to iOS 26

ZShare/View Controllers/ContainerViewController.swift

@@ -12,64 +12,97 @@ final class ContainerViewController: UIViewController {
     @IBOutlet private weak var containerView: UIView!
 
     private weak var containerHeight: NSLayoutConstraint?
+    private var constraints: [NSLayoutConstraint] = []
     private var didAppear = false
 
-    private static let padWidth: CGFloat = 500
+    private static let regularWidth: CGFloat = 500
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if UIDevice.current.userInterfaceIdiom == .pad {
-            self.setupForPad()
-        } else {
-            self.setupForPhone()
-        }
+        setupLayoutForCurrentTraits()
     }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        self.didAppear = true
+        didAppear = true
     }
 
     override func preferredContentSizeDidChange(forChildContentContainer container: UIContentContainer) {
         super.preferredContentSizeDidChange(forChildContentContainer: container)
 
-        guard let height = self.containerHeight else { return }
+        guard let containerHeight else { return }
 
-        height.constant = container.preferredContentSize.height
+        containerHeight.constant = container.preferredContentSize.height
 
-        guard self.didAppear else { return }
+        guard didAppear else { return }
 
         UIView.animate(withDuration: 0.2) {
             self.view.layoutIfNeeded()
         }
     }
 
-    private func setupForPad() {
-        self.view.backgroundColor = ProcessInfo().operatingSystemVersion.majorVersion == 13 ? UIColor.black.withAlphaComponent(0.085) : .clear
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+        guard previousTraitCollection?.horizontalSizeClass != traitCollection.horizontalSizeClass else { return }
+        clearLayout()
+        setupLayoutForCurrentTraits()
 
-        self.containerView.layer.cornerRadius = 8
-        self.containerView.layer.masksToBounds = true
+        func clearLayout() {
+            NSLayoutConstraint.deactivate(constraints)
+            constraints = []
+            containerHeight = nil
+        }
+    }
 
-        let height = self.containerView.heightAnchor.constraint(equalToConstant: 100)
-        height.priority = .defaultHigh
-        self.containerHeight = height
+    private func setupLayoutForCurrentTraits() {
+        switch traitCollection.horizontalSizeClass {
+        case .regular:
+            constraints = setupForHorizontalSizeClassRegular()
 
-        NSLayoutConstraint.activate([
-            self.view.centerXAnchor.constraint(equalTo: self.containerView.centerXAnchor),
-            self.view.centerYAnchor.constraint(equalTo: self.containerView.centerYAnchor),
-            self.containerView.heightAnchor.constraint(lessThanOrEqualTo: self.view.heightAnchor),
-            height,
-            self.containerView.widthAnchor.constraint(equalToConstant: ContainerViewController.padWidth)
-        ])
-    }
+        case .compact:
+            constraints = setupForHorizontalSizeClassCompact()
+
+        case .unspecified:
+            break
 
-    private func setupForPhone() {
-        NSLayoutConstraint.activate([
-            self.containerView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
-            self.containerView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
-            self.containerView.topAnchor.constraint(equalTo: self.view.topAnchor),
-            self.containerView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor)
-        ])
+        @unknown default:
+            break
+        }
+
+        func setupForHorizontalSizeClassRegular() -> [NSLayoutConstraint] {
+            view.backgroundColor = .clear
+
+            containerView.layer.cornerRadius = 8
+            containerView.layer.masksToBounds = true
+
+            let containerHeight = containerView.heightAnchor.constraint(equalToConstant: 100)
+            containerHeight.priority = .defaultHigh
+            self.containerHeight = containerHeight
+
+            let constraints = [
+                containerView.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+                containerView.centerYAnchor.constraint(equalTo: view.centerYAnchor),
+                containerView.heightAnchor.constraint(lessThanOrEqualTo: view.heightAnchor),
+                containerHeight,
+                containerView.widthAnchor.constraint(equalToConstant: Self.regularWidth)
+            ]
+            NSLayoutConstraint.activate(constraints)
+            return constraints
+        }
+
+        func setupForHorizontalSizeClassCompact() -> [NSLayoutConstraint] {
+            containerView.layer.cornerRadius = 0
+            containerView.layer.masksToBounds = false
+
+            let constraints = [
+                containerView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+                containerView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+                containerView.topAnchor.constraint(equalTo: view.topAnchor),
+                containerView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
+            ]
+            NSLayoutConstraint.activate(constraints)
+            return constraints
+        }
     }
 }

ZShare/View Controllers/ShareViewController.swift

@@ -210,11 +210,7 @@ final class ShareViewController: UIViewController {
         self.navigationController?.pushViewController(controller, animated: true)
     }
 
-    @objc private func done() {
-        self.viewModel?.submit()
-    }
-
-    @objc private func cancel() {
+    private func cancel() {
         self.viewModel?.cancel()
         self.debugLogging.storeLogs { [unowned self] in
             self.extensionContext?.completeRequest(returningItems: nil, completionHandler: nil)
@@ -375,7 +371,12 @@ final class ShareViewController: UIViewController {
             switch error {
             case .quotaLimit, .webDavFailure, .apiFailure, .forbidden:
                 self.navigationItem.leftBarButtonItem = nil
-                self.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(ShareViewController.cancel))
+                let cancelAction = UIAction { [weak self] _ in
+                    self?.cancel()
+                }
+                let item = UIBarButtonItem(systemItem: .done, primaryAction: cancelAction)
+                item.tintColor = Asset.Colors.zoteroBlue.color
+                self.navigationItem.rightBarButtonItem = item
                 return
 
             default:
@@ -694,13 +695,29 @@ final class ShareViewController: UIViewController {
     }
 
     private func setupNavbar(loggedIn: Bool) {
-        self.navigationController?.navigationBar.tintColor = Asset.Colors.zoteroBlue.color
+        if #unavailable(iOS 26.0.0) {
+            navigationController?.navigationBar.tintColor = Asset.Colors.zoteroBlue.color
+        }
 
-        let cancel = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(ShareViewController.cancel))
+        let cancelAction = UIAction { [weak self] _ in
+            self?.cancel()
+        }
+        let cancel = UIBarButtonItem(systemItem: .cancel, primaryAction: cancelAction)
         self.navigationItem.leftBarButtonItem = cancel
 
         if loggedIn {
-            let done = UIBarButtonItem(title: L10n.Shareext.save, style: .done, target: self, action: #selector(ShareViewController.done))
+            let doneAction = UIAction(title: L10n.Shareext.save) { [weak viewModel] _ in
+                viewModel?.submit()
+            }
+            let done: UIBarButtonItem
+            if #available(iOS 26.0.0, *) {
+                done = UIBarButtonItem(systemItem: .done, primaryAction: doneAction)
+                done.tintColor = Asset.Colors.zoteroBlue.color
+                done.style = .prominent
+            } else {
+                done = UIBarButtonItem(primaryAction: doneAction)
+                done.style = .done
+            }
             done.isEnabled = false
             self.navigationItem.rightBarButtonItem = done
         }