History menu improvements

Update for iOS 17.
TitlebarView: move to drag api
2024-07-31 17:53:23 -07:00 · 2024-07-29 19:21:51 -07:00 · 2024-05-10 17:01:14 -07:00 · 2023-09-26 16:23:35 -07:00 · 2023-09-17 20:30:21 -07:00 · 2023-08-10 19:52:59 -07:00
67 changed files with 722 additions and 202 deletions
--- a/App/AppDelegate.swift
+++ b/App/AppDelegate.swift
@@ -32,6 +32,28 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
        return UISceneConfiguration(name: "Browser", sessionRole: connectingSceneSession.role)
    }
    
+    private func historyMenu() -> UIMenu {
+        let historyItems = BrowserHistory.shared.allHistory(limit: 50).map { item in
+            let title = ((item.title.count > 0) ? item.title : item.url.absoluteString)
+                .middleTruncatedString(maximumLength: 85)
+            
+            return UIAction(title: title) { action in
+                UIApplication.shared.sendAction(#selector(ShortcutResponder.handleOpenURL), to: nil, from: action, for: OpenURLEvent(url: item.url))
+            }
+        }
+        
+        return UIMenu(title: "History", children: [
+            UIKeyCommand(
+                modifiers: [ .command ],
+                input: "y",
+                title: "Show All History…",
+                action: #selector(ShortcutResponder.showHistory)
+            ),
+            
+            UIMenu(options: .displayInline, children: historyItems)
+        ])
+    }
+    
    override var keyCommands: [UIKeyCommand]? {
        get { KeyboardShortcuts.allKeyCommands() }
    }
@@ -68,6 +90,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
        // Go
        builder.insertSibling(UIMenu(title: "Go", children: KeyboardShortcuts.menu(for: .go)), beforeMenu: .view)
        
+        // History
+        builder.insertSibling(historyMenu(), beforeMenu: .view)
+        
        // View
        builder.replaceChildren(ofMenu: .view) { children in
            KeyboardShortcuts.menu(for: .view) + children
--- a/App/Backend/History/BrowserHistory.swift
+++ b/App/Backend/History/BrowserHistory.swift
@@ -7,9 +7,58 @@

 import Foundation
 import CoreData
+import Combine

 class BrowserHistory
 {
+    class ViewModel: NSObject, ObservableObject, NSFetchedResultsControllerDelegate {
+        @Published var searchQuery: String = ""
+        @Published private(set) var historyItems: [HistoryItem] = []
+        
+        fileprivate let historyController: BrowserHistory
+        fileprivate var searchQueryObserver: AnyCancellable? = nil
+        fileprivate var fetchedResultsController: NSFetchedResultsController<HistoryItemEntity> {
+            didSet { fetchedResultsController.delegate = self; performInitialFetch() }
+        }
+        
+        fileprivate init(fetchedResultsController: NSFetchedResultsController<HistoryItemEntity>, historyController: BrowserHistory) {
+            self.fetchedResultsController = fetchedResultsController
+            self.historyController = historyController
+            super.init()
+            
+            searchQueryObserver = $searchQuery.sink { [unowned self] newValue in
+                self.fetchedResultsController = historyController.fetchRequestController(forQuery: newValue)
+            }
+        }
+        
+        public func item(forIdentifier identifier: HistoryItem.ID) -> HistoryItem? {
+            if let object = fetchedResultsController.managedObjectContext.object(with: identifier) as? HistoryItemEntity {
+                return HistoryItem(entity: object)
+            }
+            
+            return nil
+        }
+        
+        public func deleteItems(_ items: Set<HistoryItem.ID>) {
+            items.forEach { identifier in
+                historyController.deleteItem(withIdentifier: identifier)
+            }
+        }
+        
+        func controllerDidChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
+            if let objects = controller.fetchedObjects as? [HistoryItemEntity] {
+                self.historyItems = objects.map { HistoryItem(entity: $0) }
+            }
+        }
+        
+        fileprivate func performInitialFetch() {
+            try? fetchedResultsController.performFetch()
+            if let objects = fetchedResultsController.fetchedObjects {
+                self.historyItems = objects.map { HistoryItem(entity: $0) }
+            }
+        }
+    }
+    
    static public let shared = BrowserHistory()
    
    lazy fileprivate var persistentContainer: NSPersistentContainer = {
@@ -35,12 +84,43 @@ class BrowserHistory
            let nserror = error as NSError
            fatalError("Failed saving persistent entity to store: \(nserror), \(nserror.userInfo)")
        }
+        
+        UIMenuSystem.main.setNeedsRebuild()
    }
    
-    public func allHistory() -> [HistoryItem] {
-        let dataContext = persistentContainer.viewContext
+    public func viewModel(forFilterString filterString: String? = nil, limit: Int = 500) -> ViewModel {
+        let resultsController = fetchRequestController(forQuery: filterString, limit: limit)
+        return ViewModel(fetchedResultsController: resultsController, historyController: self)
+    }
+    
+    public func historyItem(forIdentifier: HistoryItem.ID) -> HistoryItem? {
+        if let entity = try? persistentContainer.viewContext.existingObject(with: forIdentifier) as? HistoryItemEntity {
+            return HistoryItem(entity: entity)
+        }
        
-        let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
+        return nil
+    }
+    
+    public func deleteItem(withIdentifier identifier: HistoryItem.ID) {
+        let dataContext = persistentContainer.viewContext
+        if let object = try? dataContext.existingObject(with: identifier) {
+            dataContext.delete(object)
+            try? dataContext.save()
+        }
+    }
+    
+    public func clearAllHistory() {
+        let dataContext = persistentContainer.viewContext
+        let fetchRequest: NSFetchRequest<NSFetchRequestResult> = HistoryItemEntity.fetchRequest()
+        let request = NSBatchDeleteRequest(fetchRequest: fetchRequest)
+        
+        do    { try dataContext.execute(request) }
+        catch { print("Error clearing history: \(error.localizedDescription)") }
+    }
+    
+    public func allHistory(filteredBy filterString: String? = nil, limit: Int = 500) -> [HistoryItem] {
+        let dataContext = persistentContainer.viewContext
+        let fetchRequest = fetchRequest(forStringContaining: filterString, limit: limit)
        let entities: [HistoryItemEntity] = (try? dataContext.fetch(fetchRequest)) ?? []
        
        return entities.map { (entity) -> HistoryItem in
@@ -52,7 +132,11 @@ class BrowserHistory
        let dataContext = persistentContainer.viewContext
        
        let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
-        fetchRequest.predicate = NSPredicate(format: "host CONTAINS %@ OR title contains %@", matching, matching)
+        fetchRequest.predicate = NSPredicate(format: """
+                                             host CONTAINS[cd] %@
+                                             OR title CONTAINS[cd] %@
+                                             OR url ENDSWITH[cd] %@
+                                             """, matching, matching, matching)
        fetchRequest.fetchLimit = 200
        fetchRequest.sortDescriptors = [ NSSortDescriptor(key: "visitCount", ascending: false) ]
        
@@ -85,6 +169,35 @@ class BrowserHistory
    }
 }

+extension BrowserHistory
+{
+    fileprivate func fetchRequestController(forQuery query: String? = nil, limit: Int = 500) -> NSFetchedResultsController<HistoryItemEntity> {
+        let fetchRequest = fetchRequest(forStringContaining: query, limit: limit)
+        return NSFetchedResultsController(fetchRequest: fetchRequest,
+                                          managedObjectContext: persistentContainer.viewContext,
+                                          sectionNameKeyPath: nil, cacheName: nil)
+    }
+    
+    fileprivate func fetchRequest(forStringContaining filterString: String? = nil, limit: Int = 500) -> NSFetchRequest<HistoryItemEntity> {
+        let fetchRequest: NSFetchRequest<HistoryItemEntity> = HistoryItemEntity.fetchRequest()
+        fetchRequest.fetchLimit = limit
+        fetchRequest.sortDescriptors = [
+            // Sort by date
+            NSSortDescriptor(keyPath: \HistoryItemEntity.lastVisited, ascending: false)
+        ]
+        
+        if let filterString, filterString.count > 0 {
+            fetchRequest.predicate = NSPredicate(format: """
+                                                 host CONTAINS[cd] %@
+                                                 OR title CONTAINS[cd] %@
+                                                 OR url CONTAINS[cd] %@
+                                                 """, filterString, filterString, filterString)
+        }
+
+        return fetchRequest
+    }
+}
+
 extension URL
 {
    public func topLevelURL() -> URL {
--- a/App/Backend/History/HistoryItem.swift
+++ b/App/Backend/History/HistoryItem.swift
@@ -5,17 +5,28 @@
 //  Created by James Magahern on 8/14/20.
 //

+import CoreData
 import Foundation

-struct HistoryItem: Hashable
+struct HistoryItem: Hashable, Identifiable
 {
    var url: URL
    var title: String
    var lastVisited: Date
+    var id: NSManagedObjectID
    
    init(entity: HistoryItemEntity) {
        self.url = entity.url ?? URL(string: "about:blank")!
        self.lastVisited = entity.lastVisited ?? Date()
        self.title = entity.title ?? ""
+        self.id = entity.objectID
+    }
+    
+    // For testing/previews
+    public init(url: URL, title: String, lastVisited: Date) {
+        self.url = url
+        self.title = title
+        self.lastVisited = lastVisited
+        self.id = NSManagedObjectID()
    }
 }
--- a/App/Backend/ResourcePolicyManager.swift
+++ b/App/Backend/ResourcePolicyManager.swift
@@ -31,7 +31,8 @@ class ResourcePolicyManager: NSObject, SBRResourceOriginPolicyDataSource
    func allowedOriginsForScriptResources() -> Set<String> { allowedOriginSet }
    
    func scriptPolicyTypeByOrigin() -> [String : NSNumber] {
-        return scriptPolicies.mapValues { NSNumber(integerLiteral: $0.rawValue) }
+        let types = scriptPolicies.mapValues { NSNumber(integerLiteral: $0.rawValue) }
+        return types
    }
    
    private lazy var scriptPolicies: Dictionary<String, ScriptPolicy.PolicyType> = {
--- a/View/BrowserView.swift
+++ b/View/BrowserView.swift
@@ -98,6 +98,7 @@ class BrowserView: UIView
            }
        }(animationCurve)
        
+        toolbarView?.layoutLatch.deactivate()
        keyboardLayoutOffset = bounds.height - keyboardEndFrame.minY
        UIView.animate(withDuration: animationDuration, delay: 0.0, options: animationOptions, animations: { self.layoutIfNeeded() }, completion: nil)
    }
--- a/View/BrowserViewController+Keyboard.swift
+++ b/View/BrowserViewController+Keyboard.swift
@@ -94,11 +94,11 @@ extension BrowserViewController: ShortcutResponder
    }
    
    func goBack(_ sender: Any?) {
-        tab.webView.goBack()
+        currentTab.webView.goBack()
    }
    
    func goForward(_ sender: Any?) {
-        tab.webView.goForward()
+        currentTab.webView.goForward()
    }
    
    func createTab(_ sender: Any?) {
@@ -106,24 +106,24 @@ extension BrowserViewController: ShortcutResponder
    }
    
    func previousTab(_ sender: Any?) {
-        if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
+        if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
            if tabIndex - 1 >= 0 {
-                self.tab = tabController.tabs[tabIndex - 1]
+                self.currentTab = tabController.tabs[tabIndex - 1]
            }
        }
    }
    
    func nextTab(_ sender: Any?) {
-        if let tabIndex = tabController.tabs.firstIndex(of: self.tab) {
+        if let tabIndex = tabController.tabs.firstIndex(of: self.currentTab) {
            if tabIndex + 1 < tabController.tabs.count {
-                self.tab = tabController.tabs[tabIndex + 1]
+                self.currentTab = tabController.tabs[tabIndex + 1]
            }
        }
    }
    
    func closeTab(_ sender: Any?) {
        if tabController.tabs.count > 1 {
-            tabController.closeTab(self.tab)
+            tabController.closeTab(self.currentTab)
        } else {
            #if targetEnvironment(macCatalyst)
            if let originWindowScene = self.view.window?.windowScene {
@@ -145,17 +145,21 @@ extension BrowserViewController: ShortcutResponder
    }
    
    override func increaseSize(_ sender: Any?) {
-        tab.webView._viewScale += 0.10
+        currentTab.webView._viewScale += 0.10
    }
    
    override func decreaseSize(_ sender: Any?) {
-        tab.webView._viewScale -= 0.10
+        currentTab.webView._viewScale -= 0.10
    }

    func showPreferences(_ sender: Any?) {
        showSettingsWindow()
    }
    
+    func showHistory(_ sender: Any?) {
+        showHistoryWindow()
+    }
+    
    func toggleDarkMode(_ sender: Any?) {
        self.darkModeEnabled = !self.darkModeEnabled
    }
@@ -163,4 +167,14 @@ extension BrowserViewController: ShortcutResponder
    func openInReaderMode(_ sender: Any?) {
        showReaderWindow()
    }
+    
+    func handleOpenURL(_ sender: Any?, forEvent event: OpenURLEvent?) {
+        guard let event else { return }
+        
+        if currentTab.url == nil {
+            currentTab.beginLoadingURL(event.url)
+        } else {
+            createNewTab(withURL: event.url)
+        }
+    }
 }
--- a/View/BrowserViewController+WebKitDelegate.swift
+++ b/View/BrowserViewController+WebKitDelegate.swift
@@ -10,10 +10,10 @@ import WebKit
 extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
 {
    func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        tab.loadError = nil
+        currentTab.loadError = nil
        
        // Check to make sure we have connected to the web content process
-        if !tab.bridge.webContentProcessConnected {
+        if !currentTab.bridge.webContentProcessConnected {
            // This means we started loading a page but the web content process hasn't loaded, which means
            // scripts are not getting blocked.
            
@@ -37,8 +37,8 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
        }
        
        // Reset tracking this
-        tab.allowedScriptOrigins.removeAll()
-        tab.blockedScriptOrigins.removeAll()
+        currentTab.allowedScriptOrigins.removeAll()
+        currentTab.blockedScriptOrigins.removeAll()
        updateScriptBlockerButton()
        
        // Blur url bar if applicable
@@ -48,7 +48,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
        
        if let url = webView.url {
            // Start requesting favicon
-            tab.updateFaviconForURL(url)
+            currentTab.updateFaviconForURL(url)
        }
    }
    
@@ -56,7 +56,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
        // We got rugged!!!!!! Update the favicon again.
        if let url = webView.url {
            // Start requesting favicon
-            tab.updateFaviconForURL(url)
+            currentTab.updateFaviconForURL(url)
        }
    }
    
@@ -90,7 +90,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
            return
        }
        
-        var allowJavaScript = tab.javaScriptEnabled
+        var allowJavaScript = currentTab.javaScriptEnabled
        if !allowJavaScript, let host = navigationAction.request.url?.host {
            // Check origin policy
            allowJavaScript = policyManager.scriptPolicy(forOrigin: host).allowsEmbeddedJavaScript()
@@ -101,7 +101,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
        if let url = navigationAction.request.url,
           let redirectedURL = Settings.shared.redirectRule(for: url)
        {
-            tab.beginLoadingURL(redirectedURL)
+            currentTab.beginLoadingURL(redirectedURL)
            decisionHandler(.cancel, preferences)
        } else {
            decisionHandler(.allow, preferences)
@@ -109,14 +109,14 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
    }
    
    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
-        if webView == tab.webView {
-            tab.loadError = error
+        if webView == currentTab.webView {
+            currentTab.loadError = error
        }
    }
    
    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
-        if webView == tab.webView {
-            tab.loadError = error
+        if webView == currentTab.webView {
+            currentTab.loadError = error
        }
    }
    
@@ -127,7 +127,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
        let newTab = tabController.createNewTab(url: nil, webViewConfiguration: configuration)
        newTab.webView.load(navigationAction.request)
        
-        self.tab = newTab
+        self.currentTab = newTab
        
        return newTab.webView
    }
--- a/View/BrowserViewController.swift
+++ b/View/BrowserViewController.swift
@@ -13,8 +13,8 @@ import UniformTypeIdentifiers
 class BrowserViewController: UIViewController
 {
    let browserView = BrowserView()
-    var tab: Tab { didSet { didChangeTab(tab) } }
-    var webView: WKWebView { tab.webView }
+    var currentTab: Tab { didSet { didChangeTab(currentTab) } }
+    var webView: WKWebView { currentTab.webView }
    
    internal let tabController = TabController()
    internal let tabBarViewController: TabBarViewController
@@ -42,9 +42,9 @@ class BrowserViewController: UIViewController
    static let longPressWindowButtonToMakeNewTab: Bool = false
    
    internal var darkModeEnabled: Bool {
-        get { tab.bridge.darkModeEnabled }
+        get { currentTab.bridge.darkModeEnabled }
        set {
-            tab.bridge.darkModeEnabled = newValue
+            currentTab.bridge.darkModeEnabled = newValue
            toolbarController.darkModeEnabled = newValue
        }
    }
@@ -60,7 +60,7 @@ class BrowserViewController: UIViewController
    internal var changingFocusToAutocompleteController = false
    
    init() {
-        self.tab = tabController.tabs.first!
+        self.currentTab = tabController.tabs.first!
        self.tabBarViewController = TabBarViewController(tabController: tabController)
        super.init(nibName: nil, bundle: nil)
        
@@ -70,7 +70,7 @@ class BrowserViewController: UIViewController
        addChild(findOnPageController)
        addChild(tabBarViewController)
        
-        didChangeTab(tab)
+        didChangeTab(currentTab)
    }
    
    required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
@@ -115,11 +115,11 @@ class BrowserViewController: UIViewController
        // Script button
        toolbarController.scriptControllerIconView.addAction(UIAction(handler: { [unowned self] action in
            let hostOrigin = self.webView.url?.host ?? ""
-            let loadedScripts = self.tab.allowedScriptOrigins.union(self.tab.blockedScriptOrigins)
+            let loadedScripts = currentTab.allowedScriptOrigins.union(currentTab.blockedScriptOrigins)
            let scriptViewController = ScriptPolicyViewController(policyManager: self.policyManager,
                                                                  hostOrigin: hostOrigin,
                                                                  loadedScripts: loadedScripts,
-                                                                  scriptsAllowedForTab: self.tab.javaScriptEnabled)
+                                                                  scriptsAllowedForTab: currentTab.javaScriptEnabled)
            scriptViewController.delegate = self
            
            let navController = UINavigationController(rootViewController: scriptViewController)
@@ -141,7 +141,7 @@ class BrowserViewController: UIViewController
            tabPickerController.delegate = self
            tabPickerController.title = "Tabs"
            tabPickerController.tabBarItem.image = UIImage(systemName: "rectangle.on.rectangle")
-            tabPickerController.selectedTabIdentifier = self.tab.identifier
+            tabPickerController.selectedTabIdentifier = currentTab.identifier
            tabPickerController.tabObserver = tabController.$tabs
                .receive(on: RunLoop.main)
                .sink(receiveValue: { (newTabs: [Tab]) in
@@ -207,7 +207,7 @@ class BrowserViewController: UIViewController
        
        // Error button
        toolbarController.urlBar.errorButton.addAction(UIAction(handler: { [unowned self] _ in
-            let alert = UIAlertController(title: "Error", message: self.tab.loadError?.localizedDescription, preferredStyle: .actionSheet)
+            let alert = UIAlertController(title: "Error", message: currentTab.loadError?.localizedDescription, preferredStyle: .actionSheet)
            alert.popoverPresentationController?.sourceView = self.toolbarController.urlBar.errorButton
            
            alert.addAction(UIAlertAction(title: "Reload", style: .destructive, handler: { _ in
@@ -240,7 +240,7 @@ class BrowserViewController: UIViewController
        
        // Font size adjust
        toolbarController.urlBar.documentButton.addAction(UIAction(handler: { [unowned self] _ in
-            let documentControls = DocumentControlViewController(darkModeEnabled: tab.bridge.darkModeEnabled)
+            let documentControls = DocumentControlViewController(darkModeEnabled: currentTab.bridge.darkModeEnabled)
            documentControls.modalPresentationStyle = .popover
            documentControls.popoverPresentationController?.permittedArrowDirections = [ .down, .up ]
            documentControls.popoverPresentationController?.sourceView = toolbarController.urlBar.documentButton
@@ -250,28 +250,30 @@ class BrowserViewController: UIViewController
            numberFormatter.numberStyle = .percent
            
            let label = documentControls.fontSizeAdjustView.labelView
-            label.text = numberFormatter.string(for: tab.webView._viewScale)
+            label.text = numberFormatter.string(for: currentTab.webView._viewScale)
            
            // Font size adjust
            documentControls.fontSizeAdjustView.decreaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
                self.decreaseSize(sender)
-                label.text = numberFormatter.string(for: tab.webView._viewScale)
+                label.text = numberFormatter.string(for: currentTab.webView._viewScale)
            }), for: .touchUpInside)
            
            documentControls.fontSizeAdjustView.increaseSizeButton.addAction(UIAction(handler: { [unowned self] sender in
                self.increaseSize(sender)
-                label.text = numberFormatter.string(for: tab.webView._viewScale)
+                label.text = numberFormatter.string(for: currentTab.webView._viewScale)
            }), for: .touchUpInside)
            
            // Find on page
            documentControls.findOnPageControlView.addAction(UIAction(handler: { [unowned self] _ in
-                documentControls.dismiss(animated: true, completion: nil)
-                
-                if FindOnPageViewController.isEnabled() {
-                    browserView.setFindOnPageVisible(true, animated: true)
-                } else if #available(iOS 16.0, *) {
-                    browserView.webView?._findInteraction.presentFindNavigatorShowingReplace(false)
-                }
+                documentControls.dismiss(animated: true, completion: { [unowned self] in
+                    // Needs to happen after dismissal, otherwise the find navigator will pick up the document
+                    // controls as the divergent responder/deepest action responder (my bad...).
+                    if FindOnPageViewController.isEnabled() {
+                        browserView.setFindOnPageVisible(true, animated: true)
+                    } else if #available(iOS 16.0, *) {
+                        browserView.webView?.findInteraction?.presentFindNavigator(showingReplace: false)
+                    }
+                })
            }), for: .touchUpInside)
            
            // Navigation controls
@@ -331,6 +333,12 @@ class BrowserViewController: UIViewController
                showShareSheetForCurrentURL(fromViewController: documentControls)
            }, for: .touchUpInside)
            
+            // History
+            documentControls.historyView.addAction(UIAction { [unowned self] action in
+                documentControls.dismiss(animated: false, completion: nil)
+                showHistory(action)
+            }, for: .touchUpInside)
+            
            present(documentControls, animated: true, completion: nil)
        }), for: .touchUpInside)
        
@@ -340,8 +348,8 @@ class BrowserViewController: UIViewController
            .sink(receiveValue: { [unowned self] (activeTab: Int) in
                if activeTab < tabController.tabs.count {
                    let tab = tabController.tabs[activeTab]
-                    if self.tab != tab {
-                        self.tab = tab
+                    if currentTab != tab {
+                        currentTab = tab
                    }
                }
                
@@ -349,6 +357,11 @@ class BrowserViewController: UIViewController
                self.updateTabBarVisibility()
        })
        
+        registerForTraitChanges([UITraitHorizontalSizeClass.self]) { [weak self] (traitEnvironment: Self, previousTraitCollection) in
+            guard let self else { return }
+            toolbarController.reconfigureButtons(for: traitCollection.horizontalSizeClass)
+        }
+        
        self.view = browserView
    }
    
@@ -362,7 +375,7 @@ class BrowserViewController: UIViewController
        let shareableURL = ShareableURL(
            url: url,
            title: webView.title ?? url.absoluteString,
-            favicon: tab.favicon
+            favicon: currentTab.favicon
        )
        
        let activityController = UIActivityViewController(activityItems: [ shareableURL ], applicationActivities: nil)
@@ -436,21 +449,21 @@ class BrowserViewController: UIViewController
    }
    
    internal func showReaderWindow() {
-        tab.bridge.parseDocumentForReaderMode { string in
+        currentTab.bridge.parseDocumentForReaderMode { [currentTab] string in
            DispatchQueue.main.async {
                if self.traitCollection.userInterfaceIdiom == .phone {
-                    let readableViewController = ReaderViewController(readableHTMLString: string, baseURL: self.tab.bridge.webView.url)
-                    readableViewController.title = self.tab.bridge.webView.title
-                    readableViewController.darkModeEnabled = self.tab.bridge.darkModeEnabled
+                    let readableViewController = ReaderViewController(readableHTMLString: string, baseURL: currentTab.bridge.webView.url)
+                    readableViewController.title = currentTab.bridge.webView.title
+                    readableViewController.darkModeEnabled = currentTab.bridge.darkModeEnabled
                    readableViewController.delegate = self
                    
                    let navigationController = UINavigationController(rootViewController: readableViewController)
                    self.present(navigationController, animated: true, completion: nil)
                } else {
                    let userActivity = NSUserActivity(activityType: SessionActivityType.ReaderWindow.rawValue)
-                    userActivity.title = self.tab.title
+                    userActivity.title = currentTab.title
                    userActivity.userInfo = [
-                        ReaderUserActivityKeys.baseURL.rawValue    : self.tab.bridge.webView.url ?? NSNull(),
+                        ReaderUserActivityKeys.baseURL.rawValue    : currentTab.bridge.webView.url ?? NSNull(),
                        ReaderUserActivityKeys.htmlString.rawValue : string,
                    ]
                    let requestOptions = UIWindowScene.ActivationRequestOptions()
@@ -461,8 +474,41 @@ class BrowserViewController: UIViewController
        }
    }
    
+    internal func showHistoryWindow() {
+        let historyViewController = HistoryBrowserViewController { [unowned self] url in
+            if currentTab.url == nil {
+                currentTab.beginLoadingURL(url)
+            } else {
+                createNewTab(withURL: url)
+            }
+            
+            presentedViewController?.dismiss(animated: true)
+        }
+        
+        historyViewController.title = "History"
+        historyViewController.navigationItem.rightBarButtonItem = UIBarButtonItem(systemItem: .done, primaryAction: UIAction { _ in
+            // xxx: This is not the SwiftUI-y way to do this.
+            historyViewController.dismiss(animated: true)
+        })
+        
+        historyViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Clear", primaryAction: UIAction { [unowned self] action in
+            let alertController = UIAlertController(title: "Clear History", message: "Are you sure you want to clear all history?", preferredStyle: .actionSheet)
+            alertController.addAction(UIAlertAction(title: "Clear", style: .destructive, handler: { [unowned self] _ in
+                BrowserHistory.shared.clearAllHistory()
+                presentedViewController?.dismiss(animated: true)
+            }))
+            alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+            alertController.popoverPresentationController?.sourceItem = action.presentationSourceItem
+            
+            presentedViewController?.present(alertController, animated: true)
+        })
+        
+        let navigationController = UINavigationController(rootViewController: historyViewController)
+        present(navigationController, animated: true)
+    }
+    
    internal func updateLoadProgress(forWebView webView: WKWebView) {
-        if let loadError = tab.loadError {
+        if let loadError = currentTab.loadError {
            toolbarController.urlBar.loadProgress = .error(error: loadError)
        } else if webView.estimatedProgress == 1.0 {
            toolbarController.urlBar.loadProgress = .complete
@@ -496,9 +542,9 @@ class BrowserViewController: UIViewController
            tabController.activeTabIndex = activeIndex
        }
        
-        tab.delegate = self
+        currentTab.delegate = self
        
-        let webView = tab.webView
+        let webView = currentTab.webView
        webView.allowsBackForwardNavigationGestures = true
        webView.navigationDelegate = self
        webView.uiDelegate = self
@@ -543,7 +589,7 @@ class BrowserViewController: UIViewController
        updateScriptBlockerButton()
        
        // Enforce dark mode setting
-        tab.bridge.darkModeEnabled = toolbarController.darkModeEnabled
+        currentTab.bridge.darkModeEnabled = toolbarController.darkModeEnabled
        
        // Blur url bar, if applicable
        toolbarController.urlBar.textField.resignFirstResponder()
@@ -572,17 +618,10 @@ class BrowserViewController: UIViewController
        super.viewWillAppear(animated)
        becomeFirstResponder()
    }
-    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
        
-        // Not sure why this doesn't happen automatically...
-        toolbarController.traitCollectionDidChange(previousTraitCollection)
-    }
-    
    internal func updateScriptBlockerButton() {
-        var numBlockedScripts: Int = tab.blockedScriptOrigins.count
-        if tab.url != nil, tab.javaScriptEnabled == false {
+        var numBlockedScripts: Int = currentTab.blockedScriptOrigins.count
+        if currentTab.url != nil, currentTab.javaScriptEnabled == false {
            // Because the page is blocked too, notify.
            numBlockedScripts += 1
        }
@@ -593,7 +632,7 @@ class BrowserViewController: UIViewController
        }
        
        let iconView = toolbarController.scriptControllerIconView
-        iconView.shieldsDown = tab.javaScriptEnabled
+        iconView.shieldsDown = currentTab.javaScriptEnabled
        // iconView.setBlockedScriptsNumber(numBlockedScripts)
        
        if let policy = policy {
@@ -608,7 +647,7 @@ class BrowserViewController: UIViewController
        let newTab = tabController.createNewTab(url: url)
        
        if !loadInBackground {
-            self.tab = newTab
+            currentTab = newTab
            
            if url == nil && traitCollection.userInterfaceIdiom == .mac {
                self.toolbarController.urlBar.textField.becomeFirstResponder()
@@ -616,7 +655,7 @@ class BrowserViewController: UIViewController
        } else {
            // Send this message to get it to load NOW, instead of waiting for it to show up
            // in the view hierarchy.
-            tab.webView.didMoveToWindow()
+            currentTab.webView.didMoveToWindow()
            
            // Update tab bar now
            updateTabBarVisibility()
@@ -637,12 +676,12 @@ extension BrowserViewController: UIPopoverPresentationControllerDelegate
 extension BrowserViewController: ScriptPolicyViewControllerDelegate
 {
    func didChangeScriptPolicy() {
-        tab.bridge.policyDataSourceDidChange()
+        currentTab.bridge.policyDataSourceDidChange()
        webView.reload()
    }
    
    func setScriptsEnabledForTab(_ enabled: Bool) {
-        tab.javaScriptEnabled = enabled
+        currentTab.javaScriptEnabled = enabled
        toolbarController.scriptControllerIconView.shieldsDown = enabled
    }
 }
@@ -650,7 +689,7 @@ extension BrowserViewController: ScriptPolicyViewControllerDelegate
 extension BrowserViewController: AutocompleteViewControllerDelegate
 {
    func autocompleteController(_: AutocompleteViewController, didSelectHistoryItem item: HistoryItem) {
-        tab.beginLoadingURL(item.url)
+        currentTab.beginLoadingURL(item.url)
        autocompleteViewController.view.isHidden = true
    }
 }
@@ -665,7 +704,7 @@ extension BrowserViewController: TabDelegate
 extension BrowserViewController: TabPickerViewControllerDelegate
 {
    func tabPicker(_ picker: TabPickerViewController, createNewTabWithURL url: URL?) {
-        self.tab = tabController.createNewTab(url: url)
+        currentTab = tabController.createNewTab(url: url)
        picker.dismiss(animated: true)
    }
    
@@ -684,7 +723,7 @@ extension BrowserViewController: TabPickerViewControllerDelegate
        
        guard let tab else { return }
        
-        self.tab = tab
+        currentTab = tab
        picker.dismiss(animated: true, completion: nil)
    }
    
@@ -694,7 +733,7 @@ extension BrowserViewController: TabPickerViewControllerDelegate
        tabController.closeTab(tab)
        
        // Dismiss picker if current tab is closed using the picker
-        if tab == self.tab {
+        if tab == currentTab {
            picker.dismiss(animated: true, completion: nil)
        }
    }
@@ -728,10 +767,10 @@ extension BrowserViewController: UITextFieldDelegate
                    }
                }
                
-                tab.beginLoadingURL(url)
+                currentTab.beginLoadingURL(url)
            } else {
                let searchURL = Settings.shared.searchProvider.provider().searchURLWithQuery(text)
-                tab.beginLoadingURL(searchURL)
+                currentTab.beginLoadingURL(searchURL)
            }
            
            textField.resignFirstResponder()
@@ -754,7 +793,7 @@ extension BrowserViewController: UITextFieldDelegate
 extension BrowserViewController: ReaderViewControllerDelegate
 {
    func readerViewController(_ reader: ReaderViewController, didRequestNavigationToURL navigationURL: URL) {
-        tab.beginLoadingURL(navigationURL)
+        currentTab.beginLoadingURL(navigationURL)
    }
 }

--- a/UI/GradientView.swift
+++ b/UI/GradientView.swift
@@ -28,11 +28,17 @@ class GradientView: UIImageView
        self.init(image: nil)
        self.direction = direction
        self.colors = colors
+        
+        registerForTraitChanges([UITraitUserInterfaceStyle.self]) { [weak self] (traitEnvironment: Self, previousTraitCollection) in
+            self?.image = nil
+            self?.setNeedsLayout()
+        }
    }
    
    private func gradientImage(forSize size: CGSize) -> UIImage? {
-        var image: UIImage? = nil
+        guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil }
        
+        var image: UIImage? = nil
        UIGraphicsBeginImageContext(size)
        if let context = UIGraphicsGetCurrentContext() {
            let gradientColorsArray = self.colors.map { $0.cgColor }
@@ -69,12 +75,4 @@ class GradientView: UIImageView
            generatedImageSize = bounds.size
        }
    }
-    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
-        // Regenerate image
-        image = nil
-        setNeedsLayout()
-    }
 }
--- a/UI/ReliefButton.swift
+++ b/UI/ReliefButton.swift
@@ -46,6 +46,8 @@ class ReliefButton: UIButton
            }
        })
        
+        self.imageView?.contentMode = .scaleAspectFit
+        
        shadowView.alpha = 0.28
        shadowView.backgroundColor = UIColor(white: 0.0, alpha: 1.0)
        shadowView.isUserInteractionEnabled = false
@@ -67,12 +69,14 @@ class ReliefButton: UIButton
        backgroundView.layer.rasterizationScale = UIScreen.main.scale
        addSubview(backgroundView)
        
-        traitCollectionDidChange(nil)
+        registerForTraitChanges([UITraitUserInterfaceStyle.self], handler: handleTraitCollectionChange)
        
        pointerStyleProvider = { (button, pointerEffect, pointerShape) -> UIPointerStyle? in
            let preview = UITargetedPreview(view: button)
            return UIPointerStyle(effect: .lift(preview), shape: pointerShape)
        }
+        
+        handleTraitCollectionChange(self, previousCollection: nil)
    }
    
    required init?(coder: NSCoder) {
@@ -97,7 +101,7 @@ class ReliefButton: UIButton
        return inverted ? colors.reversed() : colors
    }
    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+    private func handleTraitCollectionChange(_ environment: UITraitEnvironment, previousCollection: UITraitCollection?) {
        setBackgroundInverted(isHighlighted)
        backgroundView.layer.borderColor = { traitCollection -> UIColor in
            if traitCollection.userInterfaceStyle == .dark {
@@ -105,7 +109,7 @@ class ReliefButton: UIButton
            } else {
                return .white
            }
-        }(traitCollection).cgColor
+        } (traitCollection).cgColor
    }
    
    internal func setBackgroundInverted(_ inverted: Bool) {
@@ -132,8 +136,6 @@ class ReliefButton: UIButton
    }
    
    override func layoutSubviews() {
-        self.imageView?.contentMode = .scaleAspectFit
-        
        super.layoutSubviews()
        
        sendSubviewToBack(backgroundView)
--- a/UI/DocumentControlViewController.swift
+++ b/UI/DocumentControlViewController.swift
@@ -20,6 +20,7 @@ class DocumentControlViewController: UIViewController
    let archiveView              = DocumentControlItemView().title("Archive.today") .symbol("shippingbox")
    let emailView                = DocumentControlItemView().title("Email")         .symbol("envelope")
    let sharingView              = DocumentControlItemView().title("Share")         .symbol("square.and.arrow.up")
+    let historyView              = DocumentControlItemView().title("History")       .symbol("clock.arrow.circlepath")
    let darkModeView             = DocumentControlItemView().title("Dark Mode")
    
    var observations: [NSKeyValueObservation] = []
@@ -46,6 +47,7 @@ class DocumentControlViewController: UIViewController
        documentControlsView.stackView.addArrangedSubview(darkModeView)
        documentControlsView.stackView.addArrangedSubview(readabilityView)
        documentControlsView.stackView.addArrangedSubview(archiveView)
+        documentControlsView.stackView.addArrangedSubview(historyView)
        
        documentControlsView.stackView.addArrangedSubview(settingsView)
        
--- a/Page/FindOnPageViewController.swift
+++ b/Page/FindOnPageViewController.swift
@@ -41,7 +41,7 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate
        
        findOnPageView.textField.addAction(UIAction(handler: { [unowned self] _ in
            self.findString = findOnPageView.textField.text
-            webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount)
+            webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount))
        }), for: .editingChanged)
        
        findOnPageView.prevResultButton.addAction(UIAction(handler: { [unowned self] _ in
@@ -82,24 +82,24 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate
    
    @objc
    override func findNext(_ sender: Any?) {
-        webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount)
+        webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount))
    }
    
    @objc
    override func findPrevious(_ sender: Any?) {
        let options: _WKFindOptions = self.findOptions.union(.backwards)
-        webView?._find(self.findString, options: options, maxCount: self.maxCount)
+        webView?._find(self.findString, options: options, maxCount: Int(self.maxCount))
    }
    
    func _webView(_ webView: WKWebView!, didFailToFind string: String!) {
        // ??
    }
    
-    func _webView(_ webView: WKWebView!, didCountMatches matches: UInt, for string: String!) {
+    private func _webView(_ webView: WKWebView!, didCountMatches matches: UInt, for string: String!) {
        // TODO: Update a label
    }
    
-    func _webView(_ webView: WKWebView!, didFindMatches matches: UInt, for string: String!, withMatch matchIndex: Int) {
+    private func _webView(_ webView: WKWebView!, didFindMatches matches: UInt, for string: String!, withMatch matchIndex: Int) {
        findOnPageView.nextResultButton.isEnabled = matches > 0
        findOnPageView.prevResultButton.isEnabled = matches > 0
    }
--- a/App/Hacks/MFMailComposeViewControllerFix.m
+++ b/App/Hacks/MFMailComposeViewControllerFix.m
@@ -20,7 +20,7 @@ static void swizzleClassMethod(Class targetClass, SEL originalSelector, IMP repl
 }

 __attribute__((constructor))
-static void swizzleMFMailComposeViewController()
+static void swizzleMFMailComposeViewController(void)
 {
    // Hacks to work around the fact that MFMailComposeViewController is broken in iOS 14+
    swizzleClassMethod(MFMailComposeViewController.class, @selector(canSendMail), imp_implementationWithBlock(^BOOL(void) {
--- a/UI/HistoryBrowserViewController.swift
+++ b/UI/HistoryBrowserViewController.swift
@@ -0,0 +1,20 @@
+//
+//  HistoryBrowserViewController.swift
+//  App
+//
+//  Created by James Magahern on 1/20/23.
+//
+
+import SwiftUI
+import UIKit
+
+@MainActor
+class HistoryBrowserViewController: UIHostingController<HistoryView> {
+    public init(onSelectItem: @escaping (URL) -> Void) {
+        super.init(rootView: HistoryView(viewModel: BrowserHistory.shared.viewModel(limit: 500), onSelectItem: onSelectItem))
+    }
+    
+    required dynamic init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
--- a/UI/HistoryView.swift
+++ b/UI/HistoryView.swift
@@ -0,0 +1,78 @@
+//
+//  HistoryView.swift
+//  App
+//
+//  Created by James Magahern on 1/20/23.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+struct HistoryView: View {
+    @StateObject public var viewModel: BrowserHistory.ViewModel
+    @State public var selectedItems = Set<HistoryItem.ID>()
+    public var onSelectItem: (URL) -> Void
+    
+    private let dateFormatter = DateFormatter() .. {
+        $0.locale = Locale.current
+        $0.dateStyle = .medium
+        $0.timeStyle = .short
+    }
+    
+    @Environment(\.dismiss) private var dismissAction
+    @Environment(\.horizontalSizeClass) private var horizontalSizeClass
+        
+    var body: some View {
+        Table(viewModel.historyItems, selection: $selectedItems) {
+            TableColumn("Title") { item in
+                VStack(alignment: .leading) {
+                    Text(item.title.count > 0 ? item.title : item.url.absoluteString)
+                        .lineLimit(1)
+                    
+                    if horizontalSizeClass == .compact {
+                        Text(item.url.shortString()).font(.caption).lineLimit(1)
+                        Text(dateFormatter.string(from: item.lastVisited))
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
+                }
+            }
+            TableColumn("URL", value: \.url.absoluteString)
+            TableColumn("Last Visited") {  item in
+                Text(dateFormatter.string(from: item.lastVisited))
+            }
+        }
+        .contextMenu(forSelectionType: HistoryItem.ID.self, menu: { items in
+            let historyItems = items.compactMap { viewModel.item(forIdentifier: $0) }
+            Button("Copy") {
+                UIPasteboard.general.setItems(historyItems.map { [
+                    UTType.url.identifier           : $0.url,
+                    UTType.utf8PlainText.identifier : $0.url.absoluteString,
+                ] })
+            }
+            
+            Button("Delete") {
+                viewModel.deleteItems(items)
+            }
+        }, primaryAction: { items in
+            items.compactMap({ viewModel.item(forIdentifier: $0) }).forEach { item in
+                onSelectItem(item.url)
+            }
+        })
+        .searchable(text: $viewModel.searchQuery)
+    }
+}
+
+struct HistoryViewPreviewProvider: PreviewProvider {
+    static var previews: some View {
+        HistoryView(viewModel: BrowserHistory.shared.viewModel(), onSelectItem: { _ in })
+            .previewLayout(.fixed(width: 480.0, height: 800.0))
+    }
+}
+
+extension URL {
+    public func shortString() -> String {
+        return String(absoluteString.trimmingPrefix(try! Regex("(.+)://")))
+    }
+}
+
--- a/App/KeyboardShortcuts.swift
+++ b/App/KeyboardShortcuts.swift
@@ -50,6 +50,19 @@ protocol ShortcutResponder: AnyObject {
    
    @objc
    optional func openInReaderMode(_ sender: Any?)
+    
+    @objc
+    optional func showHistory(_ sender: Any?)
+    
+    @objc
+    optional func handleOpenURL(_ sender: Any?, forEvent event: OpenURLEvent?)
+}
+
+public class OpenURLEvent: UIEvent {
+    let url: URL
+    public init(url: URL) {
+        self.url = url
+    }
 }

 fileprivate extension Array {
--- a/Delegates/BrowserSceneDelegate.swift
+++ b/Delegates/BrowserSceneDelegate.swift
@@ -30,7 +30,7 @@ class BrowserSceneDelegate: UIResponder, UIWindowSceneDelegate {
        
        if let urlContext = connectionOptions.urlContexts.first {
            let url = urlContext.url
-            browserViewController.tab.beginLoadingURL(url)
+            browserViewController.currentTab.beginLoadingURL(url)
        }
        
 #if targetEnvironment(macCatalyst)
@@ -59,8 +59,8 @@ class BrowserSceneDelegate: UIResponder, UIWindowSceneDelegate {
    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>)
    {
        for urlContext in URLContexts {
-            if browserViewController?.tab.url == nil {
-                browserViewController?.tab.beginLoadingURL(urlContext.url)
+            if browserViewController?.currentTab.url == nil {
+                browserViewController?.currentTab.beginLoadingURL(urlContext.url)
            } else {
                browserViewController?.createNewTab(withURL: urlContext.url)
            }
--- a/App/Settings/GeneralSettingsViewController.swift
+++ b/App/Settings/GeneralSettingsViewController.swift
@@ -32,18 +32,45 @@ struct TextFieldContentConfiguration : UIContentConfiguration
 {
    var text: String = ""
    var placeholderText: String? = nil
-    var textChanged: ((String) -> Void)
+    var textChanged: ((String) -> Void)? = nil
+    var pressedReturn: ((UITextField) -> Void)? = nil
+    var keyboardType: UIKeyboardType = .default
+    var returnKeyType: UIReturnKeyType = .default
    
    func makeContentView() -> UIView & UIContentView {
        let textField = UITextField(frame: .zero)
        textField.borderStyle = .roundedRect
        textField.autocorrectionType = .no
        textField.autocapitalizationType = .none
+        textField.keyboardType = keyboardType
+        textField.returnKeyType = returnKeyType
        
        return GenericContentView<UITextField, TextFieldContentConfiguration>(configuration: self, view: textField) { config, textField in
            textField.text = config.text
            textField.placeholder = config.placeholderText
-            textField.addAction(UIAction { _ in config.textChanged(textField.text ?? "") }, for: .editingChanged)
+            
+            if let textChanged = config.textChanged {
+                textField.addAction(UIAction { _ in textChanged(textField.text ?? "") }, for: .editingChanged)
+            }
+            
+            if let pressedReturn = config.pressedReturn {
+                class ReturnDelegate : NSObject, UITextFieldDelegate {
+                    var pressedReturn: ((UITextField) -> Void)
+                    
+                    public init(pressedReturn: @escaping ((UITextField) -> Void)) {
+                        self.pressedReturn = pressedReturn
+                    }
+                    
+                    public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+                        pressedReturn(textField)
+                        return false
+                    }
+                }
+                
+                let delegate = ReturnDelegate(pressedReturn: pressedReturn)
+                objc_setAssociatedObject(textField, "returnDelegate", delegate, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+                textField.delegate = delegate
+            }
        }
    }
    
@@ -111,7 +138,7 @@ class GeneralSettingsViewController: UIViewController
                layoutSize: headerFooterSize,
                elementKind: UICollectionView.elementKindSectionHeader,
                alignment: .topLeading,
-                absoluteOffset: CGPoint(x: insets.leading, y: insets.top)
+                absoluteOffset: CGPoint(x: insets.leading, y: insets.top + 5.0)
            )
            sectionHeader.extendsBoundary = false
            sectionHeader.contentInsets = insets
@@ -173,7 +200,10 @@ class GeneralSettingsViewController: UIViewController
                    placeholderText: "https://sync.server.com",
                    textChanged: { newString in
                        Settings.shared.syncServer = newString
-                    }
+                    },
+                    pressedReturn: { $0.resignFirstResponder() },
+                    keyboardType: .URL,
+                    returnKeyType: .done
                )
            }
            
@@ -203,6 +233,7 @@ class GeneralSettingsViewController: UIViewController
        
        super.init(nibName: nil, bundle: nil)
        
+        collectionView.delegate = self
        tabBarItem.title = "General"
        tabBarItem.image = UIImage(systemName: "gear")
    }
@@ -228,3 +259,9 @@ class GeneralSettingsViewController: UIViewController
    }

 }
+
+extension GeneralSettingsViewController : UICollectionViewDelegate {
+    func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+        false
+    }
+}
--- a/App/Settings/RedirectRulesSettingsViewController.swift
+++ b/App/Settings/RedirectRulesSettingsViewController.swift
@@ -229,13 +229,19 @@ class CreateRedirectRuleViewController: UICollectionViewController
        
        sectionHeaderImageView.contentMode = .scaleAspectFit
        
-        fromHostField.placeholder = "https://fromhostname.com"
+        fromHostField.placeholder = "fromhostname.com"
        fromHostField.autocorrectionType = .no
        fromHostField.autocapitalizationType = .none
+        fromHostField.keyboardType = .URL
+        fromHostField.returnKeyType = .next
+        fromHostField.delegate = self
        
-        toHostField.placeholder = "https://tohostname.com"
+        toHostField.placeholder = "tohostname.com"
        toHostField.autocorrectionType = .no
        toHostField.autocapitalizationType = .none
+        toHostField.keyboardType = .URL
+        toHostField.returnKeyType = .done
+        toHostField.delegate = self
    }
    
    required init?(coder: NSCoder) {
@@ -256,3 +262,15 @@ class CreateRedirectRuleViewController: UICollectionViewController
    }
 }

+extension CreateRedirectRuleViewController : UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        if textField == fromHostField {
+            toHostField.becomeFirstResponder()
+        } else if textField == toHostField {
+            toHostField.resignFirstResponder()
+        }
+        
+        return false
+    }
+}
+
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-1024.0x1024.0@1x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-1024.0x1024.0@1x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-20.0x20.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-20.0x20.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-20.0x20.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-20.0x20.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-29.0x29.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-29.0x29.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-29.0x29.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-29.0x29.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-38.0x38.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-38.0x38.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-38.0x38.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-38.0x38.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-40.0x40.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-40.0x40.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-40.0x40.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-40.0x40.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-60.0x60.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-60.0x60.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-60.0x60.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-60.0x60.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-64.0x64.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-64.0x64.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-64.0x64.0@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-64.0x64.0@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-68.0x68.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-68.0x68.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-76.0x76.0@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-76.0x76.0@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5x83.5@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Files/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,110 +1,114 @@
 {
  "images" : [
    {
-      "filename" : "icon-Notification@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-20.0x20.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "20x20"
    },
    {
-      "filename" : "icon-Notification@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-20.0x20.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "3x",
      "size" : "20x20"
    },
    {
-      "filename" : "icon-Settings@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-29.0x29.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "29x29"
    },
    {
-      "filename" : "icon-Settings@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-29.0x29.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "3x",
      "size" : "29x29"
    },
    {
-      "filename" : "icon-Spotlight-40@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-38.0x38.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "AppIcon-38.0x38.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "filename" : "AppIcon-40.0x40.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "40x40"
    },
    {
-      "filename" : "icon-Spotlight-40@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-40.0x40.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "3x",
      "size" : "40x40"
    },
    {
-      "filename" : "icon-60@2x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-60.0x60.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "60x60"
    },
    {
-      "filename" : "icon-60@3x.png",
-      "idiom" : "iphone",
+      "filename" : "AppIcon-60.0x60.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "3x",
      "size" : "60x60"
    },
    {
-      "filename" : "icon-Notification~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "icon-Notification@2x ~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-64.0x64.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
-      "size" : "20x20"
+      "size" : "64x64"
    },
    {
-      "filename" : "icon-Settings~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
+      "filename" : "AppIcon-64.0x64.0@3x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
    },
    {
-      "filename" : "icon-Settings@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-68.0x68.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
-      "size" : "29x29"
+      "size" : "68x68"
    },
    {
-      "filename" : "icon-Spotlight-40~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon-Spotlight-40@2x~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "icon-76~ipad.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "icon-76@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-76.0x76.0@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "76x76"
    },
    {
-      "filename" : "icon-83.5@2x~ipad.png",
-      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "2x",
      "size" : "83.5x83.5"
    },
    {
-      "filename" : "iconios~marketing-1.png",
-      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-1024.0x1024.0@1x.png",
+      "idiom" : "universal",
+      "platform" : "ios",
      "scale" : "1x",
      "size" : "1024x1024"
    }
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-76@2x~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-76@2x~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-76~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-76~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@2x
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@2x
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Notification~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@2x~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@2x~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Settings~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@2x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@2x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@2x~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@2x~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@3x.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40@3x.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40~ipad.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/icon-Spotlight-40~ipad.png
--- a/Files/Assets.xcassets/AppIcon.appiconset/iconios~marketing-1.png
+++ b/Files/Assets.xcassets/AppIcon.appiconset/iconios~marketing-1.png
--- a/Bar/TitlebarView.swift
+++ b/Bar/TitlebarView.swift
@@ -61,11 +61,7 @@ class TitlebarView: UIView
    
    private let separatorView = UIView(frame: .zero)
    private let securityIndicatorView = SecurityIndicatorView()
-    
-    override var _sceneDraggingBehaviorOnPan: _UIViewSceneDraggingBehaviorOnPan {
-        _UIViewSceneDraggingBehaviorOnPan.dragScene
-    }
-    
+        
    convenience init() {
        self.init(frame: .zero)
        addSubview(backgroundView)
@@ -88,6 +84,11 @@ class TitlebarView: UIView
        securityIndicatorView.label.font = UIFont.systemFont(ofSize: 10.0)
        
        backgroundView.alpha = 0.98
+        
+        // Make draggable
+        if #available(iOS 17.0, *) {
+            addInteraction(UIWindowSceneDragInteraction())
+        }
    }
    
    func setTitle(_ title: String) {
--- a/Bar/ToolbarView.swift
+++ b/Bar/ToolbarView.swift
@@ -9,9 +9,18 @@ import UIKit

 class ToolbarView: UIView
 {
-    var urlBar: URLBar? { didSet { containerView.addSubview(urlBar!) } }
+    var urlBar: URLBar? {
+        didSet {
+            guard let urlBar else { return }
+            containerView.addSubview(urlBar)
+            
+            urlBar.textField.addAction(.init(handler: { [unowned self] _ in
+                layoutLatch.activate()
+            }), for: [ .editingDidBegin, .editingDidEnd ])
+        }
+    }
    
-    var cancelButtonVisible: Bool = false { didSet { layoutSubviews() } }
+    var cancelButtonVisible: Bool = false { didSet { setNeedsLayout() } }
    
    let containerView = UIView(frame: .zero)
    let backgroundView = GradientView(direction: .vertical, colors: [
@@ -23,6 +32,9 @@ class ToolbarView: UIView
    let leadingButtonsView = ToolbarButtonContainerView(frame: .zero)
    let trailingButtonsView = ToolbarButtonContainerView(frame: .zero)
    
+    // Something I'm sure I'll regret: to ensure animation with the keyboard, latch layout until we get the right signal.
+    lazy var layoutLatch = LayoutLatch(self)
+    
    convenience init()
    {
        self.init(frame: .zero)
@@ -54,6 +66,7 @@ class ToolbarView: UIView
    
    override func layoutSubviews()
    {
+        guard !layoutLatch.latched else { return }
        super.layoutSubviews()
        
        let shadowPath = UIBezierPath(rect: bounds)
--- a/Bar/ToolbarViewController.swift
+++ b/Bar/ToolbarViewController.swift
@@ -66,10 +66,13 @@ class ToolbarViewController: UIViewController
        newTabButton.setImage(UIImage(systemName: "plus"), for: .normal)
        
        let toolbarAnimationDuration: TimeInterval = 0.3
-        urlBar.textField.addAction(.init(handler: { [traitCollection, toolbarView, urlBar] _ in
-            if traitCollection.horizontalSizeClass == .compact {
-                UIView.animate(withDuration: toolbarAnimationDuration) {
-                    toolbarView.cancelButtonVisible = urlBar.textField.isFirstResponder
+        urlBar.textField.addAction(.init(handler: { [weak self] _ in
+            guard let self, let parent else { return }
+            
+            // xxx: Not sure why I need to refer to parent here. This view controller isn't inheriting anything.
+            if parent.traitCollection.horizontalSizeClass == .compact {
+                UIView.animate(withDuration: toolbarAnimationDuration) { [unowned self] in
+                    self.toolbarView.cancelButtonVisible = self.urlBar.textField.isFirstResponder
                }
            }
        }), for: [ .editingDidBegin, .editingDidEnd ])
@@ -78,12 +81,10 @@ class ToolbarViewController: UIViewController
            urlBar.textField.resignFirstResponder()
        }), for: .touchUpInside)
        
-        traitCollectionDidChange(nil)
+        reconfigureButtons(for: traitCollection.horizontalSizeClass)
    }
    
-    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        super.traitCollectionDidChange(previousTraitCollection)
-        
+    public func reconfigureButtons(for horizontalSizeClass: UIUserInterfaceSizeClass) {
        toolbarView.leadingButtonsView.removeAllButtonViews()
        toolbarView.trailingButtonsView.removeAllButtonViews()
        
@@ -92,7 +93,7 @@ class ToolbarViewController: UIViewController
        }
        
        // Setup toolbar based on trait collection
-        if traitCollection.horizontalSizeClass == .compact {
+        if horizontalSizeClass == .compact {
            toolbarView.trailingButtonsView.addButtonView(scriptControllerIconView)
            toolbarView.trailingButtonsView.addButtonView(newTabButton)
            toolbarView.trailingButtonsView.addButtonView(windowButton)
--- a/Bar/URLBar.swift
+++ b/Bar/URLBar.swift
@@ -153,20 +153,12 @@ class URLBar: ReliefButton
        textField.font = .systemFont(ofSize: 13.0)
        textField.clearButtonMode = .never
        textField.placeholder = "URL or search term"
-        textField.addAction(UIAction(handler: { [unowned self] _ in
-            // Mask view visibility is affected by editing state.
-            self.layoutSubviews()
-        }), for: [ .editingDidBegin, .editingDidEnd ])
        textField.keyCommands = [
            UIKeyCommand(action: #selector(Self.downKeyPressed), input: UIKeyCommand.inputDownArrow)
                .prioritizeOverSystem()
        ]
        addSubview(textField)
        
-        textField.addAction(.init(handler: { [textField, refreshButton ] _ in
-            refreshButton.isHidden = textField.isFirstResponder
-        }), for: [ .editingDidBegin, .editingDidEnd ])
-        
        refreshButton.tintColor = .secondaryLabel
        refreshButton.setImage(refreshImage, for: .normal)
        refreshButton.isPointerInteractionEnabled = true
@@ -189,6 +181,7 @@ class URLBar: ReliefButton
        documentSeparatorView.backgroundColor = .secondarySystemFill
        addSubview(documentSeparatorView)
        
+        controlsView.autoresizingMask = []
        controlsView.clearButton.addAction(.init(handler: { [textField] _ in
            textField.clearText()
        }), for: .primaryActionTriggered)
@@ -281,8 +274,9 @@ class URLBar: ReliefButton
    }
    
    private func fadeBackgroundImageForSize(_ size: CGSize, cutoffLocation: CGFloat) -> UIImage? {
-        var image: UIImage? = nil
+        guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil }
        
+        var image: UIImage? = nil
        UIGraphicsBeginImageContext(CGSize(width: size.width, height: 1.0))
        if let context = UIGraphicsGetCurrentContext() {
            let gradientColorsArray = [
@@ -292,6 +286,7 @@ class URLBar: ReliefButton
                UIColor(white: 1.0, alpha: 0.08).cgColor
            ]
            
+            let cutoffLocation = CGFloat.minimum(0.9, cutoffLocation)
            let locations: [CGFloat] = [
                0.0, cutoffLocation, cutoffLocation + 0.10, 1.0
            ]
@@ -343,6 +338,9 @@ class URLBar: ReliefButton
        )
        documentSeparatorView.frame = documentSeparatorView.frame.insetBy(dx: 0.0, dy: 3.0)
        
+        // Text field controls
+        controlsView.frame = CGRect(origin: controlsView.frame.origin, size: controlsView.sizeThatFits(bounds.size))
+        
        // Text field
        let textFieldPadding: CGFloat = 6.0
        let textFieldOrigin = CGPoint(x: documentButton.frame.maxX + textFieldPadding, y: 0.0)
@@ -360,8 +358,18 @@ class URLBar: ReliefButton
        let refreshButtonSize = CGSize(width: textField.frame.height, height: textField.frame.height)
        refreshButton.frame = CGRect(origin: CGPoint(x: bounds.width - refreshButtonSize.width, y: 0), size: refreshButtonSize)
        
+        // Refresh vs. controls view visibility
+        let isFocused = textField.isFirstResponder
+        if isFocused {
+            controlsView.alpha = 1.0
+            refreshButton.alpha = 0.0
+        } else {
+            controlsView.alpha = 0.0
+            refreshButton.alpha = 1.0
+        }
+        
        // Error button
-        if case .error(error: _) = loadProgress, !textField.isFirstResponder {
+        if case .error(error: _) = loadProgress, !isFocused {
            errorButton.isHidden = false
            errorButton.sizeToFit()
            errorButton.frame = CGRect(
@@ -379,7 +387,7 @@ class URLBar: ReliefButton
        // Fade mask
        fadeMaskView.frame = textField.bounds
        fadeMaskView.image = fadeBackgroundImageForSize(fadeMaskView.frame.size, cutoffLocation: fadeCutoffLocation)
-        if !textField.isFirstResponder {
+        if !isFocused {
            textField.mask = fadeMaskView
        } else {
            textField.mask = nil
--- a/App/Utilities/LayoutLatch.swift
+++ b/App/Utilities/LayoutLatch.swift
@@ -0,0 +1,30 @@
+//
+//  LayoutLatch.swift
+//  App
+//
+//  Created by James Magahern on 8/10/23.
+//
+
+import Foundation
+
+class LayoutLatch {
+    public weak var view: UIView?
+    public private(set) var latched: Bool = false
+    
+    init(_ view: UIView) {
+        self.view = view
+    }
+    
+    public func activate() {
+        latched = true
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100)) { [weak self] in
+            self?.deactivate()
+        }
+    }
+    
+    public func deactivate() {
+        latched = false
+        view?.setNeedsLayout()
+    }
+}
--- a/App/Utilities/StringUtilities.swift
+++ b/App/Utilities/StringUtilities.swift
@@ -0,0 +1,26 @@
+//
+//  StringUtilities.swift
+//  App
+//
+//  Created by James Magahern on 7/31/24.
+//
+
+import Foundation
+
+extension String {
+    internal func middleTruncatedString(maximumLength: Int) -> String {
+        if maximumLength > self.count {
+            return self
+        }
+        
+        // Compute replacement range
+        let pivot = self.count / 2
+        let truncationLength = self.count - maximumLength
+        
+        let pivotIndex = self.index(startIndex, offsetBy: pivot)
+        let startIndex = self.index(pivotIndex, offsetBy: -truncationLength / 2)
+        let endIndex = self.index(pivotIndex, offsetBy: truncationLength / 2)
+        
+        return replacingCharacters(in: startIndex..<endIndex, with: "…")
+    }
+}
--- a/App/Utilities/UIView+Utils.swift
+++ b/App/Utilities/UIView+Utils.swift
@@ -7,6 +7,15 @@

 import UIKit

+infix operator .. : AssignmentPrecedence
+
+@discardableResult @inline(__always) @inlinable
+public func .. <T: Any>(it: T, apply: (inout T) throws -> Void) rethrows -> T {
+    var it = it
+    try apply(&it)
+    return it
+}
+
 protocol Conf { }

 extension Conf {
--- a/Bridge/SBRProcessBundleBridge.m
+++ b/Bridge/SBRProcessBundleBridge.m
@@ -113,8 +113,8 @@
        
        // Instantiate web view
        WKWebView *webView = [[WKWebView alloc] initWithFrame:CGRectZero configuration:webViewConfiguration];
-        if ([webView respondsToSelector:@selector(_setFindInteractionEnabled:)]) {
-            webView._findInteractionEnabled = YES;
+        if (@available(iOS 16.0, *)) {
+            webView.findInteractionEnabled = YES;
        }
        
        // Configure proxy interface (interface to remote web process)
--- a/Bridge/SBRScriptPolicy.m
+++ b/Bridge/SBRScriptPolicy.m
@@ -77,6 +77,10 @@ static CGFloat RoundToScale(CGFloat v, CGFloat s) {
 + (UIImage *)iconRepresentationForPolicyType:(SBRScriptOriginPolicyType)policyType withConfiguration:(nonnull SBRScriptPolicyIconConfiguration *)configuration
 {
    const CGSize size = [configuration size];
+    if (size.width < CGFLOAT_EPSILON || size.height < CGFLOAT_EPSILON) {
+        return nil;
+    }
+    
    UIFont *font = [UIFont boldSystemFontOfSize:size.height - 2];
    NSDictionary<NSAttributedStringKey, id> *attrs = @{
        NSFontAttributeName : font,
--- a/README.md
+++ b/README.md
@@ -0,0 +1,28 @@
+# Attractor
+
+Attractor is a web browser for iOS and macOS prioritizing security and aggresive content filtering, and some nifty useful features. 
+
+![](Screenshots/main.png)
+
+## Security Modes
+
+Attractor aggresively filters unwanted web content and prevents arbitrary code execution (JavaScript) by default. I created a special browser for this purpose. Philosophically speaking, I believe the web should primarily be used as a document viewer (as originally intended by [Tim Berners-Lee](https://en.wikipedia.org/wiki/World_wide_web)). Interactive web applications are fine, but the *default* mode should be document viewing, which is why this security model exists. 
+
+Attractor operates in five "security modes":
+1. **Alpha** (Default) All JavaScript is blocked, as well as web fonts and iframes. 
+2. **Bravo** Only embedded scripts are allowed. This means any JavaScript enclosed in `<script>` tags. Often this is enough to allow form validation to occur without issue. 
+3. **Charlie** Allows external JavaScript, but only from the same security origin. Meaning, if browsing `buzzert.net`, only external scripts from the domain `buzzert.net` (or subdomains) are allowed to execute. 
+4. **Delta** Allows external JavaScript, but only from a curated list of common CDNs. 
+5. **Echo** All scripts are allowed. 
+   
+## Other features
+
+- Dark mode (a very good one that uses low-level stylesheet injection to prevent flicker) 
+- Tab syncing
+- Share via Email
+- Reader Mode
+- Arbitrary zoom scale
+- User-defined scripts and stylesheets via UI
+- Custom redirect rules
+- Catalyst and iPadOS support
+
--- a/SBrowser.xcodeproj/project.pbxproj
+++ b/SBrowser.xcodeproj/project.pbxproj
@@ -40,6 +40,8 @@
 		1ADFF4CD24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ADFF4CC24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift */; };
 		CD01D5A5254A10BB00189CDC /* TabBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD01D5A4254A10BB00189CDC /* TabBarView.swift */; };
 		CD01D5AB254A206D00189CDC /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD01D5AA254A206D00189CDC /* TabBarViewController.swift */; };
+		CD15332F297B6798009A7F3A /* HistoryBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */; };
+		CD153331297B6806009A7F3A /* HistoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD153330297B6806009A7F3A /* HistoryView.swift */; };
 		CD16844D269E709400B8F8A5 /* Box.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD16844C269E709400B8F8A5 /* Box.swift */; };
 		CD19576D268BE95900E8089B /* GenericContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD19576C268BE95900E8089B /* GenericContentView.swift */; };
 		CD361CF6271A3718006E9CA5 /* SBRScriptPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD361CF5271A3718006E9CA5 /* SBRScriptPolicy.m */; };
@@ -57,10 +59,12 @@
 		CD853BCE24E7763900D2BDCC /* BrowserHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD853BCD24E7763900D2BDCC /* BrowserHistory.swift */; };
 		CD853BD124E778B800D2BDCC /* History.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = CD853BCF24E778B800D2BDCC /* History.xcdatamodeld */; };
 		CD853BD424E77BF900D2BDCC /* HistoryItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD853BD324E77BF900D2BDCC /* HistoryItem.swift */; };
+		CD8DBE7B2A85D892006A0FE0 /* LayoutLatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */; };
 		CD936A3B289DB3380093A1AC /* TabInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD936A3A289DB3380093A1AC /* TabInfo.swift */; };
 		CD936A3D289DB88B0093A1AC /* UIView+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */; };
 		CD97CF9225D5BE6F00288FEE /* NavigationControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD97CF9125D5BE6F00288FEE /* NavigationControlsView.swift */; };
 		CD9B88C2272201E900DAAB7E /* SBRScriptPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD361CF5271A3718006E9CA5 /* SBRScriptPolicy.m */; };
+		CDACE18C2C5B09F00053AB29 /* StringUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */; };
 		CDAD9CE8263A2DF200FF7199 /* DocumentControlsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDAD9CE7263A2DF200FF7199 /* DocumentControlsView.swift */; };
 		CDAD9CEA263A318F00FF7199 /* ShareableURL.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDAD9CE9263A318F00FF7199 /* ShareableURL.swift */; };
 		CDB6807D28B446FC007D787E /* ReaderSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDB6807C28B446FC007D787E /* ReaderSceneDelegate.swift */; };
@@ -150,6 +154,8 @@
 		1ADFF4CC24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptOriginPolicyViewController.swift; sourceTree = "<group>"; };
 		CD01D5A4254A10BB00189CDC /* TabBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarView.swift; sourceTree = "<group>"; };
 		CD01D5AA254A206D00189CDC /* TabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
+		CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryBrowserViewController.swift; sourceTree = "<group>"; };
+		CD153330297B6806009A7F3A /* HistoryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryView.swift; sourceTree = "<group>"; };
 		CD16844C269E709400B8F8A5 /* Box.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Box.swift; sourceTree = "<group>"; };
 		CD19576C268BE95900E8089B /* GenericContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericContentView.swift; sourceTree = "<group>"; };
 		CD361CF4271A3718006E9CA5 /* SBRScriptPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SBRScriptPolicy.h; sourceTree = "<group>"; };
@@ -168,9 +174,11 @@
 		CD853BCD24E7763900D2BDCC /* BrowserHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BrowserHistory.swift; sourceTree = "<group>"; };
 		CD853BD024E778B800D2BDCC /* History.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = History.xcdatamodel; sourceTree = "<group>"; };
 		CD853BD324E77BF900D2BDCC /* HistoryItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryItem.swift; sourceTree = "<group>"; };
+		CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutLatch.swift; sourceTree = "<group>"; };
 		CD936A3A289DB3380093A1AC /* TabInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabInfo.swift; sourceTree = "<group>"; };
 		CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Utils.swift"; sourceTree = "<group>"; };
 		CD97CF9125D5BE6F00288FEE /* NavigationControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationControlsView.swift; sourceTree = "<group>"; };
+		CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringUtilities.swift; sourceTree = "<group>"; };
 		CDAD9CE7263A2DF200FF7199 /* DocumentControlsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentControlsView.swift; sourceTree = "<group>"; };
 		CDAD9CE9263A318F00FF7199 /* ShareableURL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareableURL.swift; sourceTree = "<group>"; };
 		CDB6807C28B446FC007D787E /* ReaderSceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderSceneDelegate.swift; sourceTree = "<group>"; };
@@ -302,6 +310,7 @@
 				CDCE2662251AA7FC007FE92A /* Document Controls UI */,
 				1AD3104125254FA300A4A952 /* Find on Page */,
 				CD7F2133265DACEE0001D042 /* Hacks */,
+				CD15332D297B6784009A7F3A /* History UI */,
 				CDC5DA3C25DB7A5500BA8D99 /* Reader View */,
 				CDB6807B28B4456B007D787E /* Scene Delegates */,
 				1ADFF4CE24CBBCBD006DC7AE /* Script Policy UI */,
@@ -391,6 +400,8 @@
 				1AB88F0524D4D3A90006F850 /* UIGestureRecognizer+Actions.swift */,
 				CDEDD8A925D62ADB00862605 /* UITraitCollection+MacLike.swift */,
 				CD936A3C289DB88B0093A1AC /* UIView+Utils.swift */,
+				CD8DBE7A2A85D892006A0FE0 /* LayoutLatch.swift */,
+				CDACE18B2C5B09F00053AB29 /* StringUtilities.swift */,
 			);
 			path = Utilities;
 			sourceTree = "<group>";
@@ -406,6 +417,15 @@
 			path = "Script Policy UI";
 			sourceTree = "<group>";
 		};
+		CD15332D297B6784009A7F3A /* History UI */ = {
+			isa = PBXGroup;
+			children = (
+				CD15332E297B6798009A7F3A /* HistoryBrowserViewController.swift */,
+				CD153330297B6806009A7F3A /* HistoryView.swift */,
+			);
+			path = "History UI";
+			sourceTree = "<group>";
+		};
 		CD7A7E9B2686A99600E20BA3 /* Amber */ = {
 			isa = PBXGroup;
 			children = (
@@ -634,6 +654,7 @@
 				CDB6807D28B446FC007D787E /* ReaderSceneDelegate.swift in Sources */,
 				CDD0522425F8055700DD1771 /* SearchProvider.swift in Sources */,
 				CD853BD424E77BF900D2BDCC /* HistoryItem.swift in Sources */,
+				CD15332F297B6798009A7F3A /* HistoryBrowserViewController.swift in Sources */,
 				1ADFF48D24C8C176006DC7AE /* SBRProcessBundleBridge.m in Sources */,
 				1AB88F0624D4D3A90006F850 /* UIGestureRecognizer+Actions.swift in Sources */,
 				CD7313E4270534B800053347 /* ScriptPolicyViewControllerDelegate.swift in Sources */,
@@ -641,6 +662,7 @@
 				CD16844D269E709400B8F8A5 /* Box.swift in Sources */,
 				CD853BCE24E7763900D2BDCC /* BrowserHistory.swift in Sources */,
 				1A03810B24E71C5600826501 /* ToolbarButtonContainerView.swift in Sources */,
+				CD8DBE7B2A85D892006A0FE0 /* LayoutLatch.swift in Sources */,
 				CD7A7EA12686B2E600E20BA3 /* RedirectRulesSettingsViewController.swift in Sources */,
 				1ADFF4CB24CB8278006DC7AE /* ScriptControllerIconView.swift in Sources */,
 				CD7A8915251975B70075991E /* AutocompleteViewController.swift in Sources */,
@@ -654,6 +676,7 @@
 				CDAD9CE8263A2DF200FF7199 /* DocumentControlsView.swift in Sources */,
 				1ADFF4C924CA793E006DC7AE /* ToolbarViewController.swift in Sources */,
 				CD7A89172519872D0075991E /* KeyboardShortcuts.swift in Sources */,
+				CDACE18C2C5B09F00053AB29 /* StringUtilities.swift in Sources */,
 				1ADFF4CD24CBB0C8006DC7AE /* ScriptOriginPolicyViewController.swift in Sources */,
 				CDE6A30425F023BC00E912A4 /* AmberSettingsViewController.swift in Sources */,
 				1A14FC2824D26749009B3F83 /* Tab.swift in Sources */,
@@ -663,6 +686,7 @@
 				CD01D5AB254A206D00189CDC /* TabBarViewController.swift in Sources */,
 				1ADFF47924C7DFF8006DC7AE /* BrowserView.swift in Sources */,
 				CDCE2664251AA80F007FE92A /* DocumentControlViewController.swift in Sources */,
+				CD153331297B6806009A7F3A /* HistoryView.swift in Sources */,
 				CDF3468E276C105900FB3141 /* SettingsSceneDelegate.swift in Sources */,
 				1AB88EFF24D3BBA50006F850 /* TabPickerViewController.swift in Sources */,
 				CD19576D268BE95900E8089B /* GenericContentView.swift in Sources */,
@@ -756,7 +780,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -813,7 +837,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos.internal;
--- a/SBrowserProcessBundle/SBRWebProcessProxy.h
+++ b/SBrowserProcessBundle/SBRWebProcessProxy.h
@@ -7,15 +7,15 @@

 #import <Foundation/Foundation.h>

-static inline NSString* SBRGetAllowedOriginsKey() {
+static inline NSString* SBRGetAllowedOriginsKey(void) {
    return @"allowedOrigins";
 }

-static inline NSString* SBRGetAllScriptsAllowedKey() {
+static inline NSString* SBRGetAllScriptsAllowedKey(void) {
    return @"allScriptsAllowed";
 }

-static inline NSString* SBRGetPolicyTypeByOriginKey() {
+static inline NSString* SBRGetPolicyTypeByOriginKey(void) {
    return @"policyTypeByOrigin";
 }

--- a/Screenshots/main.png
+++ b/Screenshots/main.png
Author	SHA1	Message	Date
James Magahern	29057c8024	History menu improvements	2024-07-31 17:53:23 -07:00
James Magahern	a0056af8b1	Update for iOS 17.	2024-07-29 19:21:51 -07:00
James Magahern	6dccb25b3e	TitlebarView: move to drag api	2024-05-10 17:01:14 -07:00
James Magahern	eec57f5f31	History UI improvements	2023-09-26 16:23:35 -07:00
James Magahern	d9fa5adf00	Adds README and screenshot	2023-09-17 20:30:21 -07:00
James Magahern	a4c6caeb8e	Another attempt to fix empty URL bar	2023-08-10 19:52:59 -07:00
James Magahern	3f5d608908	Even better AI generated icon	2023-04-19 14:39:06 -07:00
James Magahern	99bd3af187	Fix warnings	2023-04-19 14:33:17 -07:00
James Magahern	98dfd85781	Small Settings QOL improvements	2023-04-19 14:30:06 -07:00
James Magahern	6a187b0df3	Update icon to use Midjourney generated one	2023-04-19 11:45:21 -07:00
James Magahern	dca5aca1ce	UIGraphicsImageContext: both dimensions must be > 0	2023-04-19 11:40:57 -07:00
James Magahern	f8d19414d5	Avoid generating zero size bitmaps	2023-04-14 19:37:31 -07:00
James Magahern	748023d330	Adds history menu	2023-01-27 13:46:23 -08:00
James Magahern	6f41caff62	HistoryView: Compact UI for phones	2023-01-25 16:13:09 -08:00
James Magahern	34ca35ea5a	HistoryView: Adds ability to delete history items	2023-01-25 15:04:58 -08:00
James Magahern	53efb5389e	Adds history browser view	2023-01-20 17:28:15 -08:00
James Magahern	f374f3ebe8	Tweak autocomplete query a bit	2023-01-20 16:20:36 -08:00
James Magahern	836daee5a3	Fix find and replace	2023-01-11 13:20:36 -08:00
James Magahern	12e2d82009	Attempt to fix blank URL bar bug	2022-10-11 15:04:59 -07:00
James Magahern	6be801420c	iOS 16 API updates	2022-10-11 15:04:37 -07:00
James Magahern	75153d1c4a	Settings: Catalyst: adjust slightly the header labels	2022-08-22 17:43:04 -07:00