iOS 14 support

Author: MoZhouqi

KMNavigationBarTransition.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "KMNavigationBarTransition"
-  s.version      = "1.1.6"
+  s.version      = "1.1.7"
   s.summary      = "A drop-in universal library makes transition animations smooth between different navigation bar styles while pushing or popping."
 
   s.description  = <<-DESC
@@ -26,6 +26,10 @@ Pod::Spec.new do |s|
 
   s.source_files  = "KMNavigationBarTransition/*.{h,m}"
 
+  s.resource_bundles = {
+    'KMNavigationBarTransition' => ['KMNavigationBarTransition/*.{xib}']
+  }
+
   s.frameworks = "UIKit"
 
   s.requires_arc = true

KMNavigationBarTransition.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		CD4209391F7A47CF00A1EAF5 /* UIScrollView+KMNavigationBarTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE74D801F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.h */; };
+		CD7C7F2C2512238F009BC6D8 /* KMNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */; };
 		CDA372851C39087D00E39A6D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDA372841C39087D00E39A6D /* AppDelegate.swift */; };
 		CDA372881C39089200E39A6D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CDA372861C39089200E39A6D /* Main.storyboard */; };
 		CDA3728A1C39089900E39A6D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CDA372891C39089900E39A6D /* Assets.xcassets */; };
@@ -37,6 +38,8 @@
 		CDC722B41F72599F0077084B /* NSObject+KMNavigationBarTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = CDC722B21F72599F0077084B /* NSObject+KMNavigationBarTransition.m */; };
 		CDD35A4C1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD35A4B1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h */; };
 		CDE74D821F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE74D811F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m */; };
+		CDF63EAF25135CE500C3E646 /* KMNavigationBarTransitionUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */; };
+		CDF63EB025135CE500C3E646 /* KMNavigationBarTransitionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -64,6 +67,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMNavigationBar.xib; sourceTree = "<group>"; };
 		CDA3726F1C3907CE00E39A6D /* KMNavigationBarTransition-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KMNavigationBarTransition-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDA372841C39087D00E39A6D /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Example/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
 		CDA372871C39089200E39A6D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Example/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; };
@@ -96,6 +100,8 @@
 		CDDFA1F61C3921BD00BFBA1B /* UIViewController+KMNavigationBarTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+KMNavigationBarTransition.m"; sourceTree = "<group>"; };
 		CDE74D801F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+KMNavigationBarTransition.h"; sourceTree = "<group>"; };
 		CDE74D811F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+KMNavigationBarTransition.m"; sourceTree = "<group>"; };
+		CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMNavigationBarTransitionUtils.h; sourceTree = "<group>"; };
+		CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMNavigationBarTransitionUtils.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -190,6 +196,9 @@
 				CDC1BA0D1CE1DFE8006BE1B6 /* KMWeakObjectContainer.m */,
 				CDDFA1F11C3921BD00BFBA1B /* KMSwizzle.h */,
 				CDDFA1F21C3921BD00BFBA1B /* KMSwizzle.m */,
+				CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */,
+				CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */,
+				CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */,
 				CDC01B9C1E5CA46400F6F3E2 /* KMNavigationBarTransition.h */,
 				CDC01B9E1E5CA46900F6F3E2 /* Info.plist */,
 			);
@@ -209,6 +218,7 @@
 				CDAA3BB31E5CB40E00666BB0 /* UIViewController+KMNavigationBarTransition_internal.h in Headers */,
 				CDC01B9F1E5CA48400F6F3E2 /* UINavigationController+KMNavigationBarTransition.h in Headers */,
 				CDC722B01F72590C0077084B /* UINavigationBar+KMNavigationBarTransition_internal.h in Headers */,
+				CDF63EAF25135CE500C3E646 /* KMNavigationBarTransitionUtils.h in Headers */,
 				CDD35A4C1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h in Headers */,
 				CD4209391F7A47CF00A1EAF5 /* UIScrollView+KMNavigationBarTransition.h in Headers */,
 				CDC01BA11E5CA48900F6F3E2 /* UIViewController+KMNavigationBarTransition.h in Headers */,
@@ -283,6 +293,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -312,6 +323,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CD7C7F2C2512238F009BC6D8 /* KMNavigationBar.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -335,6 +347,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CDF63EB025135CE500C3E646 /* KMNavigationBarTransitionUtils.m in Sources */,
 				CDC722B41F72599F0077084B /* NSObject+KMNavigationBarTransition.m in Sources */,
 				CDC01BA41E5CA48F00F6F3E2 /* KMWeakObjectContainer.m in Sources */,
 				CDC722AE1F7257EE0077084B /* UINavigationBar+KMNavigationBarTransition.m in Sources */,
@@ -418,6 +431,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -458,6 +472,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -472,7 +487,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -485,7 +500,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

KMNavigationBarTransition/KMNavigationBar.xib

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <navigationBar contentMode="scaleToFill" id="EN9-bF-HJS">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+            <items>
+                <navigationItem id="ob3-YQ-Loh"/>
+            </items>
+            <point key="canvasLocation" x="-94" y="88"/>
+        </navigationBar>
+    </objects>
+</document>

KMNavigationBarTransition/KMNavigationBarTransitionUtils.h

@@ -0,0 +1,19 @@
+//
+//  KMNavigationBarTransitionUtils.h
+//  KMNavigationBarTransition
+//
+//  Created by Zhouqi Mo on 2020/9/17.
+//  Copyright © 2020 Zhouqi Mo. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KMNavigationBarTransitionUtils : NSObject
+
++ (NSBundle *)getBundle;
+
+@end
+
+NS_ASSUME_NONNULL_END

KMNavigationBarTransition/KMNavigationBarTransitionUtils.m

@@ -0,0 +1,27 @@
+//
+//  KMNavigationBarTransitionUtils.m
+//  KMNavigationBarTransition
+//
+//  Created by Zhouqi Mo on 2020/9/17.
+//  Copyright © 2020 Zhouqi Mo. All rights reserved.
+//
+
+#import "KMNavigationBarTransitionUtils.h"
+#import "KMWeakObjectContainer.h"
+
+@implementation KMNavigationBarTransitionUtils
+
++ (NSBundle *)getBundle {
+    NSBundle *bundle = [NSBundle bundleForClass:KMWeakObjectContainer.class];
+    NSURL *bundleURL = [bundle URLForResource:@"KMNavigationBarTransition" withExtension:@"bundle"];
+    if (!bundleURL) {
+        if ([bundle.bundlePath hasSuffix:@"KMNavigationBarTransition.framework"]) {
+            return bundle;
+        }
+    } else {
+        bundle = [NSBundle bundleWithURL:bundleURL];
+    }
+    return  bundle ? bundle : [NSBundle mainBundle];
+}
+
+@end

KMNavigationBarTransition/KMWeakObjectContainer.h

@@ -26,3 +26,6 @@
 extern void km_objc_setAssociatedWeakObject(id container, void *key, id value);
 extern id km_objc_getAssociatedWeakObject(id container, void *key);
 
+@interface KMWeakObjectContainer : NSObject
+
+@end

KMNavigationBarTransition/KMWeakObjectContainer.m

@@ -24,7 +24,7 @@
 #import "KMWeakObjectContainer.h"
 #import <objc/runtime.h>
 
-@interface KMWeakObjectContainer : NSObject
+@interface KMWeakObjectContainer ()
 @property (nonatomic, weak) id object;
 @end
 

KMNavigationBarTransition/UIViewController+KMNavigationBarTransition.m

@@ -26,6 +26,7 @@
 #import "UINavigationController+KMNavigationBarTransition_internal.h"
 #import "UINavigationBar+KMNavigationBarTransition_internal.h"
 #import "UIScrollView+KMNavigationBarTransition_internal.h"
+#import "KMNavigationBarTransitionUtils.h"
 #import "KMWeakObjectContainer.h"
 #import <objc/runtime.h>
 #import "KMSwizzle.h"
@@ -126,7 +127,13 @@ - (void)km_addTransitionNavigationBarIfNeeded {
         return;
     }
     [self km_adjustScrollViewContentOffsetIfNeeded];
-    UINavigationBar *bar = [[UINavigationBar alloc] init];
+    UINavigationBar *bar = nil;
+    if (@available(iOS 14, *)) {
+        NSBundle *bundle = [KMNavigationBarTransitionUtils getBundle];
+        bar = [bundle loadNibNamed:@"KMNavigationBar" owner:nil options:nil].firstObject;
+    } else {
+        bar = [[UINavigationBar alloc] init];
+    }
     bar.km_isFakeBar = YES;
     bar.barStyle = self.navigationController.navigationBar.barStyle;
     if (bar.translucent != self.navigationController.navigationBar.translucent) {