iOS18适配

Example/HBDNavigationBar.xcodeproj/xcshareddata/xcschemes/HBDNavigationBar-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1610"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/HBDNavigationBar/BViewController.m

@@ -30,13 +30,13 @@ - (void)viewDidLoad {
     self.view.backgroundColor = [UIColor colorWithRed:((float) arc4random_uniform(256) / 255.0) green:((float) arc4random_uniform(256) / 255.0) blue:((float) arc4random_uniform(256) / 255.0) alpha:1.0];
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    NSLog(@"%s", __FUNCTION__);
-}
-
-- (void)viewDidAppear:(BOOL)animated {
-    NSLog(@"%s", __FUNCTION__);
-}
+//- (void)viewWillAppear:(BOOL)animated {
+//    NSLog(@"%s", __FUNCTION__);
+//}
+//
+//- (void)viewDidAppear:(BOOL)animated {
+//    NSLog(@"%s", __FUNCTION__);
+//}
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self name:@"pop-to-root" object:nil];

Example/HBDNavigationBar/DemoViewController.m

@@ -53,15 +53,15 @@ - (void)viewDidLoad {
 
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    NSLog(@"viewWillAppear:%@", self);
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    NSLog(@"viewWillDisappear:%@", self);
-}
+//- (void)viewWillAppear:(BOOL)animated {
+//    [super viewWillAppear:animated];
+//    NSLog(@"viewWillAppear:%@", self);
+//}
+//
+//- (void)viewWillDisappear:(BOOL)animated {
+//    [super viewWillDisappear:animated];
+//    NSLog(@"viewWillDisappear:%@", self);
+//}
 
 - (IBAction)sliderValueChanged:(UISlider *)sender {
     self.alphaComponent.text = [NSString stringWithFormat:@"%.2f", sender.value];
@@ -93,6 +93,9 @@ - (IBAction)dismiss:(UIButton *)sender {
         [self dismissViewControllerAnimated:YES completion:^{
 
         }];
+    } else {
+        self.hbd_tintColor = [UIColor redColor];
+        [self hbd_setNeedsUpdateNavigationBar];
     }
 }
 

Example/HBDNavigationBar/HBDNavigationBar-Info.plist

@@ -45,5 +45,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<true/>
 </dict>
 </plist>

Example/HBDNavigationBar/YPGradientDemoViewController.m

@@ -35,11 +35,7 @@ - (void)viewDidLoad {
 
     tableView.delegate = self;
     tableView.dataSource = self;
-    if (@available(iOS 11, *)) {
-        tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-    } else {
-        self.automaticallyAdjustsScrollViewInsets = NO;
-    }
+    tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
 
     NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"lakeside_sunset" ofType:@"png"];
     UIImage *headerImage = [UIImage imageWithContentsOfFile:imagePath];
@@ -132,11 +128,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     CGFloat headerHeight = CGRectGetHeight(self.headerView.frame);
-    if (@available(iOS 11, *)) {
-        headerHeight -= self.view.safeAreaInsets.top;
-    } else {
-        headerHeight -= [self.topLayoutGuide length];
-    }
+    headerHeight -= self.view.safeAreaInsets.top;
 
     CGFloat progress = scrollView.contentOffset.y + scrollView.contentInset.top;
     CGFloat gradientProgress = MIN(1, MAX(0, progress / headerHeight));

HBDNavigationBar.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'HBDNavigationBar'
-  s.version          = '1.9.8'
+  s.version          = '2.0.0'
   s.summary          = 'An aspiring UINavigationBar.'
 
 # This description is used to generate tags and improve search results.
@@ -25,10 +25,10 @@ TODO: Add long description of the pod here.
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'listen' => 'listenzz@163.com' }
-  s.source           = { :git => 'https://github.com/listenzz/HBDNavigationBar.git', :tag => s.version.to_s }
+  s.source           = { :git => 'https://github.com/xygkevin/HBDNavigationBar.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '13.0'
 
   s.source_files = 'HBDNavigationBar/Classes/**/*'
 

HBDNavigationBar/Classes/HBDNavigationBar.h

@@ -7,13 +7,19 @@
 
 #import <UIKit/UIKit.h>
 
+@class HBDNavigationBar;
+@protocol HBDNavigationBarDelegate <NSObject>
+- (void)shouldUpdateNavigationBar:(HBDNavigationBar *)navigationBar;
+@end
+
 @interface HBDNavigationBar : UINavigationBar
 
 @property(nonatomic, strong, readonly) UIImageView *shadowImageView;
 @property(nonatomic, strong, readonly) UIVisualEffectView *fakeView;
 @property(nonatomic, strong, readonly) UIImageView *backgroundImageView;
 @property(nonatomic, strong, readonly) UILabel *backButtonLabel;
 @property(nonatomic, strong, readonly) UIView *hbd_backgroundView;
+@property (nonatomic, weak) id<HBDNavigationBarDelegate> mydelegate;
 
 @end
 

HBDNavigationBar/Classes/HBDNavigationBar.m

@@ -95,6 +95,15 @@ - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
     return view;
 }
 
+- (void)didAddSubview:(UIView *)subview {
+    [subview didAddSubview:subview];
+    if ([subview isKindOfClass:NSClassFromString(@"_UIBarBackground")]) {
+        if (self.mydelegate && [self.mydelegate respondsToSelector:@selector(shouldUpdateNavigationBar:)]) {
+            [self.mydelegate shouldUpdateNavigationBar:self];
+        }
+    }
+}
+
 - (void)layoutSubviews {
     [super layoutSubviews];
     self.fakeView.frame = self.fakeView.superview.bounds;

HBDNavigationBar/Classes/HBDNavigationController.m

@@ -132,7 +132,7 @@ - (instancetype)initWithNavigationController:(HBDNavigationController *)navigati
 
 @end
 
-@interface HBDNavigationController ()
+@interface HBDNavigationController () <HBDNavigationBarDelegate>
 
 @property(nonatomic, readonly) HBDNavigationBar *navigationBar;
 @property(nonatomic, strong) UIVisualEffectView *fromFakeBar;
@@ -384,17 +384,22 @@ @implementation HBDNavigationController
 - (instancetype)initWithRootViewController:(UIViewController *)rootViewController {
     if (self = [super initWithNavigationBarClass:[HBDNavigationBar class] toolbarClass:nil]) {
         self.viewControllers = @[rootViewController];
+        self.navigationBar.mydelegate = self;
     }
     return self;
 }
 
 - (UINavigationController *)initWithNavigationBarClass:(Class)navigationBarClass toolbarClass:(Class)toolbarClass {
     NSAssert([navigationBarClass isSubclassOfClass:[HBDNavigationBar class]], @"navigationBarClass Must be a subclass of HBDNavigationBar");
-    return [super initWithNavigationBarClass:navigationBarClass toolbarClass:toolbarClass];
+    self = [super initWithNavigationBarClass:navigationBarClass toolbarClass:toolbarClass];
+    self.navigationBar.mydelegate = self;
+    return self;
 }
 
 - (UINavigationController *)init {
-    return [super initWithNavigationBarClass:[HBDNavigationBar class] toolbarClass:nil];
+    self = [super initWithNavigationBarClass:[HBDNavigationBar class] toolbarClass:nil];
+    self.navigationBar.mydelegate = self;
+    return self;
 }
 
 - (void)setDelegate:(id <UINavigationControllerDelegate>)delegate {
@@ -677,5 +682,34 @@ - (CGRect)fakeShadowFrameWithBarFrame:(CGRect)frame {
     return CGRectMake(frame.origin.x, frame.size.height + frame.origin.y - hairlineWidth, frame.size.width, hairlineWidth);
 }
 
+/// MARK: - HBDNavigationBarDelegate
+- (void)shouldUpdateNavigationBar:(HBDNavigationBar *)navigationBar {
+
+    UIViewController *viewController = self.topViewController;
+
+    [self updateNavigationBarStyleForViewController:viewController];
+    [self updateNavigationBarBackgroundForViewController:viewController];
+
+    id <UIViewControllerTransitionCoordinator> coordinator = self.transitionCoordinator;
+
+    if (coordinator) {
+        UIViewController *from = [coordinator viewControllerForKey:UITransitionContextFromViewControllerKey];
+        UIViewController *to = [coordinator viewControllerForKey:UITransitionContextToViewControllerKey];
+
+        [self updateNavigationBarTintColorForViewController:from];
+        [self updateNavigationBarTintColorForViewController:to];
+
+        if ([self.viewControllers containsObject:from]) {
+            [self updateNavigationBarAlphaForViewController:from];
+        } else {
+            [self updateNavigationBarAlphaForViewController:to];
+        }
+
+        if (shouldShowFake(viewController, from, to)) {
+            [self showFakeBarFrom:from to:to];
+        }
+    }
+}
+
 @end