update maps to 4.3.2

upgrade sdkVersion

android-configs/common-config.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'kotlin-android'
 
 rootProject.ext {
-    compileSdk = 29
+    compileSdk = 31
 
     minSdk = 21
-    targetSdk = 29
+    targetSdk = 31
 }
 
 android {

android-plugins/src/main/kotlin/plugins/lib-settings.gradle.kts

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion(29)
+    compileSdkVersion(31)
 
     defaultConfig {
         minSdkVersion(21)
-        targetSdkVersion(29)
+        targetSdkVersion(31)
     }
 
     compileOptions {

base-map/src/main/java/ru/touchin/basemap/AbstractMapManager.kt

@@ -46,7 +46,7 @@ abstract class AbstractMapManager<TMapView : View, TMap : Any, TLocation : Any>(
         this.mapListener = mapListener
     }
 
-    open fun onCreate(savedInstanceState: Bundle) = Unit
+    open fun onCreate(savedInstanceState: Bundle?) = Unit
 
     open fun onDestroy() = Unit
 
@@ -67,6 +67,8 @@ abstract class AbstractMapManager<TMapView : View, TMap : Any, TLocation : Any>(
         this.mapListener?.onMapInitialized(map)
     }
 
+    fun isMapInitialized(): Boolean = this::map.isInitialized
+
     interface AbstractMapListener<TMapView, TMap, TLocation> {
 
         fun onMapInitialized(map: TMap)

build.gradle

@@ -17,7 +17,7 @@ allprojects {
         google()
         jcenter()
         maven {
-            url "https://dl.bintray.com/touchin/touchin-tools"
+            url "https://maven.dev.touchin.ru"
             metadataSources {
                 artifact()
             }

google-map/src/main/java/ru/touchin/googlemap/GoogleMapManager.kt

@@ -8,6 +8,7 @@ import com.google.android.gms.maps.MapView
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
+import com.google.android.gms.maps.model.VisibleRegion
 import ru.touchin.basemap.AbstractMapManager
 
 @Suppress("detekt.TooManyFunctions")
@@ -29,7 +30,7 @@ class GoogleMapManager(mapView: MapView) : AbstractMapManager<MapView, GoogleMap
         }
     }
 
-    override fun onCreate(savedInstanceState: Bundle) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         mapView.onCreate(savedInstanceState)
     }
@@ -77,10 +78,16 @@ class GoogleMapManager(mapView: MapView) : AbstractMapManager<MapView, GoogleMap
 
     override fun getCameraTilt(): Float = map.cameraPosition.tilt
 
+    fun getVisibleRegion(): VisibleRegion = map.projection.visibleRegion
+
     override fun moveCamera(target: LatLng, zoom: Float, azimuth: Float, tilt: Float) {
         map.moveCamera(CameraUpdateFactory.newCameraPosition(buildCameraPosition(target, zoom, azimuth, tilt)))
     }
 
+    fun moveCamera(target: LatLng, userRegionZoom: Float) {
+        map.animateCamera(CameraUpdateFactory.newLatLngZoom(target, userRegionZoom))
+    }
+
     override fun smoothMoveCamera(target: LatLng, zoom: Float, azimuth: Float, tilt: Float) {
         map.animateCamera(CameraUpdateFactory.newCameraPosition(buildCameraPosition(target, zoom, azimuth, tilt)))
     }

utils/src/main/java/ru/touchin/defaults/DefaultActivityLifecycleCallbacks.kt

@@ -14,7 +14,7 @@ open class DefaultActivityLifecycleCallbacks : Application.ActivityLifecycleCall
 
     override fun onActivityDestroyed(activity: Activity) = Unit
 
-    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) = Unit
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
 
     override fun onActivityStopped(activity: Activity) = Unit
 

yandex-map/build.gradle

@@ -5,12 +5,12 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
 
-    implementation "com.yandex.android:mapkit"
+    implementation "com.yandex.android:maps.mobile"
 
     constraints {
-        implementation("com.yandex.android:mapkit") {
+        implementation("com.yandex.android:maps.mobile") {
             version {
-                require '3.4.0'
+                require '4.3.2-lite'
             }
         }
     }

yandex-map/src/main/java/ru/touchin/yandexmap/YandexMapManager.kt

@@ -10,18 +10,20 @@ import com.yandex.mapkit.geometry.Point
 import com.yandex.mapkit.layers.ObjectEvent
 import com.yandex.mapkit.map.CameraListener
 import com.yandex.mapkit.map.CameraPosition
-import com.yandex.mapkit.map.CameraUpdateSource
+import com.yandex.mapkit.map.CameraUpdateReason
 import com.yandex.mapkit.map.InputListener
 import com.yandex.mapkit.map.Map
 import com.yandex.mapkit.map.MapLoadStatistics
 import com.yandex.mapkit.map.MapLoadedListener
+import com.yandex.mapkit.map.MapObjectCollection
+import com.yandex.mapkit.map.VisibleRegion
 import com.yandex.mapkit.mapview.MapView
 import com.yandex.mapkit.user_location.UserLocationObjectListener
 import com.yandex.mapkit.user_location.UserLocationView
 import com.yandex.runtime.image.ImageProvider
 import ru.touchin.basemap.AbstractMapManager
 
-@Suppress("detekt.TooManyFunctions")
+@Suppress("detekt.TooManyFunctions", "detekt.UnusedPrivateMember")
 class YandexMapManager(
         mapView: MapView,
         private val isDebug: Boolean = false
@@ -57,7 +59,6 @@ class YandexMapManager(
 
     override fun initMap(map: Map) {
         super.initMap(map)
-        map.isDebugInfoEnabled = isDebug
         map.setMapLoadedListener(this)
         map.addCameraListener(this)
         map.addInputListener(this)
@@ -79,7 +80,7 @@ class YandexMapManager(
         mapListener?.onMapLoaded()
     }
 
-    override fun onCameraPositionChanged(map: Map, cameraPosition: CameraPosition, cameraUpdateSource: CameraUpdateSource, finished: Boolean) {
+    override fun onCameraPositionChanged(map: Map, cameraPosition: CameraPosition, cameraUpdateSource: CameraUpdateReason, finished: Boolean) {
         mapListener?.onCameraMoved(finished)
     }
 
@@ -91,6 +92,8 @@ class YandexMapManager(
         mapListener?.onMapTap(point)
     }
 
+    fun getCameraPosition(): CameraPosition = map.cameraPosition
+
     override fun getCameraTarget(): Point = map.cameraPosition.target
 
     override fun getCameraZoom(): Float = map.cameraPosition.zoom
@@ -99,6 +102,10 @@ class YandexMapManager(
 
     override fun getCameraTilt(): Float = map.cameraPosition.tilt
 
+    fun moveCamera(target: CameraPosition) {
+        map.move(target)
+    }
+
     override fun moveCamera(target: Point, zoom: Float, azimuth: Float, tilt: Float) {
         map.move(CameraPosition(target, zoom, azimuth, tilt), Animation(Animation.Type.LINEAR, CAMERA_ANIMATION_DURATION), null)
     }
@@ -152,9 +159,9 @@ class YandexMapManager(
         userLocationAccuracyCirceColor = accuracyCircleColor
     }
 
-    fun getVisibleRegion() = map.visibleRegion
+    fun getVisibleRegion(): VisibleRegion = map.visibleRegion
 
-    fun getMapObjects() = map.mapObjects
+    fun getMapObjects(): MapObjectCollection = map.mapObjects
 
     interface MapListener : AbstractMapListener<MapView, Map, Point>