Skip to content

fix bugs #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PascoCoder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bugs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Default-568h@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions SCNavigation.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -84,6 +85,7 @@
29670A2F199D9EEF00B4A59B /* SCNavigationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SCNavigationTests.m; sourceTree = "<group>"; };
299114F11B0AD5F700E08BAE /* UIViewController+SCNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+SCNavigation.h"; sourceTree = "<group>"; };
299114F21B0AD5F700E08BAE /* UIViewController+SCNavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+SCNavigation.m"; sourceTree = "<group>"; };
A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -165,6 +167,7 @@
296709F8199D9EEE00B4A59B = {
isa = PBXGroup;
children = (
A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */,
29670A0A199D9EEE00B4A59B /* SCNavigation */,
29670A29199D9EEF00B4A59B /* SCNavigationTests */,
29670A03199D9EEE00B4A59B /* Frameworks */,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions SCNavigation/SCNavigation/SCNavigationController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down