neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-18 11:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts illegible Source tint colors for SourceDetailViewController

Browse Source
This commit is contained in:
Riley Testut
2023-10-16 19:10:34 -05:00
parent d890af0160
commit 1a5ffcdd31
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
AltStore/Components/HeaderContentViewController.swift
View File

@@ -27,7 +27,7 @@ class HeaderContentViewController<Header: UIView, Content: ScrollableContentView
didSet { didSet {
guard self.isViewLoaded else { return } guard self.isViewLoaded else { return }
self.view.tintColor = self.tintColor self.view.tintColor = self.tintColor?.adjustedForDisplay
self.update() self.update()
} }
} }
@@ -233,6 +233,8 @@ class HeaderContentViewController<Header: UIView, Content: ScrollableContentView
// Start with navigation bar hidden. // Start with navigation bar hidden.
self.hideNavigationBar() self.hideNavigationBar()
self.view.tintColor = self.tintColor?.adjustedForDisplay
} }
override func viewWillAppear(_ animated: Bool) override func viewWillAppear(_ animated: Bool)
@@ -496,7 +498,22 @@ private extension HeaderContentViewController
barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear] barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear]
let tintColor = isHidden ? UIColor.clear : self.tintColor ?? .altPrimary let dynamicColor = UIColor { traitCollection in
var tintColor = self.tintColor ?? .altPrimary
if traitCollection.userInterfaceStyle == .dark && tintColor.isTooDark
{
tintColor = .white
}
else
{
tintColor = tintColor.adjustedForDisplay
}
return tintColor
}
let tintColor = isHidden ? UIColor.clear : dynamicColor
barAppearance.configureWithTintColor(tintColor) barAppearance.configureWithTintColor(tintColor)
self.navigationItem.standardAppearance = barAppearance self.navigationItem.standardAppearance = barAppearance

2
AltStore/Sources/SourceDetailContentViewController.swift
View File

@@ -60,8 +60,6 @@ class SourceDetailContentViewController: UICollectionViewController
{ {
super.viewDidLoad() super.viewDidLoad()
self.view.tintColor = self.source.effectiveTintColor
let collectionViewLayout = self.makeLayout(source: self.source) let collectionViewLayout = self.makeLayout(source: self.source)
self.collectionView.collectionViewLayout = collectionViewLayout self.collectionView.collectionViewLayout = collectionViewLayout

2
AltStore/Sources/SourceDetailViewController.swift
View File

@@ -195,7 +195,7 @@ class SourceDetailViewController: HeaderContentViewController<SourceHeaderView,
case false?: case false?:
title = NSLocalizedString("ADD", comment: "") title = NSLocalizedString("ADD", comment: "")
self.navigationBarButton.tintColor = self.source.effectiveTintColor ?? .altPrimary self.navigationBarButton.tintColor = self.source.effectiveTintColor?.adjustedForDisplay ?? .altPrimary
self.addButton.isHidden = false self.addButton.isHidden = false
self.navigationBarButton.isHidden = false self.navigationBarButton.isHidden = false