From 5269932678da8b51d9c06ae23c7f786578df48b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garci=CC=81a?= Date: Sat, 21 May 2016 17:05:14 +0200 Subject: [PATCH] Fix spelling and reactivate access to preferences panel Related to Pull Request: https://github.com/ReactiveX/RxSwift/pull/623/files --- .../GeolocationExample/GeolocationViewController.swift | 5 ++--- RxExample/RxExample/Services/GeolocationService.swift | 4 ++-- RxExample/RxExample/iOS/RootViewController.swift | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) 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