refactoring

Author: swiftuiux

Sources/d3-async-location/LocationManagerAsync.swift

@@ -18,7 +18,7 @@ public final class LocationManagerAsync: NSObject, CLLocationManagerDelegate{
         get throws {
             try checkStatus()
             return AsyncStream(CLLocation.self) { continuation in
-                start(with: continuation)
+                streaming(with: continuation)
             }
         }
     }
@@ -67,7 +67,33 @@ public final class LocationManagerAsync: NSObject, CLLocationManagerDelegate{
 
     }
 
-    // MARK: - API
+    // MARK: - API    
+    
+    /// Check status and get stream of async data
+    public var start : AsyncStream<CLLocation>?{
+        get async throws {
+            if await getStatus{
+                return try locations
+            }
+            throw LocationManagerErrors.accessIsNotAuthorized
+        }
+    }
+    
+    /// Stop updating
+    public func stop(){
+        stream = nil
+        manager.stopUpdatingLocation()
+    }
+    
+    // MARK: - Private
+    
+    /// Get status
+    private var getStatus: Bool{
+        get async{
+            let isAuthorized = await requestPermission()
+            return check(status: isAuthorized)
+        }
+    }
 
     /// Request permission
     /// Don't forget to add in Info "Privacy - Location When In Use Usage Description" something like "Show list of locations"
@@ -84,14 +110,6 @@ public final class LocationManagerAsync: NSObject, CLLocationManagerDelegate{
 
     }
 
-    /// Stop updating
-    public func stop(){
-        stream = nil
-        manager.stopUpdatingLocation()
-    }
-    
-    // MARK: - Private
-    
     /// Set manager's properties
     /// - Parameter accuracy: Desired accuracy
     private func updateSettings(accuracy : CLLocationAccuracy?){
@@ -100,7 +118,7 @@ public final class LocationManagerAsync: NSObject, CLLocationManagerDelegate{
     }
 
     /// Start updating
-    private func start(with continuation : StreamType){
+    private func streaming(with continuation : StreamType){
         stream = continuation
         manager.startUpdatingLocation()
     }
@@ -119,6 +137,10 @@ public final class LocationManagerAsync: NSObject, CLLocationManagerDelegate{
         }
     }
 
+    private func check(status : CLAuthorizationStatus) -> Bool{
+        [CLAuthorizationStatus.authorizedWhenInUse, .authorizedAlways].contains(status)
+    }
+    
     // MARK: - Delegate
 
     /// Pass locations into the async stream

Sources/d3-async-location/viewmodel/LMViewModel.swift

@@ -21,25 +21,8 @@ public final class LMViewModel: ILocationManagerViewModel{
 
     /// Async locations manager
     private let manager : LocationManagerAsync
-    
-    /// Check status and get stream of async data
-    private var getStream : AsyncStream<CLLocation>?{
-        get async throws {
-            if await getStatus{
-                return try manager.locations
-            }
-            throw LocationManagerErrors.accessIsNotAuthorized
-        }
-    }
-    
-    /// Get status
-    private var getStatus: Bool{
-        get async{
-            let isAuthorized = await manager.requestPermission()
-            return check(status: isAuthorized)
-        }
-    }
-    
+
+        
     // MARK: - Life circle
 
     public init(accuracy : CLLocationAccuracy? = nil){
@@ -57,7 +40,7 @@ public final class LMViewModel: ILocationManagerViewModel{
 
     /// Start streaming locations
     public func start() async throws{
-            if let stream = try await getStream{
+        if let stream = try await manager.start{
                 for await coordinate in stream{
                     await update(coordinate: coordinate)
                 }
@@ -76,9 +59,5 @@ public final class LMViewModel: ILocationManagerViewModel{
     private func update(coordinate : CLLocation) {
         locations.append(coordinate)
     }
-    
-    private func check(status : CLAuthorizationStatus) -> Bool{
-        [CLAuthorizationStatus.authorizedWhenInUse, .authorizedAlways].contains(status)
-    }
 
 }