Feature: make Reader use center window

This commit is contained in:
James Magahern
2022-08-22 17:10:47 -07:00
parent ac345ef613
commit 184396b1d8
8 changed files with 116 additions and 19 deletions

View File

@@ -0,0 +1,70 @@
//
// BrowserSceneDelegate.swift
// SBrowser
//
// Created by James Magahern on 7/21/20.
//
import UIKit
public enum SessionActivityType: String {
case BrowserWindow = "net.buzzert.attractor.browser"
case SettingsWindow = "net.buzzert.attractor.settings"
case ReaderWindow = "net.buzzert.attractor.reader"
}
class BrowserSceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?
var browserViewController: BrowserViewController?
var settingsViewController: SettingsViewController?
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
{
guard let windowScene = (scene as? UIWindowScene) else { return }
let window = UIWindow(windowScene: windowScene)
let browserViewController = BrowserViewController()
self.browserViewController = browserViewController
window.rootViewController = browserViewController
if let urlContext = connectionOptions.urlContexts.first {
let url = urlContext.url
browserViewController.tab.beginLoadingURL(url)
}
#if targetEnvironment(macCatalyst)
windowScene.titlebar?.titleVisibility = .hidden
windowScene.titlebar?.separatorStyle = .none
if #available(macCatalyst 16.0, *) {
let screenSize = windowScene.screen.bounds.size
let preferredSize = CGSize(width: 1000, height: 1100)
let geometryPreferences = UIWindowScene.GeometryPreferences.Mac(systemFrame: CGRect(
origin: CGPoint(
x: (screenSize.width - preferredSize.width) / 2,
y: (screenSize.height - preferredSize.height) / 2
),
size: preferredSize
))
windowScene.requestGeometryUpdate(geometryPreferences)
}
#endif
window.makeKeyAndVisible()
self.window = window
}
func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>)
{
for urlContext in URLContexts {
if browserViewController?.tab.url == nil {
browserViewController?.tab.beginLoadingURL(urlContext.url)
} else {
browserViewController?.createNewTab(withURL: urlContext.url)
}
}
}
}

View File

@@ -0,0 +1,41 @@
//
// ReaderSceneDelegate.swift
// App
//
// Created by James Magahern on 8/22/22.
//
import UIKit
internal enum ReaderUserActivityKeys: String {
case htmlString
case baseURL
}
class ReaderSceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?
var readerViewController: ReaderViewController?
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
{
guard let windowScene = (scene as? UIWindowScene) else { return }
guard let activity = connectionOptions.userActivities.first else { return }
guard let userInfo = activity.userInfo, let htmlString: String = userInfo[ReaderUserActivityKeys.htmlString.rawValue] as? String else { return }
let baseURL = userInfo[ReaderUserActivityKeys.baseURL.rawValue] as? URL
let window = UIWindow(windowScene: windowScene)
let readerViewController = ReaderViewController(readableHTMLString: htmlString, baseURL: baseURL)
readerViewController.title = activity.title
self.readerViewController = readerViewController
window.rootViewController = UINavigationController(rootViewController: readerViewController)
windowScene.title = activity.title ?? "Reader"
windowScene.sizeRestrictions?.maximumSize = CGSize(width: 700.0, height: 1000.0)
window.makeKeyAndVisible()
self.window = window
}
}

View File

@@ -0,0 +1,28 @@
//
// SettingsSceneDelegate.swift
// SBrowser
//
// Copyright © 2021 Apple Inc. All rights reserved.
//
import UIKit
class SettingsSceneDelegate: UIResponder, UIWindowSceneDelegate {
var window: UIWindow?
var settingsViewController: SettingsViewController?
func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions)
{
guard let windowScene = (scene as? UIWindowScene) else { return }
let window = UIWindow(windowScene: windowScene)
let settingsViewController = SettingsViewController(windowScene: windowScene)
self.settingsViewController = settingsViewController
window.rootViewController = settingsViewController
windowScene.sizeRestrictions?.maximumSize = CGSize(width: 760.0, height: 400.0)
window.makeKeyAndVisible()
self.window = window
}
}