Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix settings navigation bar colors after reopening #2758

Merged
merged 3 commits into from
Apr 17, 2024
Merged

Fix settings navigation bar colors after reopening #2758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75a0b86
Fix settings navigation bar colors after reopening
dus7 Apr 17, 2024
73de18b
Remove redundant self
dus7 Apr 17, 2024
d1364e7
Remove decorate function
dus7 Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 14 additions & 26 deletions DuckDuckGo/SettingsHostingController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import Subscription
class SettingsHostingController: UIHostingController<AnyView> {
var viewModel: SettingsViewModel
var viewProvider: SettingsLegacyViewProvider

init(viewModel: SettingsViewModel, viewProvider: SettingsLegacyViewProvider) {
self.viewModel = viewModel
self.viewProvider = viewProvider
Expand All @@ -36,15 +36,15 @@ class SettingsHostingController: UIHostingController<AnyView> {
viewModel.onRequestPushLegacyView = { [weak self] vc in
self?.pushLegacyViewController(vc)
}

viewModel.onRequestPresentLegacyView = { [weak self] vc, modal in
self?.presentLegacyViewController(vc, modal: modal)
}

viewModel.onRequestPopLegacyView = { [weak self] in
self?.navigationController?.popViewController(animated: true)
}

viewModel.onRequestDismissSettings = { [weak self] in
self?.navigationController?.dismiss(animated: true)
}
Expand All @@ -56,7 +56,15 @@ class SettingsHostingController: UIHostingController<AnyView> {
}
self.rootView = AnyView(settingsView)

decorate()
decorateNavigationBar()
}

override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)

// If this is not called, settings navigation bar (UIKIt) is going wild with colors after reopening settings (?!)
// Root cause will be investigated later as part of https://app.asana.com/0/414235014887631/1207098219526666/f
decorateNavigationBar()
}

required init?(coder aDecoder: NSCoder) {
Expand All @@ -66,31 +74,11 @@ class SettingsHostingController: UIHostingController<AnyView> {
func pushLegacyViewController(_ vc: UIViewController) {
navigationController?.pushViewController(vc, animated: true)
}

func presentLegacyViewController(_ vc: UIViewController, modal: Bool = false) {
if modal {
vc.modalPresentationStyle = .fullScreen
}
navigationController?.present(vc, animated: true)
}
}

extension SettingsHostingController {

private func decorate() {
let theme = ThemeManager.shared.currentTheme
// Apply Theme
navigationController?.navigationBar.barTintColor = theme.barBackgroundColor
navigationController?.navigationBar.tintColor = theme.navigationBarTintColor

if #available(iOS 15.0, *) {
let appearance = UINavigationBarAppearance()
appearance.shadowColor = .clear
appearance.backgroundColor = theme.backgroundColor

navigationController?.navigationBar.standardAppearance = appearance
navigationController?.navigationBar.scrollEdgeAppearance = appearance
}
}

}
Loading