Skip to content

Commit

Permalink
Merge pull request #48 from asam139/feature/swift4
Browse files Browse the repository at this point in the history
Feature/swift4
  • Loading branch information
andreamazz authored Aug 22, 2018
2 parents 2f79424 + fca8082 commit cc9d650
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 29 deletions.
42 changes: 26 additions & 16 deletions Demo/Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,13 @@
TargetAttributes = {
659891461B032E3B00BF6CD9 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = H72GR44F4M;
LastSwiftMigration = 0800;
ProvisioningStyle = Manual;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
};
6598915B1B032E3B00BF6CD9 = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0940;
LastSwiftMigration = 1000;
ProvisioningStyle = Automatic;
TestTargetID = 659891461B032E3B00BF6CD9;
};
};
Expand Down Expand Up @@ -475,14 +475,16 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = H72GR44F4M;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_VERSION = 4.0;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -492,14 +494,16 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = H72GR44F4M;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Demo/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_VERSION = 4.0;
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -508,6 +512,9 @@
baseConfigurationReference = 83D20289FFB4800E6E55A49E /* Pods-DemoTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -520,8 +527,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
};
name = Debug;
Expand All @@ -531,6 +538,9 @@
baseConfigurationReference = C61579D3F63699F33DBFC1D8 /* Pods-DemoTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Expand All @@ -539,8 +549,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "it.fancypixel.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
};
name = Release;
Expand Down
23 changes: 14 additions & 9 deletions Demo/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Source/BubbleTransition.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ open class BubbleTransition: NSObject {
The point that originates the bubble. The bubble starts from this point
and shrinks to it on dismiss
*/
open var startingPoint = CGPoint.zero {
@objc open var startingPoint = CGPoint.zero {
didSet {
bubble.center = startingPoint
}
Expand All @@ -52,18 +52,18 @@ open class BubbleTransition: NSObject {
The transition duration. The same value is used in both the Present or Dismiss actions
Defaults to `0.5`
*/
open var duration = 0.5
@objc open var duration = 0.5

/**
The transition direction. Possible values `.present`, `.dismiss` or `.pop`
Defaults to `.Present`
*/
open var transitionMode: BubbleTransitionMode = .present
@objc open var transitionMode: BubbleTransitionMode = .present

/**
The color of the bubble. Make sure that it matches the destination controller's background color.
*/
open var bubbleColor: UIColor = .white
@objc open var bubbleColor: UIColor = .white

open fileprivate(set) var bubble = UIView()

Expand Down

0 comments on commit cc9d650

Please sign in to comment.