fix search bar cancel button for iPad

Session.xcodeproj/project.pbxproj

@@ -6326,6 +6326,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "Session-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_AFTER_BUILD = YES;
 				WRAPPER_EXTENSION = app;
 			};
@@ -6394,6 +6395,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Session/Meta/Signal-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "Session-Swift.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_AFTER_BUILD = YES;
 				WRAPPER_EXTENSION = app;
 			};

Session/Conversations/ConversationVC.swift

@@ -562,7 +562,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         let searchBar = searchController.uiSearchController.searchBar
         searchBar.searchBarStyle = .minimal
         searchBar.barStyle = .black
-        searchBar.tintColor = Colors.accent
+        searchBar.tintColor = Colors.text
         let searchIcon = UIImage(named: "searchbar_search")!.asTintedImage(color: Colors.searchBarPlaceholder)
         searchBar.setImage(searchIcon, for: .search, state: UIControl.State.normal)
         let clearIcon = UIImage(named: "searchbar_clear")!.asTintedImage(color: Colors.searchBarPlaceholder)
@@ -580,7 +580,32 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         searchBar.setPositionAdjustment(UIOffset(horizontal: 4, vertical: 0), for: .search)
         searchBar.searchTextPositionAdjustment = UIOffset(horizontal: 2, vertical: 0)
         searchBar.setPositionAdjustment(UIOffset(horizontal: -4, vertical: 0), for: .clear)
-        navigationItem.titleView = searchBar
+        
+        let searchBarContainer = UIView()
+        searchBarContainer.layoutMargins = UIEdgeInsets.zero
+        searchBar.sizeToFit()
+        searchBar.layoutMargins = UIEdgeInsets.zero
+        searchBarContainer.set(.height, to: 44)
+        searchBarContainer.set(.width, to: UIScreen.main.bounds.width - 32)
+        searchBarContainer.addSubview(searchBar)
+        navigationItem.titleView = searchBarContainer
+        
+        // On iPad, the cancel button won't show
+        // See more https://developer.apple.com/documentation/uikit/uisearchbar/1624283-showscancelbutton?language=objc
+        if UIDevice.current.isIPad {
+            let ipadCancelButton = UIButton()
+            ipadCancelButton.setTitle("Cancel", for: .normal)
+            ipadCancelButton.addTarget(self, action: #selector(hideSearchUI(_ :)), for: .touchUpInside)
+            ipadCancelButton.setTitleColor(Colors.text, for: .normal)
+            searchBarContainer.addSubview(ipadCancelButton)
+            ipadCancelButton.pin(.trailing, to: .trailing, of: searchBarContainer)
+            ipadCancelButton.autoVCenterInSuperview()
+            searchBar.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets.zero, excludingEdge: .trailing)
+            searchBar.pin(.trailing, to: .leading, of: ipadCancelButton, withInset: -Values.smallSpacing)
+        } else {
+            searchBar.autoPinEdgesToSuperviewMargins()
+        }
+
         // Nav bar buttons
         updateNavBarButtons()
         // Hack so that the ResultsBar stays on the screen when dismissing the search field
@@ -614,7 +639,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
         navBar.stubbedNextResponder = self
     }
     
-    func hideSearchUI() {
+    @objc func hideSearchUI(_ sender: Any? = nil) {
         isShowingSearchUI = false
         navigationItem.titleView = titleView
         updateNavBarButtons()

Session/Home/GlobalSearch/GlobalSearchViewController.swift

@@ -1,5 +1,7 @@
 // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
 
+import UIKit
+
 @objc
 class GlobalSearchViewController: BaseVC, UITableViewDelegate, UITableViewDataSource {
     
@@ -93,8 +95,23 @@ class GlobalSearchViewController: BaseVC, UITableViewDelegate, UITableViewDataSo
         searchBarContainer.set(.height, to: 44)
         searchBarContainer.set(.width, to: UIScreen.main.bounds.width - 32)
         searchBarContainer.addSubview(searchBar)
-        searchBar.autoPinEdgesToSuperviewMargins()
         navigationItem.titleView = searchBarContainer
+        
+        // On iPad, the cancel button won't show
+        // See more https://developer.apple.com/documentation/uikit/uisearchbar/1624283-showscancelbutton?language=objc
+        if UIDevice.current.isIPad {
+            let ipadCancelButton = UIButton()
+            ipadCancelButton.setTitle("Cancel", for: .normal)
+            ipadCancelButton.addTarget(self, action: #selector(cancel(_:)), for: .touchUpInside)
+            ipadCancelButton.setTitleColor(Colors.text, for: .normal)
+            searchBarContainer.addSubview(ipadCancelButton)
+            ipadCancelButton.pin(.trailing, to: .trailing, of: searchBarContainer)
+            ipadCancelButton.autoVCenterInSuperview()
+            searchBar.autoPinEdgesToSuperviewEdges(with: UIEdgeInsets.zero, excludingEdge: .trailing)
+            searchBar.pin(.trailing, to: .leading, of: ipadCancelButton, withInset: -Values.smallSpacing)
+        } else {
+            searchBar.autoPinEdgesToSuperviewMargins()
+        }
     }
     
     private func reloadTableData() {
@@ -168,6 +185,10 @@ class GlobalSearchViewController: BaseVC, UITableViewDelegate, UITableViewDataSo
         tableView.reloadSections([ SearchSection.recent.rawValue ], with: .top)
         Storage.shared.clearRecentSearchResults()
     }
+    
+    @objc func cancel(_ sender: Any) {
+        self.navigationController?.popViewController(animated: true)
+    }
 
 }
 

Session/Meta/Session-Info.plist

@@ -105,6 +105,11 @@
 		<string>SpaceMono-Bold.ttf</string>
 		<string>SpaceMono-Regular.ttf</string>
 	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
 	<key>UIApplicationShortcutItems</key>
 	<array>
 		<dict>