react-native-google-maps-plus 1.11.0-dev.1 → 1.11.1-dev.1

package/android/gradle.properties

@@ -6,4 +6,4 @@ RNGoogleMapsPlus_ndkVersion=27.1.12297006
 RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.10.0
 RNGoogleMapsPlus_googlePlayServicesMapsVersion=20.0.0
 RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
-RNGoogleMapsPlus_mapsUtilsVersion=3.20.1
+RNGoogleMapsPlus_mapsUtilsVersion=4.0.0

package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -813,6 +813,7 @@ class GoogleMapsViewImpl(
       if (destroyed) return@onUi
       destroyed = true
       lifecycleObserver?.toDestroyedState()
+      lifecycleObserver = null
       markerBuilder.cancelAllJobs()
       clearMarkers()
       clearPolylines()

package/android/src/main/java/com/rngooglemapsplus/MapLifecycleEventObserver.kt

@@ -58,8 +58,14 @@ class MapLifecycleEventObserver(
 
   private fun invokeEvent(event: Lifecycle.Event) {
     when (event) {
-      Lifecycle.Event.ON_CREATE -> mapView?.onCreate(Bundle())
-      Lifecycle.Event.ON_START -> mapView?.onStart()
+      Lifecycle.Event.ON_CREATE -> {
+        mapView?.onCreate(Bundle())
+      }
+
+      Lifecycle.Event.ON_START -> {
+        mapView?.onStart()
+      }
+
       Lifecycle.Event.ON_RESUME -> {
         locationHandler.start()
         mapView?.onResume()
@@ -70,8 +76,14 @@ class MapLifecycleEventObserver(
         locationHandler.stop()
       }
 
-      Lifecycle.Event.ON_STOP -> mapView?.onStop()
-      Lifecycle.Event.ON_DESTROY -> mapView?.onDestroy()
+      Lifecycle.Event.ON_STOP -> {
+        mapView?.onStop()
+      }
+
+      Lifecycle.Event.ON_DESTROY -> {
+        mapView?.onDestroy()
+      }
+
       Lifecycle.Event.ON_ANY -> {}
     }
     currentState = event.targetState

package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt

@@ -116,7 +116,9 @@ class MapMarkerBuilder(
                 result
               }
 
-              else -> null
+              else -> {
+                null
+              }
             }
           }.onFailure {
             mapsLog("external svg resolve failed")

package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -150,7 +150,7 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         when {
-          prev == null ->
+          prev == null -> {
             markerBuilder.buildIconAsync(next) { icon ->
               view.addMarker(
                 id,
@@ -161,11 +161,13 @@ class RNGoogleMapsPlusView(
                 ),
               )
             }
+          }
 
-          !prev.markerEquals(next) ->
+          !prev.markerEquals(next) -> {
             view.updateMarker(id) { marker ->
               markerBuilder.update(prev, next, marker)
             }
+          }
         }
       }
     }
@@ -183,13 +185,15 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         when {
-          prev == null ->
+          prev == null -> {
             view.addPolyline(id, polylineBuilder.build(next))
+          }
 
-          !prev.polylineEquals(next) ->
+          !prev.polylineEquals(next) -> {
             view.updatePolyline(id) { polyline ->
               polylineBuilder.update(prev, next, polyline)
             }
+          }
         }
       }
     }
@@ -208,13 +212,15 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         when {
-          prev == null ->
+          prev == null -> {
             view.addPolygon(id, polygonBuilder.build(next))
+          }
 
-          !prev.polygonEquals(next) ->
+          !prev.polygonEquals(next) -> {
             view.updatePolygon(id) { polygon ->
               polygonBuilder.update(prev, next, polygon)
             }
+          }
         }
       }
     }
@@ -233,13 +239,15 @@ class RNGoogleMapsPlusView(
       nextById.forEach { (id, next) ->
         val prev = prevById[id]
         when {
-          prev == null ->
+          prev == null -> {
             view.addCircle(id, circleBuilder.build(next))
+          }
 
-          !prev.circleEquals(next) ->
+          !prev.circleEquals(next) -> {
             view.updateCircle(id) { circle ->
               circleBuilder.update(prev, next, circle)
             }
+          }
         }
       }
     }

package/android/src/main/java/com/rngooglemapsplus/extensions/IntExtension.kt

@@ -5,24 +5,31 @@ import com.rngooglemapsplus.RNMapErrorCode
 
 fun Int.toRNMapErrorCodeOrNull(): RNMapErrorCode? =
   when (this) {
-    ConnectionResult.SERVICE_MISSING ->
+    ConnectionResult.SERVICE_MISSING -> {
       RNMapErrorCode.PLAY_SERVICES_MISSING
+    }
 
-    ConnectionResult.SERVICE_INVALID ->
+    ConnectionResult.SERVICE_INVALID -> {
       RNMapErrorCode.PLAY_SERVICES_INVALID
+    }
 
-    ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED ->
+    ConnectionResult.SERVICE_VERSION_UPDATE_REQUIRED -> {
       RNMapErrorCode.PLAY_SERVICES_OUTDATED
+    }
 
-    ConnectionResult.SERVICE_UPDATING ->
+    ConnectionResult.SERVICE_UPDATING -> {
       RNMapErrorCode.PLAY_SERVICE_UPDATING
+    }
 
-    ConnectionResult.SERVICE_DISABLED ->
+    ConnectionResult.SERVICE_DISABLED -> {
       RNMapErrorCode.PLAY_SERVICES_DISABLED
+    }
 
-    ConnectionResult.SUCCESS ->
+    ConnectionResult.SUCCESS -> {
       null
+    }
 
-    else ->
+    else -> {
       RNMapErrorCode.UNKNOWN
+    }
   }

package/android/src/main/java/com/rngooglemapsplus/extensions/LocationExtension.kt

@@ -20,53 +20,73 @@ fun Location.toRnLocation(): RNLocation =
         elapsedRealtimeNanos = elapsedRealtimeNanos.toDouble(),
         bearingAccuracyDegrees =
           when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> null
-            else ->
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> {
+              null
+            }
+
+            else -> {
               try {
                 if (hasBearingAccuracy()) bearingAccuracyDegrees.toDouble() else null
               } catch (_: IllegalStateException) {
                 null
               }
+            }
           },
         speedAccuracyMetersPerSecond =
           when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> null
-            else ->
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> {
+              null
+            }
+
+            else -> {
               try {
                 if (hasSpeedAccuracy()) speedAccuracyMetersPerSecond.toDouble() else null
               } catch (_: IllegalStateException) {
                 null
               }
+            }
           },
         verticalAccuracyMeters =
           when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> null
-            else ->
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.O -> {
+              null
+            }
+
+            else -> {
               try {
                 if (hasVerticalAccuracy()) verticalAccuracyMeters.toDouble() else null
               } catch (_: IllegalStateException) {
                 null
               }
+            }
           },
         mslAltitudeMeters =
           when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> null
-            else ->
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> {
+              null
+            }
+
+            else -> {
               try {
                 if (hasMslAltitude()) mslAltitudeMeters else null
               } catch (_: IllegalStateException) {
                 null
               }
+            }
           },
         mslAltitudeAccuracyMeters =
           when {
-            Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> null
-            else ->
+            Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> {
+              null
+            }
+
+            else -> {
               try {
                 if (hasMslAltitude()) mslAltitudeAccuracyMeters.toDouble() else null
               } catch (_: IllegalStateException) {
                 null
               }
+            }
           },
         isMock =
           when {

package/android/src/main/java/com/rngooglemapsplus/extensions/StringExtension.kt

@@ -23,16 +23,28 @@ private fun parseCssColor(input: String): Int {
 private fun normalizeHexColor(hex: String): String {
   val h = hex.removePrefix("#")
   return when (h.length) {
-    3 ->
+    3 -> {
       "#FF" +
         h
           .map { "$it$it" }
           .joinToString("")
+    }
 
-    4 -> "#" + h[0] + h[0] + h[1] + h[1] + h[2] + h[2] + h[3] + h[3]
-    6 -> "#FF$h"
-    8 -> "#$h"
-    else -> "#$h"
+    4 -> {
+      "#" + h[0] + h[0] + h[1] + h[1] + h[2] + h[2] + h[3] + h[3]
+    }
+
+    6 -> {
+      "#FF$h"
+    }
+
+    8 -> {
+      "#$h"
+    }
+
+    else -> {
+      "#$h"
+    }
   }
 }
 

package/android/src/main/java/com/rngooglemapsplus/extensions/ThrowableExtension.kt

@@ -10,21 +10,27 @@ import com.rngooglemapsplus.RNLocationErrorCode
 
 fun Throwable.toLocationErrorCode(context: Context): RNLocationErrorCode {
   return when (this) {
-    is SecurityException -> RNLocationErrorCode.PERMISSION_DENIED
+    is SecurityException -> {
+      RNLocationErrorCode.PERMISSION_DENIED
+    }
 
-    is ApiException ->
+    is ApiException -> {
       when (statusCode) {
-        CommonStatusCodes.NETWORK_ERROR ->
+        CommonStatusCodes.NETWORK_ERROR -> {
           RNLocationErrorCode.POSITION_UNAVAILABLE
+        }
 
         LocationSettingsStatusCodes.RESOLUTION_REQUIRED,
         LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE,
-        ->
+        -> {
           RNLocationErrorCode.SETTINGS_NOT_SATISFIED
+        }
 
-        else ->
+        else -> {
           RNLocationErrorCode.INTERNAL_ERROR
+        }
       }
+    }
 
     else -> {
       if (message?.contains("GoogleApi", ignoreCase = true) == true) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-maps-plus",
-  "version": "1.11.0-dev.1",
+  "version": "1.11.1-dev.1",
   "description": "React Native wrapper for Android & iOS Google Maps SDK",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",