Merge pull request #15 from Fueled/reactive-swift-update

Reactive swift update

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "Carthage/Checkouts/Result"]
 	path = Carthage/Checkouts/Result
-	url = ssh://git@github.com/antitypical/Result.git
+	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/ReactiveCocoa"]
 	path = Carthage/Checkouts/ReactiveCocoa
-	url = ssh://git@github.com/ReactiveCocoa/ReactiveCocoa.git
+	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
 [submodule "Carthage/Checkouts/ReactiveSwift"]
 	path = Carthage/Checkouts/ReactiveSwift
-	url = ssh://git@github.com/ReactiveCocoa/ReactiveSwift.git
+	url = https://github.com/ReactiveCocoa/ReactiveSwift.git

Cartfile

@@ -1 +1 @@
-github "ReactiveCocoa/ReactiveCocoa"
+github "ReactiveCocoa/ReactiveCocoa" ~> 7.0

Cartfile.resolved

@@ -1,3 +1,3 @@
-github "ReactiveCocoa/ReactiveCocoa" "6.0.1"
-github "ReactiveCocoa/ReactiveSwift" "2.0.1"
-github "antitypical/Result" "3.2.3"
+github "ReactiveCocoa/ReactiveCocoa" "7.0.0"
+github "ReactiveCocoa/ReactiveSwift" "3.0.0"
+github "antitypical/Result" "3.2.4"

FueledUtils/DecoratingTextFieldDelegate.swift

@@ -64,16 +64,15 @@ public final class DecoratingTextFieldDelegate: NSObject {
 	/// `patternForDataString`.
 	public func decorateString(_ dataString: String) -> String {
 		var res = ""
-		let dataChars = dataString.characters
-		var dataIndex = dataChars.startIndex
+		var dataIndex = dataString.startIndex
 		let pattern = self.patternForDataString(dataString)
-		for patternChar in pattern.characters {
+		for patternChar in pattern {
 			if patternChar == patternPlaceholderForDataCharacter {
-				if dataIndex == dataChars.endIndex {
+				if dataIndex == dataString.endIndex {
 					return res
 				}
-				res += String(dataChars[dataIndex])
-				dataIndex = dataChars.index(after: dataIndex)
+				res += String(dataString[dataIndex])
+				dataIndex = dataString.index(after: dataIndex)
 			} else {
 				res += String(patternChar)
 			}
@@ -84,7 +83,7 @@ public final class DecoratingTextFieldDelegate: NSObject {
 	/// Strips formatting (decoration) characters from the input string.
 	public func undecorateString(_ decoratedString: String) -> String {
 		var res = ""
-		for decoChar in decoratedString.characters {
+		for decoChar in decoratedString {
 			if isDataCharacter(decoChar) {
 				res += String(decoChar)
 			}
@@ -106,7 +105,7 @@ public final class DecoratingTextFieldDelegate: NSObject {
 		}
 		var res = 0
 		var prefixLength = dataLocation
-		for decoChar in decoratedString.characters {
+		for decoChar in decoratedString {
 			let characterLength = String(decoChar).nsLength
 			if isDataCharacter(decoChar) {
 				if prefixLength <= 0 {

FueledUtils/RACExtensions.swift

@@ -56,13 +56,13 @@ public extension SignalProtocol {
 	will result in all changes to `constraintConstantValue` in `viewModel` to be reflected in the constraint and animated.
 	*/
 	public func observe(context: @escaping (@escaping () -> Void) -> Void) -> Signal<Value, Error> {
-		return Signal { observer in
-			return self.signal.observe { event in
+		return Signal { observer, disposable in
+			disposable += self.signal.observe { event in
 				switch event {
 				case .value:
-					context({ observer.action(event) })
+					context({ observer.send(event) })
 				default:
-					observer.action(event)
+					observer.send(event)
 				}
 			}
 		}
@@ -109,14 +109,13 @@ public extension SignalProtocol {
 	///            `interval` seconds apart.
 	///
 	func minimum(interval: TimeInterval, on scheduler: DateScheduler) -> Signal<Value, Error> {
-		return Signal { observer in
+		return Signal { observer, disposable in
 			let semaphore = DispatchSemaphore(value: 1)
 			var events: [Signal<Value, Error>.Event] = []
 			var forwardEvents = false
-			let disposable = CompositeDisposable()
 			func sendEvents() {
 				semaphore.wait()
-				events.forEach { observer.action($0) }
+				events.forEach { observer.send($0) }
 				events.removeAll()
 				forwardEvents = true
 				semaphore.signal()
@@ -127,18 +126,17 @@ public extension SignalProtocol {
 			disposable += self.signal.observe { event in
 				if case .interrupted = event {
 					sendEvents()
-					observer.action(event)
+					observer.send(event)
 					return
 				}
 				if forwardEvents {
-					observer.action(event)
+					observer.send(event)
 				} else {
 					semaphore.wait()
 					events.append(event)
 					semaphore.signal()
 				}
 			}
-			return disposable
 		}
 	}
 }

FueledUtils/SetRootViewController.swift

@@ -12,6 +12,7 @@ public extension UIApplicationDelegate {
 				animations: {
 					UIView.setAnimationsEnabled(false)
 					window.endEditing(true)
+
 					window.rootViewController = viewController
 					window.layoutIfNeeded()
 					UIView.setAnimationsEnabled(true)

FueledUtils/SignalingAlert.swift

@@ -21,7 +21,7 @@ public final class SignalingAlert<T> {
 
 	public func addAction(title: String, style: UIAlertActionStyle, event: Signal<T, NoError>.Event) {
 		controller.addAction(UIAlertAction(title: title, style: style) { [observer] _ in
-			observer.action(event)
+			observer.send(event)
 		})
 	}