Merge pull request #18 from YuanLiou/bugfix/map_migrate

fix: fix the google map version to play services edition.
YuanLiou · Dec 4, 2021 · 844a406 · 844a406
2 parents 20a6912 + af6261c
commit 844a406
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 28 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -112,11 +112,8 @@ dependencies {
     implementation project(":core")
     implementation project(":anchor-bottom-sheet-behavior")
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-    // FIXME:: map 3.1.0 use volley 1.1.0 which is not available on mavenCentral and google
-    //  so we include it explicitly
-    implementation 'com.google.maps.android:maps-v3-ktx:3.1.0'
-    implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
-    implementation 'com.android.volley:volley:1.2.0'
+    implementation 'com.google.android.gms:play-services-maps:18.0.0'
+    implementation "com.google.android.gms:play-services-location:${gms_version}"
     // ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ==== ====
 
     implementation platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.1")

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/details/DetailsFragment.kt b/app/src/main/java/tw/com/louis383/coffeefinder/details/DetailsFragment.kt
@@ -12,7 +12,7 @@ import android.widget.TextView
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import dagger.hilt.android.AndroidEntryPoint
 import tw.com.louis383.coffeefinder.R
 import tw.com.louis383.coffeefinder.core.CurrentLocationCarrier

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/mainpage/MainActivity.kt b/app/src/main/java/tw/com/louis383/coffeefinder/mainpage/MainActivity.kt
@@ -26,7 +26,7 @@ import androidx.core.splashscreen.SplashScreenViewProvider
 import androidx.lifecycle.LifecycleOwner
 import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.common.api.ResolvableApiException
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/mainpage/MainView.kt b/app/src/main/java/tw/com/louis383/coffeefinder/mainpage/MainView.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import androidx.annotation.StringRes
 import androidx.viewpager.widget.ViewPager
 import com.google.android.gms.common.api.ResolvableApiException
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import com.trafi.anchorbottomsheetbehavior.AnchorBottomSheetBehavior
 import tw.com.louis383.coffeefinder.BaseView
 import tw.com.louis383.coffeefinder.core.domain.model.CoffeeShop

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsFragment.kt b/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsFragment.kt
@@ -10,14 +10,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.LifecycleOwner
-import com.google.android.libraries.maps.CameraUpdateFactory
-import com.google.android.libraries.maps.GoogleMap
-import com.google.android.libraries.maps.MapView
-import com.google.android.libraries.maps.OnMapReadyCallback
-import com.google.android.libraries.maps.model.BitmapDescriptor
-import com.google.android.libraries.maps.model.LatLng
-import com.google.android.libraries.maps.model.Marker
-import com.google.android.libraries.maps.model.MarkerOptions
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.MapView
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
+import com.google.android.gms.maps.model.MarkerOptions
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import tw.com.louis383.coffeefinder.BaseFragment

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsPresenter.kt b/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsPresenter.kt
@@ -2,11 +2,11 @@ package tw.com.louis383.coffeefinder.maps
 
 import android.graphics.Bitmap
 import android.graphics.Canvas
-import com.google.android.libraries.maps.GoogleMap
-import com.google.android.libraries.maps.model.BitmapDescriptor
-import com.google.android.libraries.maps.model.BitmapDescriptorFactory
-import com.google.android.libraries.maps.model.LatLng
-import com.google.android.libraries.maps.model.Marker
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
 import dagger.hilt.android.scopes.FragmentScoped
 import tw.com.louis383.coffeefinder.BasePresenter
 import tw.com.louis383.coffeefinder.R

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsView.kt b/app/src/main/java/tw/com/louis383/coffeefinder/maps/MapsView.kt
@@ -2,9 +2,9 @@ package tw.com.louis383.coffeefinder.maps
 
 import android.graphics.drawable.Drawable
 import androidx.annotation.DrawableRes
-import com.google.android.libraries.maps.model.BitmapDescriptor
-import com.google.android.libraries.maps.model.LatLng
-import com.google.android.libraries.maps.model.Marker
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
 import tw.com.louis383.coffeefinder.BaseView
 import tw.com.louis383.coffeefinder.core.domain.model.CoffeeShop
 

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/uimodel/CoffeeShopUiModel.kt b/app/src/main/java/tw/com/louis383/coffeefinder/uimodel/CoffeeShopUiModel.kt
@@ -3,7 +3,7 @@ package tw.com.louis383.coffeefinder.uimodel
 import android.content.Context
 import android.net.Uri
 import android.text.TextUtils
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import tw.com.louis383.coffeefinder.R
 import tw.com.louis383.coffeefinder.core.domain.model.CoffeeShop
 import tw.com.louis383.coffeefinder.utils.toMapLocation

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/utils/Extensions.kt b/app/src/main/java/tw/com/louis383/coffeefinder/utils/Extensions.kt
@@ -4,7 +4,7 @@ import android.app.Activity
 import android.location.Location
 import android.view.View
 import androidx.annotation.IdRes
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import tw.com.louis383.coffeefinder.core.domain.model.MapLocation
 
 fun <T: View> Activity.bindView(@IdRes resId: Int): Lazy<T> = lazy {

diff --git a/app/src/main/java/tw/com/louis383/coffeefinder/view/CoffeeListAdapter.kt b/app/src/main/java/tw/com/louis383/coffeefinder/view/CoffeeListAdapter.kt
@@ -9,7 +9,7 @@ import android.widget.RatingBar
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.libraries.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLng
 import tw.com.louis383.coffeefinder.R
 import tw.com.louis383.coffeefinder.core.domain.model.CoffeeShop
 import tw.com.louis383.coffeefinder.list.ListAdapterHandler

diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
@@ -1,4 +1,4 @@
-<com.google.android.libraries.maps.MapView
+<com.google.android.gms.maps.MapView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/map_view"