Skip to content

Commit

Permalink
update to swift 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ezefranca
ezefranca committed Aug 18, 2018
1 parent d7750c5 commit 284a6ac
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 19 deletions.
11 changes: 7 additions & 4 deletions Pod/Classes/WatchShaker.swift
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import CoreMotion
/// - shakeSensibilityHardest: Hardest shake sensibility /// - shakeSensibilityHardest: Hardest shake sensibility


enum ShakeSensibility: Double { enum ShakeSensibility: Double {
typealias RawValue = Double
case shakeSensibilitySoftest = 0.1 case shakeSensibilitySoftest = 0.1
case shakeSensibilitySoft = 0.7 case shakeSensibilitySoft = 0.7
case shakeSensibilityNormal = 1.0 case shakeSensibilityNormal = 1.0
Expand All @@ -32,7 +33,7 @@ protocol WatchShakerDelegate
/// Called when Apple Watch are shaked /// Called when Apple Watch are shaked
/// ///
/// - Parameter watchShaker: the watch shaker instance /// - Parameter watchShaker: the watch shaker instance
func watchShakerDidShake(_ watchShaker: WatchShaker) func watchShaker(_ watchShaker: WatchShaker, didShakeWith sensibility:ShakeSensibility)


/// Called when Something are wrong /// Called when Something are wrong
/// ///
Expand All @@ -59,14 +60,15 @@ extension WatchShaker {
} }




class WatchShaker class WatchShaker : NSObject
{ {
public var delegate: WatchShakerDelegate? public var delegate: WatchShakerDelegate?


fileprivate var motionManager: CMMotionManager! fileprivate var motionManager: CMMotionManager!
fileprivate var lastShakeDate: Date? fileprivate var lastShakeDate: Date?
// The threshold for how much acceleration needs to happen before an event will register. // The threshold for how much acceleration needs to happen before an event will register.
fileprivate var threshold:Double fileprivate var threshold:Double
fileprivate var sensibility:ShakeSensibility
// Time between shakes // Time between shakes
fileprivate var delay:Double = 0.1 fileprivate var delay:Double = 0.1


Expand All @@ -79,6 +81,7 @@ class WatchShaker
init(shakeSensibility to:ShakeSensibility, delay time:Double) { init(shakeSensibility to:ShakeSensibility, delay time:Double) {
self.threshold = to.rawValue self.threshold = to.rawValue
self.delay = time self.delay = time
self.sensibility = to
self.motionManager = CMMotionManager() self.motionManager = CMMotionManager()
} }


Expand Down Expand Up @@ -118,13 +121,13 @@ class WatchShaker
if Date().compare(lastDate.addingTimeInterval(self.delay)) == .orderedDescending if Date().compare(lastDate.addingTimeInterval(self.delay)) == .orderedDescending
{ {
self.lastShakeDate = Date() self.lastShakeDate = Date()
self.delegate?.watchShakerDidShake(self) self.delegate?.watchShaker(self, didShakeWith: self.sensibility)
} }
return return
} }


self.lastShakeDate = Date() self.lastShakeDate = Date()
self.delegate?.watchShakerDidShake(self) self.delegate?.watchShaker(self, didShakeWith: self.sensibility)
} }
} }
} }
Expand Down
19 changes: 15 additions & 4 deletions WatchShaker WatchKit App/Base.lproj/Interface.storyboard
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,18 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="12121" systemVersion="16G1036" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc"> <document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="14113" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
<device id="watch38" orientation="portrait"> <device id="watch38" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="watchOS"/> <deployment identifier="watchOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="12029"/> <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="14033"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--Interface Controller--> <!--Interface Controller-->
<scene sceneID="aou-V4-d1y"> <scene sceneID="aou-V4-d1y">
<objects> <objects>
<controller id="AgC-eL-Hgc" customClass="InterfaceController" customModule="WatchShaker_WatchKit_App" customModuleProvider="target"/> <controller id="AgC-eL-Hgc" customClass="InterfaceController" customModule="WatchShaker_WatchKit_App" customModuleProvider="target">
<items>
<group width="1" height="1" alignment="left" id="ncX-kr-CuE">
<items>
<label alignment="center" verticalAlignment="center" id="oU8-rf-Reh"/>
</items>
</group>
</items>
<connections>
<outlet property="infoLabel" destination="oU8-rf-Reh" id="PPf-em-zv3"/>
</connections>
</controller>
</objects> </objects>
<point key="canvasLocation" x="220" y="345"/> <point key="canvasLocation" x="220" y="345"/>
</scene> </scene>
Expand Down
16 changes: 14 additions & 2 deletions WatchShaker WatchKit Extension/InterfaceController.swift
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class InterfaceController: WKInterfaceController {


var shaker:WatchShaker = WatchShaker(shakeSensibility: .shakeSensibilityNormal, delay: 0.2) var shaker:WatchShaker = WatchShaker(shakeSensibility: .shakeSensibilityNormal, delay: 0.2)


@IBOutlet var infoLabel: WKInterfaceLabel!
override func willActivate() { override func willActivate() {


super.willActivate() super.willActivate()
Expand All @@ -33,15 +34,26 @@ class InterfaceController: WKInterfaceController {


} }


func printInfo(_ string:String) {
self.infoLabel.setText(string)
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
self.infoLabel.setText("")
}
}

} }


extension InterfaceController: WatchShakerDelegate extension InterfaceController: WatchShakerDelegate
{ {
func watchShakerDidShake(_ watchShaker: WatchShaker) { func watchShaker(_ watchShaker: WatchShaker, didShakeWith sensibility: ShakeSensibility) {
print("YOU HAVE SHAKEN YOUR ⌚️⌚️⌚️") let message = "YOU HAVE SHAKEN YOUR ⌚️⌚️⌚️"
print(message)
printInfo(message)

} }


func watchShaker(_ watchShaker: WatchShaker, didFailWith error: Error) { func watchShaker(_ watchShaker: WatchShaker, didFailWith error: Error) {
print(error.localizedDescription) print(error.localizedDescription)
printInfo(error.localizedDescription)
} }
} }
45 changes: 36 additions & 9 deletions WatchShaker.xcodeproj/project.pbxproj
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastSwiftUpdateCheck = 0810; LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0810; LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Ezequiel França @ezefranca"; ORGANIZATIONNAME = "Ezequiel França @ezefranca";
TargetAttributes = { TargetAttributes = {
8B2227831DFB90E100C09475 = { 8B2227831DFB90E100C09475 = {
Expand All @@ -278,17 +278,20 @@
8B2227971DFB90E200C09475 = { 8B2227971DFB90E200C09475 = {
CreatedOnToolsVersion = 8.1; CreatedOnToolsVersion = 8.1;
DevelopmentTeam = 54JDK55DR5; DevelopmentTeam = 54JDK55DR5;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
TestTargetID = 8B2227831DFB90E100C09475; TestTargetID = 8B2227831DFB90E100C09475;
}; };
8B2227A01DFB90E200C09475 = { 8B2227A01DFB90E200C09475 = {
CreatedOnToolsVersion = 8.1; CreatedOnToolsVersion = 8.1;
DevelopmentTeam = 54JDK55DR5; DevelopmentTeam = 54JDK55DR5;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
8B2227AF1DFB90E200C09475 = { 8B2227AF1DFB90E200C09475 = {
CreatedOnToolsVersion = 8.1; CreatedOnToolsVersion = 8.1;
DevelopmentTeam = 54JDK55DR5; DevelopmentTeam = 54JDK55DR5;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic; ProvisioningStyle = Automatic;
}; };
}; };
Expand Down Expand Up @@ -436,15 +439,24 @@
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -485,15 +497,24 @@
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = 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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -529,7 +550,8 @@
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.1; WATCHOS_DEPLOYMENT_TARGET = 3.1;
}; };
Expand All @@ -546,7 +568,8 @@
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.1; WATCHOS_DEPLOYMENT_TARGET = 3.1;
}; };
Expand All @@ -564,7 +587,8 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.1; WATCHOS_DEPLOYMENT_TARGET = 3.1;
}; };
Expand All @@ -582,7 +606,8 @@
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos; SDKROOT = watchos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 4; TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 3.1; WATCHOS_DEPLOYMENT_TARGET = 3.1;
}; };
Expand All @@ -597,7 +622,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShaker; PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShaker;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 4.0;
}; };
name = Debug; name = Debug;
}; };
Expand All @@ -610,7 +635,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShaker; PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShaker;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_VERSION = 4.0;
}; };
name = Release; name = Release;
}; };
Expand All @@ -624,7 +649,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShakerTests; PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShakerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchShaker.app/WatchShaker"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchShaker.app/WatchShaker";
}; };
name = Debug; name = Debug;
Expand All @@ -639,7 +665,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShakerTests; PRODUCT_BUNDLE_IDENTIFIER = com.ezefranca.WatchShakerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0; SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchShaker.app/WatchShaker"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/WatchShaker.app/WatchShaker";
}; };
name = Release; name = Release;
Expand Down

0 comments on commit 284a6ac

Please sign in to comment.