Skip to content

Commit f51a4cf

Browse files
Revert "add ios 26 compatibility"
This reverts commit 0400c59.
1 parent 537fd51 commit f51a4cf

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

FlowCrypt/Controllers/Search/SearchViewController.swift

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

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

FlowCrypt/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
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/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>

FlowCryptUI/Views/NavigationBarActionButton.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,16 @@ 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(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
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+
}
2429
}
2530

2631
@objc private func tap() {

FlowCryptUI/Views/NavigationBarItemsView.swift

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

4444
let buttons = input.enumerated()
4545
.map { value in
46-
UIButton(configuration: .plain()).then {
46+
UIButton(type: .system).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-
5348
$0.frame.size = Constants.buttonSize
54-
// Ensure image scales correctly within the configuration
55-
$0.imageView?.contentMode = .scaleAspectFit
56-
49+
$0.imageView?.frame.size = Constants.buttonSize
50+
$0.setImage(value.element.image, for: .normal)
51+
$0.setTitle(value.element.title, for: .normal)
5752
$0.accessibilityIdentifier = value.element.accessibilityId
5853
$0.isAccessibilityElement = true
5954
$0.addTarget(self, action: #selector(self.handleTap(with:)), for: .touchUpInside)

0 commit comments

Comments
 (0)