diff --git a/InteractiveSideMenu.xcodeproj/project.pbxproj b/InteractiveSideMenu.xcodeproj/project.pbxproj
index db2272e..fc76d3b 100644
--- a/InteractiveSideMenu.xcodeproj/project.pbxproj
+++ b/InteractiveSideMenu.xcodeproj/project.pbxproj
@@ -111,12 +111,12 @@
881EF07A1E30FFE40035DEB4 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 0930;
ORGANIZATIONNAME = Handsome;
TargetAttributes = {
881EF0821E30FFE40035DEB4 = {
CreatedOnToolsVersion = 8.2.1;
- LastSwiftMigration = 0820;
+ LastSwiftMigration = 0930;
ProvisioningStyle = Automatic;
};
};
@@ -175,15 +175,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -228,15 +236,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -284,7 +300,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -305,7 +322,8 @@
PRODUCT_BUNDLE_IDENTIFIER = is.handsome.InteractiveSideMenu;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
- SWIFT_VERSION = 3.0;
+ SWIFT_SWIFT3_OBJC_INFERENCE = On;
+ SWIFT_VERSION = 4.0;
};
name = Release;
};
diff --git a/InteractiveSideMenu.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/InteractiveSideMenu.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/InteractiveSideMenu.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme b/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme
index 714c2f6..eecab76 100644
--- a/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme
+++ b/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme
@@ -1,6 +1,6 @@
+
+
+
+ IDEDidComputeMac32BitWarning
+
+
+
diff --git a/Sources/MenuAnimator.swift b/Sources/MenuAnimator.swift
index 10d086f..ec4bb5e 100644
--- a/Sources/MenuAnimator.swift
+++ b/Sources/MenuAnimator.swift
@@ -109,7 +109,7 @@ private extension MenuInteractiveTransition {
panRecognizer = UIPanGestureRecognizer(target: self,
action: #selector(MenuInteractiveTransition.handlePanDismission(recognizer:)))
}
-
+ fromViewController.view.frame = CGRect(x: fromViewController.view.frame.origin.x, y: fromViewController.view.frame.origin.y, width: fromViewController.view.frame.size.width, height: fromViewController.view.frame.size.height+55)
contentSnapshotView = createSnapshotView(from: fromViewController.view)
guard let contentSnapshotView = self.contentSnapshotView else {