Skip to content

Commit 0400c59

Browse files
add ios 26 compatibility
1 parent 401fb29 commit 0400c59

4 files changed

Lines changed: 16 additions & 17 deletions

File tree

FlowCrypt/Controllers/Search/SearchViewController.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ class SearchViewController: InboxViewController {
3838

3939
override func setupNavigationBar() {
4040
title = "search_title".localized
41-
navigationItem.titleView = searchController.searchBar
41+
navigationItem.searchController = searchController
42+
navigationItem.hidesSearchBarWhenScrolling = false
4243
navigationItem.rightBarButtonItems = nil
4344
navigationItem.leftBarButtonItem = .defaultBackButton {
4445
self.navigationController?.popViewController(animated: true)

FlowCrypt/Info.plist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>UIDesignRequiresCompatibility</key>
6-
<true/>
75
<key>CFBundleDevelopmentRegion</key>
86
<string>en</string>
97
<key>CFBundleDisplayName</key>

FlowCryptUI/Views/NavigationBarActionButton.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,11 @@ public final class NavigationBarActionButton: UIBarButtonItem {
1616
private var onAction: (() -> Void)?
1717

1818
public convenience init(imageSystemName: String, action: (() -> Void)?, accessibilityIdentifier: String? = nil) {
19-
self.init()
20-
onAction = action
21-
customView = UIButton(type: .system).with {
22-
$0.contentHorizontalAlignment = .left
23-
$0.setImage(UIImage(systemName: imageSystemName), for: .normal)
24-
$0.frame.size = Constants.buttonSize
25-
$0.addTarget(self, action: #selector(tap), for: .touchUpInside)
26-
$0.accessibilityIdentifier = accessibilityIdentifier
27-
$0.isAccessibilityElement = true
28-
}
19+
self.init(image: UIImage(systemName: imageSystemName), style: .plain, target: nil, action: nil)
20+
self.target = self
21+
self.action = #selector(tap)
22+
self.accessibilityIdentifier = accessibilityIdentifier
23+
self.onAction = action
2924
}
3025

3126
@objc private func tap() {

FlowCryptUI/Views/NavigationBarItemsView.swift

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@ public final class NavigationBarItemsView: UIBarButtonItem {
4343

4444
let buttons = input.enumerated()
4545
.map { value in
46-
UIButton(type: .system).then {
46+
UIButton(configuration: .plain()).then {
4747
$0.tag = value.offset
48+
$0.configuration?.image = value.element.image
49+
$0.configuration?.title = value.element.title
50+
$0.configuration?.baseForegroundColor = .white
51+
$0.configuration?.contentInsets = .zero
52+
4853
$0.frame.size = Constants.buttonSize
49-
$0.imageView?.frame.size = Constants.buttonSize
50-
$0.setImage(value.element.image, for: .normal)
51-
$0.setTitle(value.element.title, for: .normal)
54+
// Ensure image scales correctly within the configuration
55+
$0.imageView?.contentMode = .scaleAspectFit
56+
5257
$0.accessibilityIdentifier = value.element.accessibilityId
5358
$0.isAccessibilityElement = true
5459
$0.addTarget(self, action: #selector(self.handleTap(with:)), for: .touchUpInside)

0 commit comments

Comments
 (0)