Skip to content

Commit

Permalink
iOS 18 Support (Initial)
Browse files Browse the repository at this point in the history
  • Loading branch information
@iDevelopper
iDevelopper committed Aug 28, 2024
1 parent e7f5ffd commit b825a3e
Show file tree
Hide file tree
Showing 12 changed files with 222 additions and 149 deletions.
18 changes: 13 additions & 5 deletions ...ontroller/PBPopupController/PBPopupController-ObjC/Private/UIView+PBPopupSupportPrivate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

// https://www.base64encode.org/
//backdropGroupName
static NSString* _bGN = @"YmFja2Ryb3BHcm91cE5hbWU=";
//static NSString* _bGN = @"YmFja2Ryb3BHcm91cE5hbWU=";
//groupName
static NSString* _gN = @"Z3JvdXBOYW1l";
//_UINavigationBarVisualProvider
static NSString* _UINBVP = @"X1VJTmF2aWdhdGlvbkJhclZpc3VhbFByb3ZpZGVy";
//_UINavigationBarVisualProviderLegacyIOS
Expand Down Expand Up @@ -48,14 +50,20 @@ + (void)load
static NSString* key = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
//backdropGroupName
key = _PBPopupDecodeBase64String(_bGN);
//backdropGroupName
//key = _PBPopupDecodeBase64String(_bGN);
//groupName
key = _PBPopupDecodeBase64String(_gN);
});

NSString* groupName = [_self valueForKey:key];
//NSString* groupName = [_self valueForKey:key];
id backgroundView = [_self valueForKey:@"backgroundView"];

NSString* groupName = [backgroundView valueForKey:key];
if(groupName != nil && [groupName hasSuffix:@"🤡"] == NO)
{
[_self setValue:[NSString stringWithFormat:@"%@🤡", groupName] forKey:key];
//[_self setValue:[NSString stringWithFormat:@"%@🤡", groupName] forKey:key];
[backgroundView setValue:[NSString stringWithFormat:@"%@🤡", groupName] forKey:key];
}
};
};
Expand Down
5 changes: 1 addition & 4 deletions PBPopupController/PBPopupController/PBPopupController-Swift/PBPopupBar.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1388,10 +1388,7 @@ internal let PBPopupBarImageHeightFloating: CGFloat = 40.0
self.contentViewRightConstraint = self.contentView.rightAnchor.constraint(equalTo: self.rightAnchor, constant: self.isFloating ? -self.floatingInsets.right : 0.0)
self.contentViewRightConstraint.isActive = true
}
var bottom: CGFloat = 0
if let bottomBar = self.popupController.containerViewController.bottomBar {
bottom = (bottomBar.frame.height == 0 || bottomBar.isHidden) ? self.safeBottom() : 0.0
}
let bottom = self.popupController.bottomBarHeight == 0 ? self.safeBottom() : 0.0
var constant = self.frame.height - bottom
if self.isFloating {
constant -= (self.floatingInsets.top + self.floatingInsets.bottom)
Expand Down
8 changes: 4 additions & 4 deletions PBPopupController/PBPopupController/PBPopupController-Swift/PBPopupController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,13 +396,12 @@ extension PBPopupPresentationStyle
*/
@objc public var containerPreferredStatusBarStyle: UIStatusBarStyle = .default {
didSet {
self.popupStatusBarStyle = self.popupPresentationState == .closed ? containerPreferredStatusBarStyle : self.popupPreferredStatusBarStyle
containerViewController.setNeedsStatusBarAppearanceUpdate()
}
}

/**
The preferred status bar style for the popup content view controller when `popupPresentationStyle` is set to `deck`.
The preferred status bar style for the popup content view controller.
*/
@objc public var popupPreferredStatusBarStyle: UIStatusBarStyle = .lightContent

Expand Down Expand Up @@ -454,7 +453,7 @@ extension PBPopupPresentationStyle
{
guard let vc = self.containerViewController else { return 0.0 }
#if !targetEnvironment(macCatalyst)
if vc.bottomBar.isHidden {
if vc.bottomBar.isHidden || vc.bottomBar.superview == nil {
return 0.0
}
#endif
Expand Down Expand Up @@ -599,7 +598,8 @@ extension PBPopupPresentationStyle
{
var rv: UIView? = nil
if self.containerViewController is UITabBarController {
rv = (self.containerViewController as! UITabBarController).tabBar
let tbc = self.containerViewController as! UITabBarController
rv = tbc.tabBar
}
if let navigationController = self.containerViewController as? UINavigationController {
rv = navigationController.toolbar
Expand Down
7 changes: 5 additions & 2 deletions ...pController/PBPopupController/PBPopupController-Swift/PBPopupPresentationController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ extension PBPopupPresentationController
frame = self.popupController.popupBarViewFrameForPopupStateClosed()
if isFloating {
frame = frame.inset(by: self.presentingVC.popupBar.floatingInsets)
if self.presentingVC.defaultFrameForBottomBar().height == 0 || self.presentingVC.bottomBar.isHidden {
if self.presentingVC.defaultFrameForBottomBar().height == 0 || self.presentingVC.bottomBar.isHidden || self.presentingVC.bottomBar.superview == nil {
let insets = UIEdgeInsets(top: 0, left: 0, bottom: self.presentingVC.insetsForBottomBar().bottom, right: 0)
frame = frame.inset(by: insets)
}
Expand Down Expand Up @@ -780,7 +780,7 @@ extension PBPopupPresentationController
}
}
if self.popupContentView.isFloating {
if self.presentingVC.defaultFrameForBottomBar().height == 0 || self.presentingVC.bottomBar.isHidden {
if self.presentingVC.defaultFrameForBottomBar().height == 0 || self.presentingVC.bottomBar.isHidden || self.presentingVC.bottomBar.superview == nil {
if let window = self.presentingVC.view.window {
frame.origin.y -= window.safeAreaInsets.bottom
}
Expand Down Expand Up @@ -982,6 +982,9 @@ extension PBPopupPresentationController
if let nc = self.presentingVC.navigationController {
snapshotView = nc.view
}
if let tbc = self.presentingVC.tabBarController {
snapshotView = tbc.view
}
self.backingView = snapshotView.resizableSnapshotView(from: imageRect, afterScreenUpdates: isHidden || coordinator != nil, withCapInsets: .zero)
self.backingView.autoresizingMask = []

Expand Down
128 changes: 108 additions & 20 deletions PBPopupController/PBPopupController/PBPopupController-Swift/UIViewController+Private.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,29 @@ private let uCOIFPINBase64 = "X3VwZGF0ZUNvbnRlbnRPdmVybGF5SW5zZXRzRnJvbVBhcmVudE
//_viewSafeAreaInsetsFromScene
private let vSAIFSBase64 = "X3ZpZXdTYWZlQXJlYUluc2V0c0Zyb21TY2VuZQ=="
//_hideBarWithTransition:isExplicit:
private let hBWTiEBase64 = "X2hpZGVCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0Og=="
//private let hBWTiEBase64 = "X2hpZGVCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0Og=="
//_hideBarWithTransition:isExplicit:duration:
private let hBWTiEDBase64 = "X2hpZGVCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0OmR1cmF0aW9uOg=="
//_hideBarWithTransition:isExplicit:duration:reason:
private let hBWTiEDRBase64 = "X2hpZGVCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0OmR1cmF0aW9uOnJlYXNvbjo="
//_showBarWithTransition:isExplicit:
private let sBWTiEBase64 = "X3Nob3dCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0Og=="
//private let sBWTiEBase64 = "X3Nob3dCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0Og=="
//_showBarWithTransition:isExplicit:duration:
private let sBWTiEDBase64 = "X3Nob3dCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0OmR1cmF0aW9uOg=="
//_showBarWithTransition:isExplicit:duration:reason:
private let sBWTiEDRBase64 = "X3Nob3dCYXJXaXRoVHJhbnNpdGlvbjppc0V4cGxpY2l0OmR1cmF0aW9uOnJlYXNvbjo="
//_setToolbarHidden:edge:duration:
private let sTHedBase64 = "X3NldFRvb2xiYXJIaWRkZW46ZWRnZTpkdXJhdGlvbjo="
//hideBarWithTransition:
private let hBWTBase64 = "aGlkZUJhcldpdGhUcmFuc2l0aW9uOg=="
//showBarWithTransition:
private let sBWTBase64 = "c2hvd0JhcldpdGhUcmFuc2l0aW9uOg=="

//_UITabContainerView
private let _uiTCV: AnyClass? = NSClassFromString(_PBPopupDecodeBase64String(base64String: "X1VJVGFiQ29udGFpbmVyVmlldw==")!)
//_UIFloatingTabBar
private let _uiFTB: AnyClass? = NSClassFromString(_PBPopupDecodeBase64String(base64String: "X1VJRmxvYXRpbmdUYWJCYXI=")!)

public extension UITabBarController
{
private static let swizzleImplementation: Void = {
Expand All @@ -45,7 +54,7 @@ public extension UITabBarController
method_exchangeImplementations(originalMethod, swizzledMethod)
}

//_hideBarWithTransition:isExplicit:
//_hideBarWithTransition:isExplicit:duration:
var selName = _PBPopupDecodeBase64String(base64String: hBWTiEDBase64)!
var selector = NSSelectorFromString(selName)
originalMethod = class_getInstanceMethod(aClass, selector)
Expand All @@ -54,16 +63,14 @@ public extension UITabBarController
method_exchangeImplementations(originalMethod, swizzledMethod)
}

//_showBarWithTransition:isExplicit:
/*
selName = _PBPopupDecodeBase64String(base64String: sBWTiEBase64)!
//_hideBarWithTransition:isExplicit:duration:reason:
selName = _PBPopupDecodeBase64String(base64String: hBWTiEDRBase64)!
selector = NSSelectorFromString(selName)
originalMethod = class_getInstanceMethod(aClass, selector)
swizzledMethod = class_getInstanceMethod(aClass, #selector(_sBWT(t:iE:)))
swizzledMethod = class_getInstanceMethod(aClass, #selector(_hBWTR(t:iE:d:r:)))
if let originalMethod = originalMethod, let swizzledMethod = swizzledMethod {
method_exchangeImplementations(originalMethod, swizzledMethod)
}
*/

//_showBarWithTransition:isExplicit:duration:
selName = _PBPopupDecodeBase64String(base64String: sBWTiEDBase64)!
Expand All @@ -73,6 +80,25 @@ public extension UITabBarController
if let originalMethod = originalMethod, let swizzledMethod = swizzledMethod {
method_exchangeImplementations(originalMethod, swizzledMethod)
}

//_showBarWithTransition:isExplicit:duration:reason
selName = _PBPopupDecodeBase64String(base64String: sBWTiEDRBase64)!
selector = NSSelectorFromString(selName)
originalMethod = class_getInstanceMethod(aClass, selector)
swizzledMethod = class_getInstanceMethod(aClass, #selector(_sBWTR(t:iE:d:r:)))
if let originalMethod = originalMethod, let swizzledMethod = swizzledMethod {
method_exchangeImplementations(originalMethod, swizzledMethod)
}

if UIDevice.current.userInterfaceIdiom == .pad {
if ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 18 {
originalMethod = class_getInstanceMethod(aClass, #selector(viewDidLayoutSubviews))
swizzledMethod = class_getInstanceMethod(aClass, #selector(pb_tbcDidLayoutSubviews))
if let originalMethod = originalMethod, let swizzledMethod = swizzledMethod {
method_exchangeImplementations(originalMethod, swizzledMethod)
}
}
}
}()

/**
Expand All @@ -85,10 +111,21 @@ public extension UITabBarController

//_hideBarWithTransition:isExplicit:duration:
@objc private func _hBWT(t: Int, iE: Bool, d: TimeInterval)
{
self._hBWTR(t: t, iE: iE, d: d, r: UInt(UINT64_MAX))
}

//_hideBarWithTransition:isExplicit:duration:reason:
@objc private func _hBWTR(t: Int, iE: Bool, d: TimeInterval, r: UInt)
{
self.isTabBarHiddenDuringTransition = true

self._hBWT(t: t, iE: iE, d: d)
if #available(iOS 18.0, *) {
self._hBWTR(t: t, iE: iE, d: d, r: r)
}
else {
self._hBWT(t: t, iE: iE, d: d)
}

if (t > 0) {
if let rv = UITabBarController.getAssociatedPopupBarFor(self) {
Expand Down Expand Up @@ -125,9 +162,22 @@ public extension UITabBarController
//_showBarWithTransition:isExplicit:duration:
@objc private func _sBWT(t: Int, iE: Bool, d: TimeInterval)
{
self._sBWTR(t: t, iE: iE, d: d, r: UInt(UINT64_MAX))
}

//_showBarWithTransition:isExplicit:duration:reason:
@objc private func _sBWTR(t: Int, iE: Bool, d: TimeInterval, r: UInt)
{
let tabBarIsAlreadyHidden = self.bottomBar.superview == nil

self.isTabBarHiddenDuringTransition = false

self._sBWT(t: t, iE: iE, d: d)
if #available(iOS 18.0, *) {
self._sBWTR(t: t, iE: iE, d: d, r: r)
}
else {
self._sBWT(t: t, iE: iE, d: d)
}

if (t > 0) {
if let rv = UITabBarController.getAssociatedPopupBarFor(self) {
Expand All @@ -138,7 +188,7 @@ public extension UITabBarController
if let transitionView = rv.transitionBackgroundView {
transitionView.frame.size.width = .zero
transitionView.layoutIfNeeded()
transitionView.isHidden = false
transitionView.isHidden = tabBarIsAlreadyHidden ? true : false
}
}
self.popupController.popupBarView.alpha = 1
Expand Down Expand Up @@ -194,6 +244,17 @@ public extension UITabBarController
}
}
}

@objc private func pb_tbcDidLayoutSubviews()
{
if self.responds(to: #selector(pb_tbcDidLayoutSubviews)) {
self.pb_tbcDidLayoutSubviews()

if let rv = UITabBarController.getAssociatedPopupBarFor(self) {
rv.backgroundView.alpha = rv.isFloating ? 0.0 : 1.0
}
}
}

@objc private func pb_setViewControllers(_ viewControllers: [UIViewController], animated: Bool)
{
Expand Down Expand Up @@ -241,7 +302,8 @@ internal extension UITabBarController
return UIEdgeInsets.zero
}
}
return self.tabBar.isHidden == false ? UIEdgeInsets.zero : self.view.window?.safeAreaInsets ?? UIEdgeInsets.zero
let tabBarIsHidden = self.tabBar.isHidden || self.tabBar.superview == nil
return tabBarIsHidden == false ? UIEdgeInsets.zero : self.view.window?.safeAreaInsets ?? UIEdgeInsets.zero
}

@objc override func defaultFrameForBottomBar() -> CGRect
Expand All @@ -251,7 +313,8 @@ internal extension UITabBarController

bottomBarFrame.size.height = max(bottomBarFrame.size.height, bottomBarSizeThatFits.height)

bottomBarFrame.origin = CGPoint(x: 0, y: self.view.bounds.size.height - (self.isTabBarHiddenDuringTransition ? 0.0 : bottomBarFrame.size.height))
let tabBarIsHidden = self.tabBar.superview == nil
bottomBarFrame.origin = CGPoint(x: 0, y: self.view.bounds.size.height - (self.isTabBarHiddenDuringTransition ? 0.0 : (tabBarIsHidden ? 0.0 : bottomBarFrame.size.height)))

return bottomBarFrame
}
Expand Down Expand Up @@ -306,9 +369,28 @@ internal extension UITabBarController
self.popupBar.backgroundEffect = self.bottomBarAppearance.backgroundEffect
self.popupBar.barStyle = self.tabBar.barStyle
self.popupBar.tintColor = self.tabBar.tintColor
if #available(iOS 18.0, *) {
self.fixesPopupBarTintColor()
}
self.popupBar.isTranslucent = self.tabBar.isTranslucent
self.popupBar.backgroundColor = self.bottomBarAppearance.backgroundColor
}

@available(iOS 18.0, *)
private func fixesPopupBarTintColor() {
let doit = (ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 18 && UIDevice.current.userInterfaceIdiom == .pad)
if doit {
for tcv in self.view.subviews {
if tcv.classForCoder == _uiTCV {
for ftb in tcv.subviews {
if ftb.classForCoder == _uiFTB {
popupBar.tintColor = ftb.tintColor
}
}
}
}
}
}
}

public extension UINavigationController
Expand Down Expand Up @@ -481,7 +563,7 @@ public extension UINavigationController
if let presentation = self.toolbar.layer.presentation() {
position = presentation.position.x
}
self.popupController.containerViewController.popupBar.backgroundView.alpha = rv.isFloating ? (self.toolbar.isHidden || position < 0 ? 0.0 : 1.0) : 1.0
rv.backgroundView.alpha = rv.isFloating ? (self.toolbar.isHidden || position < 0 ? 0.0 : 1.0) : 1.0
if rv.isFloating {
self.popupController?.popupBarView?.superview?.bringSubviewToFront(self.popupController.popupBarView)
}
Expand Down Expand Up @@ -676,8 +758,11 @@ internal extension UINavigationController

@objc override func insetsForBottomBar() -> UIEdgeInsets
{
if let tabBarController = self.tabBarController, tabBarController.isTabBarHiddenDuringTransition == false {
return tabBarController.insetsForBottomBar()
let doit = !(ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 18 && UIDevice.current.userInterfaceIdiom == .pad)
if doit {
if let tabBarController = self.tabBarController, tabBarController.isTabBarHiddenDuringTransition == false {
return tabBarController.insetsForBottomBar()
}
}
if let dropShadowView = self.popupController.dropShadowViewFor(self.view) {
if dropShadowView.frame.minX > 0 {
Expand All @@ -695,9 +780,12 @@ internal extension UINavigationController
toolBarFrame.size.height = self.isToolbarHidden ? 0.0 : toolBarFrame.size.height
toolBarFrame.size.width = self.navigationBar.frame.width

if let tabBarController = self.tabBarController {
let tabBarFrame = tabBarController.defaultFrameForBottomBar()
toolBarFrame.origin.y -= tabBarController.isTabBarHiddenDuringTransition ? 0.0 : tabBarFrame.height
let doit = !(ProcessInfo.processInfo.operatingSystemVersion.majorVersion >= 18 && UIDevice.current.userInterfaceIdiom == .pad)
if doit {
if let tabBarController = self.tabBarController {
let tabBarFrame = tabBarController.defaultFrameForBottomBar()
toolBarFrame.origin.y -= tabBarController.isTabBarHiddenDuringTransition ? 0.0 : tabBarFrame.height
}
}

return toolBarFrame
Expand Down Expand Up @@ -793,7 +881,7 @@ public extension UISplitViewController
{
self.pb_svcDidLayoutSubviews()
if let rv = UISplitViewController.getAssociatedPopupBarFor(self) {
self.popupController.containerViewController.popupBar.backgroundView.alpha = rv.isFloating ? 0.0 : 1.0
rv.backgroundView.alpha = rv.isFloating ? 0.0 : 1.0
}
}
}
Expand Down
Loading

0 comments on commit b825a3e

Please sign in to comment.