Make isAvailable a regular fun (#105)

Solves #101
jordond · Dec 19, 2024 · 0b45d81 · 0b45d81
1 parent 53cd303
commit 0b45d81
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/compass-geolocation/api/android/compass-geolocation.api b/compass-geolocation/api/android/compass-geolocation.api
@@ -10,7 +10,7 @@ public abstract interface class dev/jordond/compass/geolocation/Geolocator {
 	public abstract fun current (Ldev/jordond/compass/Priority;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getLocationUpdates ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getTrackingStatus ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun isAvailable (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun isAvailable ()Z
 	public abstract fun startTracking (Ldev/jordond/compass/geolocation/LocationRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopTracking ()V
 	public abstract fun track (Ldev/jordond/compass/geolocation/LocationRequest;)Lkotlinx/coroutines/flow/Flow;

diff --git a/compass-geolocation/api/jvm/compass-geolocation.api b/compass-geolocation/api/jvm/compass-geolocation.api
@@ -10,7 +10,7 @@ public abstract interface class dev/jordond/compass/geolocation/Geolocator {
 	public abstract fun current (Ldev/jordond/compass/Priority;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun getLocationUpdates ()Lkotlinx/coroutines/flow/Flow;
 	public abstract fun getTrackingStatus ()Lkotlinx/coroutines/flow/Flow;
-	public abstract fun isAvailable (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun isAvailable ()Z
 	public abstract fun startTracking (Ldev/jordond/compass/geolocation/LocationRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public abstract fun stopTracking ()V
 	public abstract fun track (Ldev/jordond/compass/geolocation/LocationRequest;)Lkotlinx/coroutines/flow/Flow;

diff --git a/compass-geolocation/src/commonMain/kotlin/dev/jordond/compass/geolocation/Geolocator.kt b/compass-geolocation/src/commonMain/kotlin/dev/jordond/compass/geolocation/Geolocator.kt
@@ -46,7 +46,7 @@ public interface Geolocator {
      *
      * @return `true` if location services are available, `false` otherwise.
      */
-    public suspend fun isAvailable(): Boolean
+    public fun isAvailable(): Boolean
 
     /**
      * Get the current location.

diff --git a/...ation/src/commonMain/kotlin/dev/jordond/compass/geolocation/internal/DefaultGeolocator.kt b/...ation/src/commonMain/kotlin/dev/jordond/compass/geolocation/internal/DefaultGeolocator.kt
@@ -43,9 +43,7 @@ internal class DefaultGeolocator(
 
     override val trackingStatus: Flow<TrackingStatus> = status
 
-    override suspend fun isAvailable(): Boolean = withContext(dispatcher) {
-        locator.isAvailable()
-    }
+    override fun isAvailable(): Boolean = locator.isAvailable()
 
     override suspend fun current(priority: Priority): GeolocatorResult {
         return handleResult { locator.current(priority) }

diff --git a/demo/composeApp/src/commonMain/kotlin/geolocation/GeolocationModel.kt b/demo/composeApp/src/commonMain/kotlin/geolocation/GeolocationModel.kt
@@ -17,10 +17,8 @@ import kotlinx.coroutines.launch
 class GeolocationModel(private val geolocator: Geolocator) : StateScreenModel<State>(State()) {
 
     init {
-        screenModelScope.launch {
-            val isAvailable = geolocator.isAvailable()
-            updateState { it.copy(locationServiceAvailable = isAvailable) }
-        }
+        val isAvailable = geolocator.isAvailable()
+        updateState { it.copy(locationServiceAvailable = isAvailable) }
 
         geolocator.trackingStatus
             .onEach { status ->