react-native-maps 1.21.0-alpha.60 → 1.21.0-alpha.61

package/android/build.gradle

@@ -101,9 +101,9 @@ repositories {
 
 dependencies {
   implementation 'com.facebook.react:react-native:+'
-  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.2.0')}"
-  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.2.0')}"
+  implementation "com.google.android.gms:play-services-base:${safeExtGet('playServicesVersion', '18.5.0')}"
+  implementation "com.google.android.gms:play-services-maps:${safeExtGet('playServicesVersion', '18.5.0')}"
   implementation "com.google.android.gms:play-services-location:21.0.1"
-  implementation 'com.google.maps.android:android-maps-utils:3.8.2'
+  implementation 'com.google.maps.android:android-maps-utils:3.10.0'
   implementation "androidx.work:work-runtime:2.7.1"
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/main/java/com/rnmaps/fabric/MapViewManager.java

@@ -13,7 +13,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
@@ -23,7 +22,6 @@ import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewGroupManager;
 import com.facebook.react.uimanager.ViewManagerDelegate;
 import com.facebook.react.viewmanagers.RNMapsMapViewManagerInterface;
@@ -34,6 +32,7 @@ import com.google.android.gms.maps.MapsInitializer;
 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.MapColorScheme;
 import com.rnmaps.maps.MapView;
 import com.rnmaps.maps.SizeReportingShadowNode;
 
@@ -105,6 +104,16 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
                     options.maxZoomPreference(initialProps.getInt("maxZoom", 0));
                 }
             }
+            if (initialProps.hasKey("userInterfaceStyle")){
+                String style = initialProps.getString("userInterfaceStyle");
+                if ("system".equals(style)) {
+                    options.mapColorScheme(MapColorScheme.FOLLOW_SYSTEM);
+                } else if ("light".equals(style)){
+                    options.mapColorScheme(MapColorScheme.LIGHT);
+                } else if ("dark".equals(style)){
+                    options.mapColorScheme(MapColorScheme.DARK);
+                }
+            }
             if (initialProps.hasKey("pitchEnabled")) {
                 options.tiltGesturesEnabled(initialProps.getBoolean("pitchEnabled", true));
             }
@@ -426,7 +435,7 @@ public class MapViewManager extends ViewGroupManager<MapView> implements RNMapsM
 
     @Override
     public void setUserInterfaceStyle(MapView view, @Nullable String value) {
-        // todo update google maps SDK and add support for MapColorScheme
+        // do nothing (initialProp)
     }
 
     @Override

package/lib/MapView.d.ts

@@ -493,7 +493,7 @@ export type MapViewProps = ViewProps & {
      *
      * @default System setting
      * @platform iOS: Apple Maps only (iOS >= 13.0)
-     * @platform Android: Not supported
+     * @platform Android: Supported
      */
     userInterfaceStyle?: 'light' | 'dark';
     /**

package/package.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.21.0-alpha.60",
+  "version": "1.21.0-alpha.61",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",