neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes tapping buttons underneath navigation bar on SourceDetailViewController/AppViewController

Browse Source
This commit is contained in:
Riley Testut
2023-04-04 17:12:18 -05:00
committed by Magesh K
parent b2dcdc02c7
commit 7f2bd494b5
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AltStore/App Detail/AppViewController.swift
View File

@@ -416,15 +416,17 @@ private extension AppViewController
// Copied from HeaderContentViewController // Copied from HeaderContentViewController
func updateNavigationBarAppearance(isHidden: Bool) func updateNavigationBarAppearance(isHidden: Bool)
{ {
let barAppearance = self.navigationItem.standardAppearance ?? UINavigationBarAppearance() let barAppearance = self.navigationItem.standardAppearance as? NavigationBarAppearance ?? NavigationBarAppearance()
if isHidden if isHidden
{ {
barAppearance.configureWithTransparentBackground() barAppearance.configureWithTransparentBackground()
barAppearance.ignoresUserInteraction = true
} }
else else
{ {
barAppearance.configureWithDefaultBackground() barAppearance.configureWithDefaultBackground()
barAppearance.ignoresUserInteraction = false
} }
barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear] barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear]

4
AltStore/Components/HeaderContentViewController.swift
View File

@@ -481,15 +481,17 @@ private extension HeaderContentViewController
func updateNavigationBarAppearance(isHidden: Bool) func updateNavigationBarAppearance(isHidden: Bool)
{ {
let barAppearance = self.navigationItem.standardAppearance ?? UINavigationBarAppearance() let barAppearance = self.navigationItem.standardAppearance as? NavigationBarAppearance ?? NavigationBarAppearance()
if isHidden if isHidden
{ {
barAppearance.configureWithTransparentBackground() barAppearance.configureWithTransparentBackground()
barAppearance.ignoresUserInteraction = true
} }
else else
{ {
barAppearance.configureWithDefaultBackground() barAppearance.configureWithDefaultBackground()
barAppearance.ignoresUserInteraction = false
} }
barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear] barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear]

25
AltStore/Components/NavigationBar.swift
View File

@@ -12,6 +12,20 @@ import Roxas
final class NavigationBar: UINavigationBar final class NavigationBar: UINavigationBar
{ {
// We sometimes need to ignore user interaction so
// we can tap items underneath the navigation bar.
var ignoresUserInteraction: Bool = false
override func copy(with zone: NSZone? = nil) -> Any
{
let copy = super.copy(with: zone) as! NavigationBarAppearance
copy.ignoresUserInteraction = self.ignoresUserInteraction
return copy
}
}
class NavigationBar: UINavigationBar
{
@IBInspectable var automaticallyAdjustsItemPositions: Bool = true @IBInspectable var automaticallyAdjustsItemPositions: Bool = true
private let backgroundColorView = UIView() private let backgroundColorView = UIView()
@@ -80,4 +94,15 @@ final class NavigationBar: UINavigationBar
} }
} }
} }
override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView?
{
if let appearance = self.topItem?.standardAppearance as? NavigationBarAppearance, appearance.ignoresUserInteraction
{
// Ignore touches.
return nil
}
return super.hitTest(point, with: event)
}
} }