Skip to content

#2705 Fix UI elements to be compatible with iOS 26 #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ioanatflowcrypt wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

#2705 Fix UI elements to be compatible with iOS 26 #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion FlowCrypt/Controllers/Search/SearchViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ class SearchViewController: InboxViewController {

override func setupNavigationBar() {
title = "search_title".localized
navigationItem.titleView = searchController.searchBar
navigationItem.searchController = searchController
navigationItem.hidesSearchBarWhenScrolling = false
navigationItem.rightBarButtonItems = nil
navigationItem.leftBarButtonItem = .defaultBackButton {
self.navigationController?.popViewController(animated: true)
Expand Down
2 changes: 0 additions & 2 deletions FlowCrypt/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIDesignRequiresCompatibility</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand Down
15 changes: 5 additions & 10 deletions FlowCryptUI/Views/NavigationBarActionButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@ public final class NavigationBarActionButton: UIBarButtonItem {
private var onAction: (() -> Void)?

public convenience init(imageSystemName: String, action: (() -> Void)?, accessibilityIdentifier: String? = nil) {
self.init()
onAction = action
customView = UIButton(type: .system).with {
$0.contentHorizontalAlignment = .left
$0.setImage(UIImage(systemName: imageSystemName), for: .normal)
$0.frame.size = Constants.buttonSize
$0.addTarget(self, action: #selector(tap), for: .touchUpInside)
$0.accessibilityIdentifier = accessibilityIdentifier
$0.isAccessibilityElement = true
}
self.init(image: UIImage(systemName: imageSystemName), style: .plain, target: nil, action: nil)
self.target = self
self.action = #selector(tap)
self.accessibilityIdentifier = accessibilityIdentifier
self.onAction = action
}

@objc private func tap() {
Expand Down
13 changes: 9 additions & 4 deletions FlowCryptUI/Views/NavigationBarItemsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@ public final class NavigationBarItemsView: UIBarButtonItem {

let buttons = input.enumerated()
.map { value in
UIButton(type: .system).then {
UIButton(configuration: .plain()).then {
$0.tag = value.offset
$0.configuration?.image = value.element.image
$0.configuration?.title = value.element.title
$0.configuration?.baseForegroundColor = .white
$0.configuration?.contentInsets = .zero

$0.frame.size = Constants.buttonSize
$0.imageView?.frame.size = Constants.buttonSize
$0.setImage(value.element.image, for: .normal)
$0.setTitle(value.element.title, for: .normal)
// Ensure image scales correctly within the configuration
$0.imageView?.contentMode = .scaleAspectFit

$0.accessibilityIdentifier = value.element.accessibilityId
$0.isAccessibilityElement = true
$0.addTarget(self, action: #selector(self.handleTap(with:)), for: .touchUpInside)
Expand Down