update ios 26 button styles

Author: sosnovsky

FlowCrypt/Controllers/Attachment/AttachmentViewController.swift

@@ -116,7 +116,7 @@ final class AttachmentViewController: UIViewController {
         let imageConfiguration = UIImage.SymbolConfiguration(font: .systemFont(ofSize: 24, weight: .light))
         let image = UIImage(systemName: "square.and.arrow.down", withConfiguration: imageConfiguration)
 
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(
+        navigationItem.setRightNavigationBarItems(
             with: [
                 NavigationBarItemsView.Input(
                     image: image?.tinted(.gray),

FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Setup.swift

@@ -35,7 +35,7 @@ extension ComposeViewController {
         ) { [weak self] in
             self?.handleSendTap()
         }
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(
+        navigationItem.setRightNavigationBarItems(
             with: [deleteButton, helpButton, attachmentButton, sendButton]
         )
     }

FlowCrypt/Controllers/Inbox/InboxViewController.swift

@@ -42,7 +42,9 @@ class InboxViewController: ViewController {
         inboxInput.isNotEmpty && (["SPAM", "TRASH"].contains(viewModel.path))
     }
 
-    var path: String { viewModel.path }
+    var path: String {
+        viewModel.path
+    }
 
     // Search related variables
     private var isSearch = false
@@ -161,9 +163,9 @@ extension InboxViewController {
         }
     }
 
-    @objc public func setupNavigationBar() {
+    @objc func setupNavigationBar() {
         navigationItem.setAccessibility(id: inboxTitle)
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(
+        navigationItem.setRightNavigationBarItems(
             with: [
                 NavigationBarItemsView.Input(
                     image: UIImage(systemName: "questionmark.circle"),
@@ -194,7 +196,7 @@ extension InboxViewController {
         actions.append(selectedUnread ? .markAsRead : .markAsUnread)
 
         let items = actions.map { createNavigationBarButton(action: $0) }
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(with: items)
+        navigationItem.setRightNavigationBarItems(with: items)
         navigationItem.leftBarButtonItem = .defaultBackButton { [weak self] in
             guard let self else { return }
             resetSelectedThreads()

FlowCrypt/Controllers/Settings/Contacts/Contacts List/ContactDetailViewController.swift

@@ -57,7 +57,7 @@ final class ContactDetailViewController: TableNodeViewController {
     }
 
     private func setupNavigationBarItems() {
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(
+        navigationItem.setRightNavigationBarItems(
             with: [
                 .init(
                     image: UIImage(systemName: "trash"),

FlowCrypt/Controllers/Settings/Contacts/Contacts List/ContactKeyDetailViewController.swift

@@ -54,7 +54,7 @@ final class ContactKeyDetailViewController: TableNodeViewController {
     }
 
     private func setupNavigationBarItems() {
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(
+        navigationItem.setRightNavigationBarItems(
             with: [
                 .init(
                     image: UIImage(named: "share"), accessibilityId: "aid-share-btn"

FlowCrypt/Controllers/Threads/Extensions/MessageActionsHandler.swift

@@ -67,7 +67,7 @@ extension MessageActionsHandler where Self: UIViewController {
         }
 
         let items = [helpButton] + actions.map { createNavigationBarButton(action: $0) }
-        navigationItem.rightBarButtonItem = NavigationBarItemsView(with: items)
+        navigationItem.setRightNavigationBarItems(with: items)
     }
 
     private func createNavigationBarButton(action: MessageAction) -> NavigationBarItemsView.Input {

FlowCryptUI/Nodes/AddButtonNode.swift

@@ -7,22 +7,64 @@
 //
 
 import AsyncDisplayKit
+import UIKit
 
 public final class AddButtonNode: ASButtonNode {
     private var onTap: (() -> Void)?
+    private var identifier: String?
+
+    override public init() {
+        super.init()
+        setViewBlock { UIButton(type: .system) }
+    }
 
     public init(identifier: String, _ action: (() -> Void)?) {
+        self.identifier = identifier
         super.init()
+
+        setViewBlock { UIButton(type: .system) }
         onTap = action
-        backgroundColor = .main
-        accessibilityIdentifier = identifier
-        setTitle("+", with: .boldSystemFont(ofSize: 30), with: .white, for: .normal)
-        addTarget(self, action: #selector(onButtonTap), forControlEvents: .touchUpInside)
         frame.size = CGSize(width: .addButtonSize, height: .addButtonSize)
-        cornerRadius = .addButtonSize / 2
+    }
+
+    override public func didLoad() {
+        super.didLoad()
+
+        guard let button = view as? UIButton else { return }
+        button.accessibilityIdentifier = identifier
+        button.isAccessibilityElement = true
+        button.addTarget(self, action: #selector(onButtonTap), for: .touchUpInside)
+
+        if #available(iOS 26.0, *) {
+            configureGlassButton(button)
+        } else {
+            configureLegacyButton(button)
+        }
     }
 
     @objc private func onButtonTap() {
         onTap?()
     }
+
+    @available(iOS 26.0, *)
+    private func configureGlassButton(_ button: UIButton) {
+        var configuration = UIButton.Configuration.glass()
+        configuration.buttonSize = .medium
+        configuration.cornerStyle = .capsule
+        configuration.image = UIImage(systemName: "plus")
+        configuration.preferredSymbolConfigurationForImage = .init(
+            pointSize: 24,
+            weight: .semibold
+        )
+
+        button.configuration = configuration
+    }
+
+    private func configureLegacyButton(_ button: UIButton) {
+        button.backgroundColor = .main
+        button.layer.cornerRadius = .addButtonSize / 2
+        button.setTitle("+", for: .normal)
+        button.setTitleColor(.white, for: .normal)
+        button.titleLabel?.font = .boldSystemFont(ofSize: 30)
+    }
 }

FlowCryptUI/Views/NavigationBarItemsView.swift

@@ -41,6 +41,11 @@ public final class NavigationBarItemsView: UIBarButtonItem {
         self.input = input
         super.init()
 
+        if #available(iOS 26.0, *), input.count == 1 {
+            configureNativeBarButtonItem(with: input[0])
+            return
+        }
+
         let buttons = input.enumerated()
             .map { value in
                 UIButton(type: .system).then {
@@ -78,4 +83,30 @@ public final class NavigationBarItemsView: UIBarButtonItem {
     @objc private func handleTap(with button: UIButton) {
         input[button.tag].onTap?()
     }
+
+    @objc private func handleNativeTap() {
+        input.first?.onTap?()
+    }
+
+    @available(iOS 26.0, *)
+    private func configureNativeBarButtonItem(with input: Input) {
+        image = input.image
+        title = input.title
+        accessibilityIdentifier = input.accessibilityId
+        isAccessibilityElement = true
+        target = self
+        action = #selector(handleNativeTap)
+    }
+}
+
+public extension UINavigationItem {
+    func setRightNavigationBarItems(with input: [NavigationBarItemsView.Input]) {
+        if #available(iOS 26.0, *) {
+            rightBarButtonItems = input
+                .reversed()
+                .map { NavigationBarItemsView(with: [$0]) }
+        } else {
+            rightBarButtonItem = NavigationBarItemsView(with: input)
+        }
+    }
 }