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

moves nav bar config to SceneCoordinator

Browse Source
This commit is contained in:
Stuart Breckenridge
2022-02-05 10:47:26 +08:00
parent 7249451c99
commit 90b41995eb
4 changed files with 14 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
iOS/Article/ArticleViewController.swift
View File

@@ -101,7 +101,6 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable {
])
fullScreenTapZone.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(didTapNavigationBar)))
navigationItem.titleView = fullScreenTapZone
configureNavbar()
articleExtractorButton.addTarget(self, action: #selector(toggleArticleExtractor(_:)), for: .touchUpInside)
toolbarItems?.insert(UIBarButtonItem(customView: articleExtractorButton), at: 6)
@@ -234,22 +233,6 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable {
return currentWebViewController?.webView?.scrollView
}
func configureNavbar() {
let scrollEdge = UINavigationBarAppearance()
scrollEdge.configureWithOpaqueBackground()
scrollEdge.shadowColor = nil
scrollEdge.shadowImage = UIImage()
let standard = UINavigationBarAppearance()
standard.shadowColor = .opaqueSeparator
standard.shadowImage = UIImage()
navigationController?.navigationBar.standardAppearance = standard
navigationController?.navigationBar.compactAppearance = standard
navigationController?.navigationBar.scrollEdgeAppearance = scrollEdge
navigationController?.navigationBar.compactScrollEdgeAppearance = scrollEdge
}
// MARK: Notifications

17
iOS/MasterFeed/MasterFeedViewController.swift
View File

@@ -76,7 +76,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner, Ma
refreshControl!.addTarget(self, action: #selector(refreshAccounts(_:)), for: .valueChanged)
configureToolbar()
configureNavbar()
becomeFirstResponder()
}
@@ -716,22 +715,6 @@ private extension MasterFeedViewController {
toolbarItems?.insert(refreshProgressItemButton, at: 2)
}
func configureNavbar() {
let scrollEdge = UINavigationBarAppearance()
scrollEdge.configureWithOpaqueBackground()
scrollEdge.shadowColor = nil
scrollEdge.shadowImage = UIImage()
let standard = UINavigationBarAppearance()
standard.shadowColor = .opaqueSeparator
standard.shadowImage = UIImage()
navigationController?.navigationBar.standardAppearance = standard
navigationController?.navigationBar.compactAppearance = standard
navigationController?.navigationBar.scrollEdgeAppearance = scrollEdge
navigationController?.navigationBar.compactScrollEdgeAppearance = scrollEdge
}
func setFilterButtonToActive() {
filterButton?.image = AppAssets.filterActiveImage
filterButton?.accLabelText = NSLocalizedString("Selected - Filter Read Feeds", comment: "Selected - Filter Read Feeds")

18
iOS/MasterTimeline/MasterTimelineViewController.swift
View File

@@ -93,9 +93,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner
refreshControl = UIRefreshControl()
refreshControl!.addTarget(self, action: #selector(refreshAccounts(_:)), for: .valueChanged)
configureToolbar()
configureNavbar()
refreshProgressView = Bundle.main.loadNibNamed("RefreshProgressView", owner: self, options: nil)?[0] as? RefreshProgressView
refreshProgressItemButton = UIBarButtonItem(customView: refreshProgressView!)
@@ -631,21 +629,7 @@ private extension MasterTimelineViewController {
toolbarItems?.insert(refreshProgressItemButton, at: 2)
}
func configureNavbar() {
let scrollEdge = UINavigationBarAppearance()
scrollEdge.configureWithOpaqueBackground()
scrollEdge.shadowColor = nil
scrollEdge.shadowImage = UIImage()
let standard = UINavigationBarAppearance()
standard.shadowColor = .opaqueSeparator
standard.shadowImage = UIImage()
navigationController?.navigationBar.standardAppearance = standard
navigationController?.navigationBar.compactAppearance = standard
navigationController?.navigationBar.scrollEdgeAppearance = scrollEdge
navigationController?.navigationBar.compactScrollEdgeAppearance = scrollEdge
}
func resetUI(resetScroll: Bool) {

20
iOS/SceneCoordinator.swift
View File

@@ -1365,14 +1365,20 @@ extension SceneCoordinator: UINavigationControllerDelegate {
private extension SceneCoordinator {
func configureNavigationController(_ navController: UINavigationController) {
let navigationStandardAppearance = UINavigationBarAppearance()
navigationStandardAppearance.titleTextAttributes = [.foregroundColor: UIColor.label]
navigationStandardAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.label]
navController.navigationBar.standardAppearance = navigationStandardAppearance
let scrollEdgeStandardAppearance = UINavigationBarAppearance()
scrollEdgeStandardAppearance.backgroundColor = .systemBackground
navController.navigationBar.scrollEdgeAppearance = scrollEdgeStandardAppearance
let scrollEdge = UINavigationBarAppearance()
scrollEdge.configureWithOpaqueBackground()
scrollEdge.shadowColor = nil
scrollEdge.shadowImage = UIImage()
let standard = UINavigationBarAppearance()
standard.shadowColor = .opaqueSeparator
standard.shadowImage = UIImage()
navController.navigationBar.standardAppearance = standard
navController.navigationBar.compactAppearance = standard
navController.navigationBar.scrollEdgeAppearance = scrollEdge
navController.navigationBar.compactScrollEdgeAppearance = scrollEdge
navController.navigationBar.tintColor = AppAssets.primaryAccentColor