renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

💄 Move search bar

Browse Source 
Note: Device rotation can cause a crash.
This commit is contained in:
Stuart Breckenridge
2025-06-13 15:53:22 +08:00
parent b15a5a50b8
commit 54d3aa4be8
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
iOS/MainTimeline/MainTimelineViewController.swift
View File

@@ -143,9 +143,17 @@ class MainTimelineViewController: UITableViewController, UndoableCommandRunner {
NSLocalizedString("Here", comment: "Here"),
NSLocalizedString("All Articles", comment: "All Articles")
]
navigationItem.searchController = searchController
// If the device is an iPad, the search bar is detached and placed
// in the top right of the article view. When that is the case, search is
// defaulted to "All Articles" as it is global.
if UIDevice.current.userInterfaceIdiom == .pad {
searchController.searchBar.selectedScopeButtonIndex = 1
navigationItem.searchController = searchController
navigationItem.searchBarPlacementAllowsExternalIntegration = UIDevice.current.userInterfaceIdiom == .pad
}
definesPresentationContext = true
// Configure the table
tableView.dataSource = dataSource
if #available(iOS 15.0, *) {
@@ -697,17 +705,10 @@ private extension MainTimelineViewController {
}
func configureToolbar() {
guard !(splitViewController?.isCollapsed ?? true) else {
return
if UIDevice.current.userInterfaceIdiom == .phone {
toolbarItems?.insert(.flexibleSpace(), at: 1)
toolbarItems?.insert(navigationItem.searchBarPlacementBarButtonItem, at: 2)
}
guard let refreshProgressView = Bundle.main.loadNibNamed("RefreshProgressView", owner: self, options: nil)?[0] as? RefreshProgressView else {
return
}
self.refreshProgressView = refreshProgressView
let refreshProgressItemButton = UIBarButtonItem(customView: refreshProgressView)
toolbarItems?.insert(refreshProgressItemButton, at: 2)
}
func resetUI(resetScroll: Bool) {