Skip to content
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.

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

Add Carthage Support #81

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

#import "UINavigationController+FDFullscreenPopGesture.h"
#import "FDFullscreenPopGesture.h"
#import <objc/runtime.h>

@interface _FDFullscreenPopGestureRecognizerDelegate : NSObject <UIGestureRecognizerDelegate>
Expand Down
Binary file added FDFullscreenPopGestureDemo/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
//
// FDFullscreenPopGesture.h
// FDFullscreenPopGesture
//
// Created by LawLincoln on 16/6/2.
// Copyright © 2016年 forkingdog. All rights reserved.
//

#import <UIKit/UIKit.h>

//! Project version number for FDFullscreenPopGesture.
FOUNDATION_EXPORT double FDFullscreenPopGestureVersionNumber;

//! Project version string for FDFullscreenPopGesture.
FOUNDATION_EXPORT const unsigned char FDFullscreenPopGestureVersionString[];

/// "UINavigation+FDFullscreenPopGesture" extends UINavigationController's swipe-
/// to-pop behavior in iOS 7+ by supporting fullscreen pan gesture. Instead of
/// screen edge, you can now swipe from any place on the screen and the onboard
/// interactive pop transition works seamlessly.
///
/// Adding the implementation file of this category to your target will
/// automatically patch UINavigationController with this feature.
@interface UINavigationController (FDFullscreenPopGesture)

/// The gesture recognizer that actually handles interactive pop.
@property (nonatomic, strong, readonly) UIPanGestureRecognizer *fd_fullscreenPopGestureRecognizer;

/// A view controller is able to control navigation bar's appearance by itself,
/// rather than a global way, checking "fd_prefersNavigationBarHidden" property.
/// Default to YES, disable it if you don't want so.
@property (nonatomic, assign) BOOL fd_viewControllerBasedNavigationBarAppearanceEnabled;

@end

/// Allows any view controller to disable interactive pop gesture, which might
/// be necessary when the view controller itself handles pan gesture in some
/// cases.
@interface UIViewController (FDFullscreenPopGesture)

/// Whether the interactive pop gesture is disabled when contained in a navigation
/// stack.
@property (nonatomic, assign) BOOL fd_interactivePopDisabled;

/// Indicate this view controller prefers its navigation bar hidden or not,
/// checked when view controller based navigation bar's appearance is enabled.
/// Default to NO, bars are more likely to show.
@property (nonatomic, assign) BOOL fd_prefersNavigationBarHidden;

/// Max allowed initial distance to left edge when you begin the interactive pop
/// gesture. 0 by default, which means it will ignore this limit.
@property (nonatomic, assign) CGFloat fd_interactivePopMaxAllowedInitialDistanceToLeftEdge;

@end
26 changes: 26 additions & 0 deletions FDFullscreenPopGestureDemo/FDFullscreenPopGesture/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
166C9AC31CFFEDC70091C82E /* FDFullscreenPopGesture.h in Headers */ = {isa = PBXBuildFile; fileRef = 166C9AC21CFFEDC70091C82E /* FDFullscreenPopGesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
166C9AC71CFFEDC70091C82E /* FDFullscreenPopGesture.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 166C9AC01CFFEDC70091C82E /* FDFullscreenPopGesture.framework */; };
166C9AC81CFFEDC70091C82E /* FDFullscreenPopGesture.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 166C9AC01CFFEDC70091C82E /* FDFullscreenPopGesture.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1673A1F31D016E1300519B15 /* UINavigationController+FDFullscreenPopGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 16AE775A1CFF37220071C3F9 /* UINavigationController+FDFullscreenPopGesture.m */; };
4894F4201B183DE3009F44D9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4894F41F1B183DE3009F44D9 /* main.m */; };
4894F4231B183DE3009F44D9 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4894F4221B183DE3009F44D9 /* AppDelegate.m */; };
4894F4291B183DE3009F44D9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4894F4271B183DE3009F44D9 /* Main.storyboard */; };
Expand All @@ -15,7 +19,37 @@
4894F4461B183E99009F44D9 /* UINavigationController+FDFullscreenPopGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 4894F4441B183E99009F44D9 /* UINavigationController+FDFullscreenPopGesture.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
166C9AC51CFFEDC70091C82E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4894F4121B183DE3009F44D9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 166C9ABF1CFFEDC70091C82E;
remoteInfo = FDFullscreenPopGesture;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
16AE77541CFF368F0071C3F9 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
166C9AC81CFFEDC70091C82E /* FDFullscreenPopGesture.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
166C9AC01CFFEDC70091C82E /* FDFullscreenPopGesture.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FDFullscreenPopGesture.framework; sourceTree = BUILT_PRODUCTS_DIR; };
166C9AC21CFFEDC70091C82E /* FDFullscreenPopGesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FDFullscreenPopGesture.h; sourceTree = "<group>"; };
166C9AC41CFFEDC70091C82E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
16AE774A1CFF368F0071C3F9 /* FDFullscreenPopGesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FDFullscreenPopGesture.h; sourceTree = "<group>"; };
16AE774C1CFF368F0071C3F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
16AE775A1CFF37220071C3F9 /* UINavigationController+FDFullscreenPopGesture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UINavigationController+FDFullscreenPopGesture.m"; path = "../../FDFullscreenPopGesture/UINavigationController+FDFullscreenPopGesture.m"; sourceTree = "<group>"; };
4894F41A1B183DE3009F44D9 /* FDFullscreenPopGestureDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FDFullscreenPopGestureDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
4894F41E1B183DE3009F44D9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4894F41F1B183DE3009F44D9 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand All @@ -29,20 +63,49 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
166C9ABC1CFFEDC70091C82E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
4894F4171B183DE3009F44D9 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
166C9AC71CFFEDC70091C82E /* FDFullscreenPopGesture.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
166C9AC11CFFEDC70091C82E /* FDFullscreenPopGesture */ = {
isa = PBXGroup;
children = (
166C9AC21CFFEDC70091C82E /* FDFullscreenPopGesture.h */,
166C9AC41CFFEDC70091C82E /* Info.plist */,
);
path = FDFullscreenPopGesture;
sourceTree = "<group>";
};
16AE77491CFF368F0071C3F9 /* FDFullscreenPopGesture */ = {
isa = PBXGroup;
children = (
16AE774A1CFF368F0071C3F9 /* FDFullscreenPopGesture.h */,
16AE775A1CFF37220071C3F9 /* UINavigationController+FDFullscreenPopGesture.m */,
16AE774C1CFF368F0071C3F9 /* Info.plist */,
);
path = FDFullscreenPopGesture;
sourceTree = "<group>";
};
4894F4111B183DE3009F44D9 = {
isa = PBXGroup;
children = (
4894F41C1B183DE3009F44D9 /* FDFullscreenPopGestureDemo */,
16AE77491CFF368F0071C3F9 /* FDFullscreenPopGesture */,
166C9AC11CFFEDC70091C82E /* FDFullscreenPopGesture */,
4894F41B1B183DE3009F44D9 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -51,6 +114,7 @@
isa = PBXGroup;
children = (
4894F41A1B183DE3009F44D9 /* FDFullscreenPopGestureDemo.app */,
166C9AC01CFFEDC70091C82E /* FDFullscreenPopGesture.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -90,18 +154,49 @@
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
166C9ABD1CFFEDC70091C82E /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
166C9AC31CFFEDC70091C82E /* FDFullscreenPopGesture.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
166C9ABF1CFFEDC70091C82E /* FDFullscreenPopGesture */ = {
isa = PBXNativeTarget;
buildConfigurationList = 166C9AC91CFFEDC70091C82E /* Build configuration list for PBXNativeTarget "FDFullscreenPopGesture" */;
buildPhases = (
166C9ABB1CFFEDC70091C82E /* Sources */,
166C9ABC1CFFEDC70091C82E /* Frameworks */,
166C9ABD1CFFEDC70091C82E /* Headers */,
166C9ABE1CFFEDC70091C82E /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = FDFullscreenPopGesture;
productName = FDFullscreenPopGesture;
productReference = 166C9AC01CFFEDC70091C82E /* FDFullscreenPopGesture.framework */;
productType = "com.apple.product-type.framework";
};
4894F4191B183DE3009F44D9 /* FDFullscreenPopGestureDemo */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4894F43D1B183DE3009F44D9 /* Build configuration list for PBXNativeTarget "FDFullscreenPopGestureDemo" */;
buildPhases = (
4894F4161B183DE3009F44D9 /* Sources */,
4894F4171B183DE3009F44D9 /* Frameworks */,
4894F4181B183DE3009F44D9 /* Resources */,
16AE77541CFF368F0071C3F9 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
166C9AC61CFFEDC70091C82E /* PBXTargetDependency */,
);
name = FDFullscreenPopGestureDemo;
productName = FDFullscreenPopGestureDemo;
Expand All @@ -117,6 +212,9 @@
LastUpgradeCheck = 0630;
ORGANIZATIONNAME = forkingdog;
TargetAttributes = {
166C9ABF1CFFEDC70091C82E = {
CreatedOnToolsVersion = 7.3.1;
};
4894F4191B183DE3009F44D9 = {
CreatedOnToolsVersion = 6.3.1;
};
Expand All @@ -136,11 +234,19 @@
projectRoot = "";
targets = (
4894F4191B183DE3009F44D9 /* FDFullscreenPopGestureDemo */,
166C9ABF1CFFEDC70091C82E /* FDFullscreenPopGesture */,
);
};
/* End PBXProject section */

/* Begin PBXResourcesBuildPhase section */
166C9ABE1CFFEDC70091C82E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
4894F4181B183DE3009F44D9 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -154,6 +260,14 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
166C9ABB1CFFEDC70091C82E /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1673A1F31D016E1300519B15 /* UINavigationController+FDFullscreenPopGesture.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4894F4161B183DE3009F44D9 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -166,6 +280,14 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
166C9AC61CFFEDC70091C82E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 166C9ABF1CFFEDC70091C82E /* FDFullscreenPopGesture */;
targetProxy = 166C9AC51CFFEDC70091C82E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
4894F4271B183DE3009F44D9 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand All @@ -186,6 +308,52 @@
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
166C9ACA1CFFEDC70091C82E /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = FDFullscreenPopGesture/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.SelfStudio.FDFullscreenPopGesture;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
166C9ACB1CFFEDC70091C82E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = FDFullscreenPopGesture/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.SelfStudio.FDFullscreenPopGesture;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
4894F43B1B183DE3009F44D9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -289,6 +457,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
166C9AC91CFFEDC70091C82E /* Build configuration list for PBXNativeTarget "FDFullscreenPopGesture" */ = {
isa = XCConfigurationList;
buildConfigurations = (
166C9ACA1CFFEDC70091C82E /* Debug */,
166C9ACB1CFFEDC70091C82E /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4894F4151B183DE3009F44D9 /* Build configuration list for PBXProject "FDFullscreenPopGestureDemo" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand All @@ -305,6 +482,7 @@
4894F43F1B183DE3009F44D9 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
Loading