stringcode86 · stringcode86 · Nov 26, 2018 · Oct 3, 2016 · Oct 3, 2016 · Oct 3, 2016
diff --git a/Podyfied/SnowGlobe/.swift-version b/Podyfied/SnowGlobe/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/SnowGlobe.podspec → Podyfied/SnowGlobe/SnowGlobe.podspec b/SnowGlobe.podspec → Podyfied/SnowGlobe/SnowGlobe.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "SnowGlobe"
-  s.version          = "2.0.8"
+  s.version          = "2.1.3"
   s.summary          = "Delightful / cheesy Christmas easter egg to. Shake iPhone to snow"
 
 # This description is used to generate tags and improve search results.
@@ -34,9 +34,5 @@ DESC
   s.resource_bundles = {
     'SnowGlobe' => ['Podyfied/SnowGlobe/Pod/Assets/*.*', 'Pod/Assets/*.*']
   }
-
-  # s.public_header_files = 'Pod/Classes/**/*.h'
-  # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
 end
 
diff --git a/SnowGlobe/SnowGlobe.xcodeproj/project.pbxproj b/SnowGlobe/SnowGlobe.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		9FDC70E11A2FBFDC0033F371 /* Numbers+Extentios.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FDC70DB1A2FBFDC0033F371 /* Numbers+Extentios.swift */; };
 		9FDC70E21A2FBFDC0033F371 /* SleighBells.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 9FDC70DC1A2FBFDC0033F371 /* SleighBells.mp3 */; };
 		9FDC70E31A2FBFDC0033F371 /* SnowGlobeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FDC70DD1A2FBFDC0033F371 /* SnowGlobeView.swift */; };
+		A774FBD61FB32DD000D08796 /* SnowGlobeSensitivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A774FBD51FB32DD000D08796 /* SnowGlobeSensitivity.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -41,6 +42,7 @@
 		9FDC70DB1A2FBFDC0033F371 /* Numbers+Extentios.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Numbers+Extentios.swift"; sourceTree = "<group>"; };
 		9FDC70DC1A2FBFDC0033F371 /* SleighBells.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = SleighBells.mp3; sourceTree = "<group>"; };
 		9FDC70DD1A2FBFDC0033F371 /* SnowGlobeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnowGlobeView.swift; sourceTree = "<group>"; };
+		A774FBD51FB32DD000D08796 /* SnowGlobeSensitivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnowGlobeSensitivity.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -85,6 +87,7 @@
 			children = (
 				9FDC70C11A2FBFAB0033F371 /* SnowGlobe.h */,
 				9FDC70DD1A2FBFDC0033F371 /* SnowGlobeView.swift */,
+				A774FBD51FB32DD000D08796 /* SnowGlobeSensitivity.swift */,
 				9FDC70D81A2FBFDC0033F371 /* CMMotionManager+shared.swift */,
 				9FDC70DB1A2FBFDC0033F371 /* Numbers+Extentios.swift */,
 				9FDC70E41A2FBFE70033F371 /* Resources */,
@@ -242,6 +245,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A774FBD61FB32DD000D08796 /* SnowGlobeSensitivity.swift in Sources */,
 				9FDC70E11A2FBFDC0033F371 /* Numbers+Extentios.swift in Sources */,
 				9FDC70DE1A2FBFDC0033F371 /* CMMotionManager+shared.swift in Sources */,
 				9FDC70E31A2FBFDC0033F371 /* SnowGlobeView.swift in Sources */,
@@ -311,6 +315,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -353,6 +358,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -376,7 +382,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -395,7 +401,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/SnowGlobe/SnowGlobe/SnowGlobeSensitivity.swift b/SnowGlobe/SnowGlobe/SnowGlobeSensitivity.swift
@@ -0,0 +1,36 @@
+//
+//  SnowGlobeSensitivity.swift
+//  SnowGlobe
+//
+//  Created by Jan Dammshäuser on 08.11.17.
+//  Copyright © 2017 stringCode. All rights reserved.
+//
+
+import Foundation
+
+/// The SnowGlobeSensitivity defines how hard you have to shake the device in order to make it snow.
+///
+/// - ultraLow: 1.7
+/// - low: 2
+/// - medium: 3 (default)
+/// - high: 4
+/// - custom: enter your own sensitivity value. Has to be positive.
+public enum SnowGlobeSensitivity {
+    case ultraLow, low, medium, high
+    case custom(Double)
+
+    fileprivate var value: Double {
+        switch self {
+        case .ultraLow: return 1.7
+        case .low: return 2
+        case .medium: return 3
+        case .high: return 4
+        case let .custom(sensitivity) where sensitivity > 0: return sensitivity
+        case .custom: return 0
+        }
+    }
+}
+
+func >=(lhs: Double, rhs: SnowGlobeSensitivity) -> Bool {
+    return lhs >= rhs.value
+}
diff --git a/SnowGlobe/SnowGlobe/SnowGlobeView.swift b/SnowGlobe/SnowGlobe/SnowGlobeView.swift
@@ -65,6 +65,8 @@ open class SnowGlobeView: UIView {
 
     open var soundEffectsEnabled: Bool = true
 
+    open var sensitivity: SnowGlobeSensitivity = .medium
+
     /// default ligth snow flake image
     open class func lightSnowFlakeImage() -> (UIImage?) {
         if let image = UIImage(named: "flake") {
@@ -154,11 +156,11 @@ open class SnowGlobeView: UIView {
 
     fileprivate func initialSetup() {
         backgroundColor = UIColor.clear
-        autoresizingMask = [UIViewAutoresizing.flexibleWidth, UIViewAutoresizing.flexibleHeight]
+        autoresizingMask = [UIView.AutoresizingMask.flexibleWidth, UIView.AutoresizingMask.flexibleHeight]
         isUserInteractionEnabled = false
         emitter.emitterCells = [emitterCell]
-        emitter.emitterShape = kCAEmitterLayerLine
-        emitter.renderMode = kCAEmitterLayerOldestLast
+        emitter.emitterShape = .line
+        emitter.renderMode = .oldestLast
         emitter.lifetime = 0
     }
 
@@ -170,9 +172,9 @@ open class SnowGlobeView: UIView {
         }
         motionManager.startAccelerometerUpdates(to: queue) { [weak self] accelerometerData, error in
             let data = accelerometerData!.acceleration
-            var magnitude = sqrt( sq(data.x) + sq(data.y) + sq(data.z) )
-            magnitude = (magnitude < 3.0) ? 0.0 : magnitude
-            if (magnitude == 0.0 && self?.isAnimating == false) {
+            let sensitivity = self?.sensitivity ?? .medium
+            let magnitude = sqrt( sq(data.x) + sq(data.y) + sq(data.z) )
+            if (magnitude >= sensitivity && self?.isAnimating == false) {
                 return
             }
             if let welf = self {

diff --git a/SnowGlobe/SnowGlobeTests/SnowGlobeTests.swift b/SnowGlobe/SnowGlobeTests/SnowGlobeTests.swift
@@ -28,7 +28,7 @@ class SnowGlobeTests: XCTestCase {
 
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
             // Put the code you want to measure the time of here.
         }
     }

diff --git a/SwiftSample/SwiftSample.xcodeproj/project.pbxproj b/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
@@ -456,7 +456,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -474,7 +474,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -491,7 +491,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftSample.app/SwiftSample";
 			};
 			name = Debug;
@@ -505,7 +505,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "uk.co.stringCode.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftSample.app/SwiftSample";
 			};
 			name = Release;