zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Fix background in dark mode

This commit is contained in:
Kyle Bashour 2022-11-11 15:07:31 -08:00
parent 407e0ae304
commit a5d61072c0
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Mastodon/Scene/Search/Search/SearchViewController.swift
View File

@ -73,20 +73,19 @@ extension SearchViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setupBackgroundColor(theme: ThemeService.shared.currentTheme.value) setupAppearance(theme: ThemeService.shared.currentTheme.value)
ThemeService.shared.currentTheme ThemeService.shared.currentTheme
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] theme in .sink { [weak self] theme in
guard let self = self else { return } guard let self = self else { return }
self.setupBackgroundColor(theme: theme) self.setupAppearance(theme: theme)
} }
.store(in: &disposeBag) .store(in: &disposeBag)
title = L10n.Scene.Search.title title = L10n.Scene.Search.title
setupSearchBar() setupSearchBar()
setupNavigationBarAppearance()
// collectionView.translatesAutoresizingMaskIntoConstraints = false // collectionView.translatesAutoresizingMaskIntoConstraints = false
// view.addSubview(collectionView) // view.addSubview(collectionView)
// NSLayoutConstraint.activate([ // NSLayoutConstraint.activate([
@ -129,8 +128,22 @@ extension SearchViewController {
} }
extension SearchViewController { extension SearchViewController {
private func setupBackgroundColor(theme: Theme) { private func setupAppearance(theme: Theme) {
view.backgroundColor = theme.systemGroupedBackgroundColor view.backgroundColor = theme.systemGroupedBackgroundColor
// Match the DiscoveryViewController tab color and remove the double separator.
let navigationBarAppearance = UINavigationBarAppearance()
navigationBarAppearance.configureWithOpaqueBackground()
navigationBarAppearance.backgroundColor = theme.systemBackgroundColor
navigationBarAppearance.shadowColor = nil
navigationItem.standardAppearance = navigationBarAppearance
navigationItem.scrollEdgeAppearance = navigationBarAppearance
navigationItem.compactAppearance = navigationBarAppearance
if #available(iOS 15, *) {
navigationItem.compactScrollEdgeAppearance = navigationBarAppearance
}
} }
private func setupSearchBar() { private func setupSearchBar() {
@ -166,20 +179,6 @@ extension SearchViewController {
.store(in: &disposeBag) .store(in: &disposeBag)
} }
private func setupNavigationBarAppearance() {
let appearance = UINavigationBarAppearance()
appearance.configureWithOpaqueBackground()
appearance.shadowColor = nil
navigationItem.standardAppearance = appearance
navigationItem.scrollEdgeAppearance = appearance
navigationItem.compactAppearance = appearance
if #available(iOS 15, *) {
navigationItem.compactScrollEdgeAppearance = appearance
}
}
} }
// MARK: - UISearchBarDelegate // MARK: - UISearchBarDelegate