diff --git a/Documentation/Units.md b/Documentation/Units.md index ccf273e5..77dd5976 100644 --- a/Documentation/Units.md +++ b/Documentation/Units.md @@ -71,7 +71,7 @@ Rx units define operations by using corresponding observable sequence operations The `map` operation on `Driver` is defined using the `map` operation on its observable sequence. ```swift -let d: Driver = Drive.just(11) +let d: Driver = Driver.just(11) driver.map { $0 / 0.5 } = ... ``` diff --git a/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift b/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift index e3f8598f..398abac4 100644 --- a/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift +++ b/Rx.playground/Pages/Mathematical_and_Aggregate_Operators.xcplaygroundpage/Contents.swift @@ -61,6 +61,7 @@ example("concat") { variable.value = subject2 + subject2.onNext("I would be ignored") subject2.onNext("🐱") subject1.onCompleted() diff --git a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift index d12f9393..a7227ca6 100644 --- a/RxCocoa/Common/CocoaUnits/Driver/Driver.swift +++ b/RxCocoa/Common/CocoaUnits/Driver/Driver.swift @@ -187,7 +187,7 @@ extension Driver where Element: SignedIntegerType { /** This method can be used in unit tests to ensure that driver is using mock schedulers instead of - maind schedulers. + main schedulers. **This shouldn't be used in normal release builds.** */ diff --git a/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift b/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift index 06d0189e..996aff56 100644 --- a/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift +++ b/RxExample/RxExample/Examples/GeolocationExample/GeolocationViewController.swift @@ -48,10 +48,10 @@ class GeolocationViewController: ViewController { let geolocationService = GeolocationService.instance - geolocationService.autorized + geolocationService.authorized .drive(noGeolocationView.rx_driveAuthorization) .addDisposableTo(disposeBag) - /* + geolocationService.location .drive(label.rx_driveCoordinates) .addDisposableTo(disposeBag) @@ -67,7 +67,6 @@ class GeolocationViewController: ViewController { self?.openAppPreferences() } .addDisposableTo(disposeBag) - */ } private func openAppPreferences() { diff --git a/RxExample/RxExample/Services/GeolocationService.swift b/RxExample/RxExample/Services/GeolocationService.swift index d94ea8e3..b807b2c9 100644 --- a/RxExample/RxExample/Services/GeolocationService.swift +++ b/RxExample/RxExample/Services/GeolocationService.swift @@ -16,7 +16,7 @@ import CoreLocation class GeolocationService { static let instance = GeolocationService() - private (set) var autorized: Driver + private (set) var authorized: Driver private (set) var location: Driver private let locationManager = CLLocationManager() @@ -26,7 +26,7 @@ class GeolocationService { locationManager.distanceFilter = kCLDistanceFilterNone locationManager.desiredAccuracy = kCLLocationAccuracyBestForNavigation - autorized = Observable.deferred { [weak locationManager] in + authorized = Observable.deferred { [weak locationManager] in let status = CLLocationManager.authorizationStatus() guard let locationManager = locationManager else { return Observable.just(status) diff --git a/RxExample/RxExample/iOS/RootViewController.swift b/RxExample/RxExample/iOS/RootViewController.swift index ecfc20e9..283975c6 100644 --- a/RxExample/RxExample/iOS/RootViewController.swift +++ b/RxExample/RxExample/iOS/RootViewController.swift @@ -23,7 +23,7 @@ public class RootViewController : UITableViewController { DefaultWireframe.sharedInstance MainScheduler.instance let geoService = GeolocationService.instance - geoService.autorized.driveNext { _ in + geoService.authorized.driveNext { _ in }.dispose() geoService.location.driveNext { _ in