diff --git a/Sources/Kommunicate/Classes/FaqViewController.swift b/Sources/Kommunicate/Classes/FaqViewController.swift index 7213faa3..6fb2ac84 100644 --- a/Sources/Kommunicate/Classes/FaqViewController.swift +++ b/Sources/Kommunicate/Classes/FaqViewController.swift @@ -79,8 +79,18 @@ public class FaqViewController: UIViewController, Localizable { override public func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - navigationItem.leftBarButtonItem = getBackArrowButton(target: self, action: #selector(backTapped)) + var backButton = getBackArrowButton(target: self, action: #selector(backTapped)) navigationItem.title = localizedString(forKey: "FaqTitle", fileName: configuration.localizedStringFileName) + backButton.tintColor = configuration.bottomSheetNavIconColor + navigationItem.leftBarButtonItem = backButton + if #available(iOS 26.0, *) { + navigationItem.rightBarButtonItems?.forEach { + $0.hidesSharedBackground = true + } + navigationItem.leftBarButtonItems?.forEach { + $0.hidesSharedBackground = true + } + } } @objc func backTapped() { diff --git a/Sources/Kommunicate/Classes/KMConversationListViewController.swift b/Sources/Kommunicate/Classes/KMConversationListViewController.swift index f214d9c8..15ed54fb 100644 --- a/Sources/Kommunicate/Classes/KMConversationListViewController.swift +++ b/Sources/Kommunicate/Classes/KMConversationListViewController.swift @@ -113,6 +113,7 @@ public class KMConversationListViewController: KMChatBaseViewController, Localiz target: self, action: #selector(compose) ) barButton.accessibilityIdentifier = "startNewIcon" + barButton.tintColor = configuration.navCreateConversationIconColor return barButton }() @@ -384,10 +385,15 @@ public class KMConversationListViewController: KMChatBaseViewController, Localiz guard !configuration.hideBackButtonInConversationList else { return } if configuration.enableBackArrowOnConversationListScreen { - navigationItem.leftBarButtonItem = getBackArrowButton(target: self, action: #selector(customBackAction)) + let backArrowButton = getBackArrowButton(target: self, action: #selector(customBackAction)) + backArrowButton.tintColor = configuration.conversationListScreenBackButtonColor + navigationItem.leftBarButtonItem = backArrowButton } else { - navigationItem.leftBarButtonItem = getBackTextButton(title: LocalizedText.leftBarBackButtonText, target: self, action: #selector(customBackAction)) + let backTextButton = getBackTextButton(title: LocalizedText.leftBarBackButtonText, target: self, action: #selector(customBackAction)) + backTextButton.tintColor = configuration.conversationListScreenBackButtonColor + navigationItem.leftBarButtonItem = backTextButton } + configureNavigationBarButtonsForIOS26() } func setupNavigationRightButtons() { @@ -418,6 +424,7 @@ public class KMConversationListViewController: KMChatBaseViewController, Localiz let rightButtons = rightBarButtonItems.prefix(3) navigationItem.rightBarButtonItems = Array(rightButtons) } + configureNavigationBarButtonsForIOS26() } func setupSearchController() { @@ -431,7 +438,8 @@ public class KMConversationListViewController: KMChatBaseViewController, Localiz navigationItem.rightBarButtonItems = nil navigationItem.leftBarButtonItems = nil navigationItem.titleView = searchBar - + + configureNavigationBarButtonsForIOS26() UIView.animate( withDuration: 0.5, animations: { self.searchBar.show(true) }, diff --git a/Sources/Kommunicate/Classes/KMConversationViewController.swift b/Sources/Kommunicate/Classes/KMConversationViewController.swift index 14e41503..abd24ee8 100644 --- a/Sources/Kommunicate/Classes/KMConversationViewController.swift +++ b/Sources/Kommunicate/Classes/KMConversationViewController.swift @@ -724,6 +724,7 @@ open class KMConversationViewController: KMChatConversationViewController, KMUpd assigneeUserId = contact?.userId navigationItem.leftBarButtonItem = UIBarButtonItem(customView: customNavigationView) updateAssigneeDetails() + configureNavigationBarButtonsForIOS26() } override public func refreshViewController() {