diff --git a/Default-568h@2x.png b/Default-568h@2x.png new file mode 100644 index 0000000..0891b7a Binary files /dev/null and b/Default-568h@2x.png differ diff --git a/SCNavigation.xcodeproj/project.pbxproj b/SCNavigation.xcodeproj/project.pbxproj index 2168e39..4fa907d 100644 --- a/SCNavigation.xcodeproj/project.pbxproj +++ b/SCNavigation.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ 29670A2E199D9EEF00B4A59B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 29670A2C199D9EEF00B4A59B /* InfoPlist.strings */; }; 29670A30199D9EEF00B4A59B /* SCNavigationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 29670A2F199D9EEF00B4A59B /* SCNavigationTests.m */; }; 299114F31B0AD5F700E08BAE /* UIViewController+SCNavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 299114F21B0AD5F700E08BAE /* UIViewController+SCNavigation.m */; }; + A6C2F8CD1B976D330085BCA9 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -84,6 +85,7 @@ 29670A2F199D9EEF00B4A59B /* SCNavigationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SCNavigationTests.m; sourceTree = ""; }; 299114F11B0AD5F700E08BAE /* UIViewController+SCNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+SCNavigation.h"; sourceTree = ""; }; 299114F21B0AD5F700E08BAE /* UIViewController+SCNavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+SCNavigation.m"; sourceTree = ""; }; + A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -165,6 +167,7 @@ 296709F8199D9EEE00B4A59B = { isa = PBXGroup; children = ( + A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */, 29670A0A199D9EEE00B4A59B /* SCNavigation */, 29670A29199D9EEF00B4A59B /* SCNavigationTests */, 29670A03199D9EEE00B4A59B /* Frameworks */, @@ -316,6 +319,7 @@ 29670A1D199D9EEE00B4A59B /* Images.xcassets in Resources */, 2929701519A38945007B5A02 /* navi_mask@2x.png in Resources */, 2929701619A38945007B5A02 /* navi_shadow@2x.png in Resources */, + A6C2F8CD1B976D330085BCA9 /* Default-568h@2x.png in Resources */, 29670A0F199D9EEE00B4A59B /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -461,8 +465,6 @@ 29670A34199D9EEF00B4A59B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SCNavigation/SCNavigation-Prefix.pch"; INFOPLIST_FILE = "SCNavigation/SCNavigation-Info.plist"; @@ -475,8 +477,6 @@ 29670A35199D9EEF00B4A59B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SCNavigation/SCNavigation-Prefix.pch"; INFOPLIST_FILE = "SCNavigation/SCNavigation-Info.plist"; diff --git a/SCNavigation/SCNavigation/SCNavigationController.m b/SCNavigation/SCNavigation/SCNavigationController.m index 0409ecf..76f0cfc 100644 --- a/SCNavigation/SCNavigation/SCNavigationController.m +++ b/SCNavigation/SCNavigation/SCNavigationController.m @@ -91,10 +91,10 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani - (UIViewController *)popViewControllerAnimated:(BOOL)animated { - if (self.isTransiting) { - self.isTransiting = NO; - return nil; - } +// if (self.isTransiting) { +// self.isTransiting = NO; +// return nil; +// } return [super popViewControllerAnimated:animated];