diff --git a/app/src/main/java/com/google/places/android/ktx/demo/AutocompleteDemoActivity.kt b/app/src/main/java/com/google/places/android/ktx/demo/AutocompleteDemoActivity.kt index dbf3a05..65a2d8b 100644 --- a/app/src/main/java/com/google/places/android/ktx/demo/AutocompleteDemoActivity.kt +++ b/app/src/main/java/com/google/places/android/ktx/demo/AutocompleteDemoActivity.kt @@ -23,12 +23,10 @@ import com.google.android.libraries.places.ktx.widget.PlaceSelectionError import com.google.android.libraries.places.ktx.widget.PlaceSelectionSuccess import com.google.android.libraries.places.ktx.widget.placeSelectionEvents import com.google.android.libraries.places.widget.AutocompleteSupportFragment -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch class AutocompleteDemoActivity : AppCompatActivity() { - @OptIn(ExperimentalCoroutinesApi::class) override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_autocomplete) diff --git a/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchViewModel.kt b/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchViewModel.kt index fa4e241..fa5008d 100644 --- a/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchViewModel.kt +++ b/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchViewModel.kt @@ -23,18 +23,16 @@ import com.google.android.gms.maps.model.LatLng import com.google.android.libraries.places.api.model.AutocompletePrediction import com.google.android.libraries.places.api.model.LocationBias import com.google.android.libraries.places.api.model.Place +import com.google.android.libraries.places.api.model.PlaceTypes import com.google.android.libraries.places.api.model.RectangularBounds -import com.google.android.libraries.places.api.model.TypeFilter import com.google.android.libraries.places.api.net.PlacesClient import com.google.android.libraries.places.ktx.api.net.awaitFetchPlace import com.google.android.libraries.places.ktx.api.net.awaitFindAutocompletePredictions import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineExceptionHandler -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import java.lang.Exception import javax.inject.Inject @HiltViewModel @@ -46,7 +44,6 @@ class PlacesSearchViewModel @Inject constructor( private var searchJob: Job? = null - @OptIn(ExperimentalCoroutinesApi::class) fun onSearchQueryChanged(query: String) { searchJob?.cancel() @@ -69,7 +66,7 @@ class PlacesSearchViewModel @Inject constructor( val response = placesClient .awaitFindAutocompletePredictions { locationBias = bias - typeFilter = TypeFilter.ESTABLISHMENT + typesFilter = listOf(PlaceTypes.ESTABLISHMENT) this.query = query countries = listOf("US") } @@ -78,7 +75,6 @@ class PlacesSearchViewModel @Inject constructor( } } - @OptIn(ExperimentalCoroutinesApi::class) fun onAutocompletePredictionClicked(prediction: AutocompletePrediction) { val handler = CoroutineExceptionHandler { _, e -> e.printStackTrace() diff --git a/places-ktx/build.gradle b/places-ktx/build.gradle index 7cd38b4..5f4e8f0 100644 --- a/places-ktx/build.gradle +++ b/places-ktx/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation "com.android.volley:volley:1.2.1" implementation 'androidx.multidex:multidex:2.0.1' api "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3" - api "com.google.android.libraries.places:places:3.2.0" + api "com.google.android.libraries.places:places:3.3.0" // Tests testImplementation "androidx.test.ext:junit:1.1.5" diff --git a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/api/net/PlacesClient.kt b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/api/net/PlacesClient.kt index 4739aaa..bc724bd 100644 --- a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/api/net/PlacesClient.kt +++ b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/api/net/PlacesClient.kt @@ -28,7 +28,6 @@ import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRe import com.google.android.libraries.places.api.net.FindCurrentPlaceRequest import com.google.android.libraries.places.api.net.FindCurrentPlaceResponse import com.google.android.libraries.places.api.net.PlacesClient -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.tasks.await /** @@ -36,7 +35,6 @@ import kotlinx.coroutines.tasks.await * * Fetches a photo. If an error occurred, an [ApiException] will be thrown. */ -@ExperimentalCoroutinesApi public suspend fun PlacesClient.awaitFetchPhoto( photoMetadata: PhotoMetadata, actions: FetchPhotoRequest.Builder.() -> Unit = {} @@ -55,7 +53,6 @@ public suspend fun PlacesClient.awaitFetchPhoto( * * Fetches the details of a place. If an error occurred, an [ApiException] will be thrown. */ -@ExperimentalCoroutinesApi public suspend fun PlacesClient.awaitFetchPlace( placeId: String, placeFields: List, @@ -72,7 +69,6 @@ public suspend fun PlacesClient.awaitFetchPlace( * * Fetches autocomplete predictions. If an error occurred, an [ApiException] will be thrown. */ -@ExperimentalCoroutinesApi public suspend fun PlacesClient.awaitFindAutocompletePredictions( actions: FindAutocompletePredictionsRequest.Builder.() -> Unit ): FindAutocompletePredictionsResponse { @@ -94,7 +90,6 @@ public suspend fun PlacesClient.awaitFindAutocompletePredictions( @RequiresPermission( allOf = ["android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_WIFI_STATE"] ) -@ExperimentalCoroutinesApi public suspend fun PlacesClient.awaitFindCurrentPlace( placeFields: List ): FindCurrentPlaceResponse { diff --git a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt index 5f86949..af6739b 100644 --- a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt +++ b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt @@ -18,7 +18,6 @@ import com.google.android.gms.common.api.Status import com.google.android.libraries.places.api.model.Place import com.google.android.libraries.places.widget.AutocompleteSupportFragment import com.google.android.libraries.places.widget.listener.PlaceSelectionListener -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.callbackFlow @@ -29,7 +28,6 @@ public data class PlaceSelectionSuccess(val place: Place) : PlaceSelectionResult public data class PlaceSelectionError(val status: Status) : PlaceSelectionResult() -@ExperimentalCoroutinesApi public fun AutocompleteSupportFragment.placeSelectionEvents() : Flow = callbackFlow { this@placeSelectionEvents.setOnPlaceSelectedListener(object : PlaceSelectionListener {