Skip to content

Commit 5e37b54

Browse files
committed
Revert "iOS 14 support"
This reverts commit 9b23d10.
1 parent 9b23d10 commit 5e37b54

File tree

8 files changed

+5
-101
lines changed

8 files changed

+5
-101
lines changed

KMNavigationBarTransition.podspec

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "KMNavigationBarTransition"
4-
s.version = "1.1.7"
4+
s.version = "1.1.6"
55
s.summary = "A drop-in universal library makes transition animations smooth between different navigation bar styles while pushing or popping."
66

77
s.description = <<-DESC
@@ -26,10 +26,6 @@ Pod::Spec.new do |s|
2626

2727
s.source_files = "KMNavigationBarTransition/*.{h,m}"
2828

29-
s.resource_bundles = {
30-
'KMNavigationBarTransition' => ['KMNavigationBarTransition/*.{xib}']
31-
}
32-
3329
s.frameworks = "UIKit"
3430

3531
s.requires_arc = true

KMNavigationBarTransition.xcodeproj/project.pbxproj

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
CD4209391F7A47CF00A1EAF5 /* UIScrollView+KMNavigationBarTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = CDE74D801F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.h */; };
11-
CD7C7F2C2512238F009BC6D8 /* KMNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */; };
1211
CDA372851C39087D00E39A6D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDA372841C39087D00E39A6D /* AppDelegate.swift */; };
1312
CDA372881C39089200E39A6D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CDA372861C39089200E39A6D /* Main.storyboard */; };
1413
CDA3728A1C39089900E39A6D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CDA372891C39089900E39A6D /* Assets.xcassets */; };
@@ -38,8 +37,6 @@
3837
CDC722B41F72599F0077084B /* NSObject+KMNavigationBarTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = CDC722B21F72599F0077084B /* NSObject+KMNavigationBarTransition.m */; };
3938
CDD35A4C1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = CDD35A4B1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h */; };
4039
CDE74D821F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE74D811F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m */; };
41-
CDF63EAF25135CE500C3E646 /* KMNavigationBarTransitionUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */; };
42-
CDF63EB025135CE500C3E646 /* KMNavigationBarTransitionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */; };
4340
/* End PBXBuildFile section */
4441

4542
/* Begin PBXContainerItemProxy section */
@@ -67,7 +64,6 @@
6764
/* End PBXCopyFilesBuildPhase section */
6865

6966
/* Begin PBXFileReference section */
70-
CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KMNavigationBar.xib; sourceTree = "<group>"; };
7167
CDA3726F1C3907CE00E39A6D /* KMNavigationBarTransition-Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KMNavigationBarTransition-Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7268
CDA372841C39087D00E39A6D /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Example/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
7369
CDA372871C39089200E39A6D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Example/Base.lproj/Main.storyboard; sourceTree = SOURCE_ROOT; };
@@ -100,8 +96,6 @@
10096
CDDFA1F61C3921BD00BFBA1B /* UIViewController+KMNavigationBarTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+KMNavigationBarTransition.m"; sourceTree = "<group>"; };
10197
CDE74D801F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+KMNavigationBarTransition.h"; sourceTree = "<group>"; };
10298
CDE74D811F7A457C003052BE /* UIScrollView+KMNavigationBarTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+KMNavigationBarTransition.m"; sourceTree = "<group>"; };
103-
CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMNavigationBarTransitionUtils.h; sourceTree = "<group>"; };
104-
CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMNavigationBarTransitionUtils.m; sourceTree = "<group>"; };
10599
/* End PBXFileReference section */
106100

107101
/* Begin PBXFrameworksBuildPhase section */
@@ -196,9 +190,6 @@
196190
CDC1BA0D1CE1DFE8006BE1B6 /* KMWeakObjectContainer.m */,
197191
CDDFA1F11C3921BD00BFBA1B /* KMSwizzle.h */,
198192
CDDFA1F21C3921BD00BFBA1B /* KMSwizzle.m */,
199-
CDF63EAD25135CE500C3E646 /* KMNavigationBarTransitionUtils.h */,
200-
CDF63EAE25135CE500C3E646 /* KMNavigationBarTransitionUtils.m */,
201-
CD7C7F2B2512238F009BC6D8 /* KMNavigationBar.xib */,
202193
CDC01B9C1E5CA46400F6F3E2 /* KMNavigationBarTransition.h */,
203194
CDC01B9E1E5CA46900F6F3E2 /* Info.plist */,
204195
);
@@ -218,7 +209,6 @@
218209
CDAA3BB31E5CB40E00666BB0 /* UIViewController+KMNavigationBarTransition_internal.h in Headers */,
219210
CDC01B9F1E5CA48400F6F3E2 /* UINavigationController+KMNavigationBarTransition.h in Headers */,
220211
CDC722B01F72590C0077084B /* UINavigationBar+KMNavigationBarTransition_internal.h in Headers */,
221-
CDF63EAF25135CE500C3E646 /* KMNavigationBarTransitionUtils.h in Headers */,
222212
CDD35A4C1F94CABE00EFDBD8 /* UIScrollView+KMNavigationBarTransition_internal.h in Headers */,
223213
CD4209391F7A47CF00A1EAF5 /* UIScrollView+KMNavigationBarTransition.h in Headers */,
224214
CDC01BA11E5CA48900F6F3E2 /* UIViewController+KMNavigationBarTransition.h in Headers */,
@@ -293,7 +283,6 @@
293283
developmentRegion = English;
294284
hasScannedForEncodings = 0;
295285
knownRegions = (
296-
English,
297286
en,
298287
Base,
299288
);
@@ -323,7 +312,6 @@
323312
isa = PBXResourcesBuildPhase;
324313
buildActionMask = 2147483647;
325314
files = (
326-
CD7C7F2C2512238F009BC6D8 /* KMNavigationBar.xib in Resources */,
327315
);
328316
runOnlyForDeploymentPostprocessing = 0;
329317
};
@@ -347,7 +335,6 @@
347335
isa = PBXSourcesBuildPhase;
348336
buildActionMask = 2147483647;
349337
files = (
350-
CDF63EB025135CE500C3E646 /* KMNavigationBarTransitionUtils.m in Sources */,
351338
CDC722B41F72599F0077084B /* NSObject+KMNavigationBarTransition.m in Sources */,
352339
CDC01BA41E5CA48F00F6F3E2 /* KMWeakObjectContainer.m in Sources */,
353340
CDC722AE1F7257EE0077084B /* UINavigationBar+KMNavigationBarTransition.m in Sources */,
@@ -431,7 +418,6 @@
431418
ONLY_ACTIVE_ARCH = YES;
432419
SDKROOT = iphoneos;
433420
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
434-
SWIFT_VERSION = 4.0;
435421
TARGETED_DEVICE_FAMILY = "1,2";
436422
};
437423
name = Debug;
@@ -472,7 +458,6 @@
472458
MTL_ENABLE_DEBUG_INFO = NO;
473459
SDKROOT = iphoneos;
474460
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
475-
SWIFT_VERSION = 4.0;
476461
TARGETED_DEVICE_FAMILY = "1,2";
477462
VALIDATE_PRODUCT = YES;
478463
};
@@ -487,7 +472,7 @@
487472
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
488473
PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
489474
PRODUCT_NAME = "$(TARGET_NAME)";
490-
SWIFT_VERSION = 4.0;
475+
SWIFT_VERSION = 3.0;
491476
};
492477
name = Debug;
493478
};
@@ -500,7 +485,7 @@
500485
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
501486
PRODUCT_BUNDLE_IDENTIFIER = "com.mo.KMNavigationBarTransition-Example";
502487
PRODUCT_NAME = "$(TARGET_NAME)";
503-
SWIFT_VERSION = 4.0;
488+
SWIFT_VERSION = 3.0;
504489
};
505490
name = Release;
506491
};

KMNavigationBarTransition/KMNavigationBar.xib

Lines changed: 0 additions & 21 deletions
This file was deleted.

KMNavigationBarTransition/KMNavigationBarTransitionUtils.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

KMNavigationBarTransition/KMNavigationBarTransitionUtils.m

Lines changed: 0 additions & 27 deletions
This file was deleted.

KMNavigationBarTransition/KMWeakObjectContainer.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@
2626
extern void km_objc_setAssociatedWeakObject(id container, void *key, id value);
2727
extern id km_objc_getAssociatedWeakObject(id container, void *key);
2828

29-
@interface KMWeakObjectContainer : NSObject
30-
31-
@end

KMNavigationBarTransition/KMWeakObjectContainer.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#import "KMWeakObjectContainer.h"
2525
#import <objc/runtime.h>
2626

27-
@interface KMWeakObjectContainer ()
27+
@interface KMWeakObjectContainer : NSObject
2828
@property (nonatomic, weak) id object;
2929
@end
3030

KMNavigationBarTransition/UIViewController+KMNavigationBarTransition.m

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#import "UINavigationController+KMNavigationBarTransition_internal.h"
2727
#import "UINavigationBar+KMNavigationBarTransition_internal.h"
2828
#import "UIScrollView+KMNavigationBarTransition_internal.h"
29-
#import "KMNavigationBarTransitionUtils.h"
3029
#import "KMWeakObjectContainer.h"
3130
#import <objc/runtime.h>
3231
#import "KMSwizzle.h"
@@ -127,13 +126,7 @@ - (void)km_addTransitionNavigationBarIfNeeded {
127126
return;
128127
}
129128
[self km_adjustScrollViewContentOffsetIfNeeded];
130-
UINavigationBar *bar = nil;
131-
if (@available(iOS 14, *)) {
132-
NSBundle *bundle = [KMNavigationBarTransitionUtils getBundle];
133-
bar = [bundle loadNibNamed:@"KMNavigationBar" owner:nil options:nil].firstObject;
134-
} else {
135-
bar = [[UINavigationBar alloc] init];
136-
}
129+
UINavigationBar *bar = [[UINavigationBar alloc] init];
137130
bar.km_isFakeBar = YES;
138131
bar.barStyle = self.navigationController.navigationBar.barStyle;
139132
if (bar.translucent != self.navigationController.navigationBar.translucent) {

0 commit comments

Comments
 (0)