From 4c748bbc45b353d15d0a01fa09b959e9e15091a0 Mon Sep 17 00:00:00 2001 From: pinpong Date: Wed, 18 Mar 2026 19:01:40 +0700 Subject: [PATCH 1/2] chore: minor code quality improvements --- .../rngooglemapsplus/GoogleMapsViewImpl.kt | 22 +++++++++---------- .../com/rngooglemapsplus/LocationHandler.kt | 2 +- ios/GoogleMapViewImpl.swift | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt index f36f663..1ad1726 100644 --- a/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +++ b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt @@ -57,11 +57,11 @@ import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets class GoogleMapsViewImpl( - val reactContext: ThemedReactContext, - val locationHandler: LocationHandler, - val playServiceHandler: PlayServicesHandler, - val markerBuilder: MapMarkerBuilder, - val mapErrorHandler: MapErrorHandler, + private val reactContext: ThemedReactContext, + private val locationHandler: LocationHandler, + private val playServiceHandler: PlayServicesHandler, + private val markerBuilder: MapMarkerBuilder, + private val mapErrorHandler: MapErrorHandler, ) : FrameLayout(reactContext), GoogleMap.OnCameraMoveStartedListener, GoogleMap.OnCameraMoveListener, @@ -96,7 +96,7 @@ class GoogleMapsViewImpl( private val pendingCircles = mutableListOf>() private val pendingHeatmaps = mutableListOf>() private val pendingKmlLayers = mutableListOf>() - private val pendingUrlTilesOverlays = mutableListOf>() + private val pendingUrlTileOverlays = mutableListOf>() private val markersById = mutableMapOf() private val polylinesById = mutableMapOf() @@ -268,9 +268,9 @@ class GoogleMapsViewImpl( pendingKmlLayers.forEach { (id, str) -> addKmlLayerInternal(id, str) } pendingKmlLayers.clear() } - if (pendingUrlTilesOverlays.isNotEmpty()) { - pendingUrlTilesOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) } - pendingUrlTilesOverlays.clear() + if (pendingUrlTileOverlays.isNotEmpty()) { + pendingUrlTileOverlays.forEach { (id, opts) -> addUrlTileOverlayInternal(id, opts) } + pendingUrlTileOverlays.clear() } } @@ -775,7 +775,7 @@ class GoogleMapsViewImpl( opts: TileOverlayOptions, ) = onUi { if (googleMap == null) { - pendingUrlTilesOverlays.add(id to opts) + pendingUrlTileOverlays.add(id to opts) return@onUi } urlTileOverlaysById.remove(id)?.remove() @@ -805,7 +805,7 @@ class GoogleMapsViewImpl( it.remove() } urlTileOverlaysById.clear() - pendingUrlTilesOverlays.clear() + pendingUrlTileOverlays.clear() } fun destroyInternal() = diff --git a/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt b/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt index 08ec1af..f3bb309 100644 --- a/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +++ b/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt @@ -68,7 +68,7 @@ class LocationHandler( val activity = context.currentActivity ?: run { return@onUi } val lr = - if (Build.VERSION.SDK_INT >= 31) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, 10_000L).build() } else { @Suppress("DEPRECATION") diff --git a/ios/GoogleMapViewImpl.swift b/ios/GoogleMapViewImpl.swift index 8f0b965..1905f09 100644 --- a/ios/GoogleMapViewImpl.swift +++ b/ios/GoogleMapViewImpl.swift @@ -322,7 +322,6 @@ GMSIndoorDisplayDelegate { } } - var onMapError: ((RNMapErrorCode) -> Void)? var onMapReady: ((Bool) -> Void)? var onMapLoaded: ((RNRegion, RNCamera) -> Void)? var onLocationUpdate: ((RNLocation) -> Void)? From 7cad9cc7a47b600c33bac6273f9fae79d24703ed Mon Sep 17 00:00:00 2001 From: pinpong Date: Wed, 18 Mar 2026 19:09:27 +0700 Subject: [PATCH 2/2] chore: minor code quality improvements --- android/src/main/java/com/rngooglemapsplus/LocationHandler.kt | 2 +- android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt | 2 +- .../src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt | 2 +- .../src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt b/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt index f3bb309..443b9a8 100644 --- a/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +++ b/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt @@ -27,7 +27,7 @@ private const val INTERVAL_DEFAULT = 600000L private const val MIN_UPDATE_INTERVAL = 3600000L class LocationHandler( - val context: ReactContext, + private val context: ReactContext, ) : LocationSource { private val fusedLocationClientProviderClient: FusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context) diff --git a/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt b/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt index 25f90b6..c3c479f 100644 --- a/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +++ b/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt @@ -42,7 +42,7 @@ import java.util.concurrent.ConcurrentHashMap import kotlin.coroutines.cancellation.CancellationException class MapMarkerBuilder( - val context: ThemedReactContext, + private val context: ThemedReactContext, private val mapErrorHandler: MapErrorHandler, private val scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Default), ) { diff --git a/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt b/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt index 6742d76..d070f98 100644 --- a/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt +++ b/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt @@ -5,7 +5,7 @@ import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability class PlayServicesHandler( - val context: ReactContext, + private val context: ReactContext, ) { fun playServicesAvailability(): Int { val availability = GoogleApiAvailability.getInstance() diff --git a/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt b/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt index ebc54a2..a3a21d0 100644 --- a/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +++ b/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt @@ -22,7 +22,7 @@ import com.rngooglemapsplus.extensions.toSize @DoNotStrip class RNGoogleMapsPlusView( - val context: ThemedReactContext, + private val context: ThemedReactContext, ) : HybridRNGoogleMapsPlusViewSpec() { private val mapErrorHandler = MapErrorHandler()