Dev

.github/workflows/pull_request.yml

@@ -3,6 +3,10 @@ on:
   pull_request:
     branches: [dev, main]
 
+concurrency:
+  group: pr-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: macos-latest
@@ -13,6 +17,9 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
+      - name: Generate nitrogen code
+        run: yarn nitrogen
+
       - name: Install ktlint & swiftlint
         run: |
           brew install ktlint

CONTRIBUTING.md

@@ -40,7 +40,7 @@ The [example app](/example/) demonstrates usage of the library. You need to run
 
 It is configured to use the local version of the library, so any changes you make to the library's source code will be reflected in the example app. Changes to the library's JavaScript code will be reflected in the example app without a rebuild, but native code changes will require a rebuild of the example app.
 
-If you want to use Android Studio or XCode to edit the native code, you can open the `example/android` or `example/ios` directories respectively in those editors. To edit the Objective-C or Swift files, open `example/ios/GoogleMapsNitroExample.xcworkspace` in XCode and find the source files at `Pods > Development Pods > react-native-google-maps-plus`.
+If you want to use Android Studio or XCode to edit the native code, you can open the `example/android` or `example/ios` directories respectively in those editors. To edit the Objective-C or Swift files, open `example/ios/GoogleMapsPlusExample.xcworkspace` in XCode and find the source files at `Pods > Development Pods > react-native-google-maps-plus`.
 
 To edit the Java or Kotlin files, open `example/android` in Android studio and find the source files at `react-native-google-maps-plus` under `Android`.
 
@@ -67,7 +67,7 @@ yarn example ios
 To confirm that the app is running with the new architecture, you can check the Metro logs for a message like this:
 
 ```sh
-Running "GoogleMapsNitroExample" with {"fabric":true,"initialProps":{"concurrentRoot":true},"rootTag":1}
+Running "GoogleMapsPlusExample" with {"fabric":true,"initialProps":{"concurrentRoot":true},"rootTag":1}
 ```
 
 Note the `"fabric":true` and `"concurrentRoot":true` properties.

GoogleMapsNitro.podspec → RNGoogleMapsPlus.podspec

@@ -3,7 +3,7 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 Pod::Spec.new do |s|
-  s.name         = "GoogleMapsNitro"
+  s.name         = "RNGoogleMapsPlus"
   s.version      = package["version"]
   s.summary      = package["description"]
   s.homepage     = package["homepage"]
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.dependency 'GoogleMaps', '10.3.0'
   s.dependency 'SVGKit', '3.0.0'
 
-  load 'nitrogen/generated/ios/GoogleMapsNitro+autolinking.rb'
+  load 'nitrogen/generated/ios/RNGoogleMapsPlus+autolinking.rb'
   add_nitrogen_files(s)
 
   install_modules_dependencies(s)

android/CMakeLists.txt

@@ -1,7 +1,7 @@
-project(GoogleMapsNitro)
+project(RNGoogleMapsPlus)
 cmake_minimum_required(VERSION 3.9.0)
 
-set (PACKAGE_NAME GoogleMapsNitro)
+set (PACKAGE_NAME RNGoogleMapsPlus)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 20)
 
@@ -14,7 +14,7 @@ add_library(${PACKAGE_NAME} SHARED
 )
 
 # Add Nitrogen specs :)
-include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/GoogleMapsNitro+autolinking.cmake)
+include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/RNGoogleMapsPlus+autolinking.cmake)
 
 # Set up local includes
 include_directories(

android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['GoogleMapsNitro_' + name]
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['RNGoogleMapsPlus_' + name]
   }
 
   repositories {
@@ -22,17 +22,17 @@ def reactNativeArchitectures() {
 
 apply plugin: "com.android.library"
 apply plugin: "kotlin-android"
-apply from: '../nitrogen/generated/android/GoogleMapsNitro+autolinking.gradle'
+apply from: '../nitrogen/generated/android/RNGoogleMapsPlus+autolinking.gradle'
 apply from: "./fix-prefab.gradle"
 
 apply plugin: "com.facebook.react"
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["GoogleMapsNitro_" + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNGoogleMapsPlus_" + name]).toInteger()
 }
 
 android {
-  namespace "com.googlemapsnitro"
+  namespace "com.rngooglemapsplus"
 
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 

android/gradle.properties

@@ -1,8 +1,8 @@
-GoogleMapsNitro_kotlinVersion=2.0.21
-GoogleMapsNitro_minSdkVersion=26
-GoogleMapsNitro_targetSdkVersion=36
-GoogleMapsNitro_compileSdkVersion=36
-GoogleMapsNitro_ndkVersion=27.1.12297006
-GoogleMapsNitro_googlePlayServicesBaseVersion=18.8.0
-GoogleMapsNitro_googlePlayServicesMapsVersion=19.2.0
-GoogleMapsNitro_googlePlayServicesLocationVersion=21.3.0
+RNGoogleMapsPlus_kotlinVersion=2.0.21
+RNGoogleMapsPlus_minSdkVersion=26
+RNGoogleMapsPlus_targetSdkVersion=36
+RNGoogleMapsPlus_compileSdkVersion=36
+RNGoogleMapsPlus_ndkVersion=27.1.12297006
+RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.8.0
+RNGoogleMapsPlus_googlePlayServicesMapsVersion=19.2.0
+RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0

android/src/main/cpp/cpp-adapter.cpp

@@ -1,6 +1,6 @@
 #include <jni.h>
-#include "GoogleMapsNitroOnLoad.hpp"
+#include "RNGoogleMapsPlusOnLoad.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
-  return margelo::nitro::googlemapsnitro::initialize(vm);
+  return margelo::nitro::rngooglemapsplus::initialize(vm);
 }

android/src/main/java/com/googlemapsnitro/Color.kt → android/src/main/java/com/rngooglemapsplus/Color.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.graphics.Color
 import androidx.core.graphics.toColorInt

android/src/main/java/com/googlemapsnitro/GoogleMapsNitroViewImpl.kt → android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.annotation.SuppressLint
 import android.location.Location
@@ -23,11 +23,11 @@ import com.google.android.gms.maps.model.PolygonOptions
 import com.google.android.gms.maps.model.Polyline
 import com.google.android.gms.maps.model.PolylineOptions
 
-class GoogleMapsNitroViewImpl(
+class GoogleMapsViewImpl(
   val reactContext: ThemedReactContext,
   val locationHandler: LocationHandler,
   val playServiceHandler: PlayServicesHandler,
-  val markerOptions: com.googlemapsnitro.MarkerOptions,
+  val markerOptions: com.rngooglemapsplus.MarkerOptions,
 ) : MapView(reactContext),
   GoogleMap.OnCameraMoveStartedListener,
   GoogleMap.OnCameraMoveListener,
@@ -104,7 +104,7 @@ class GoogleMapsNitroViewImpl(
     }
 
     onCreate(null)
-    getMapAsync(this@GoogleMapsNitroViewImpl)
+    getMapAsync(this@GoogleMapsViewImpl)
   }
 
   override fun onCameraMoveStarted(reason: Int) {
@@ -653,7 +653,7 @@ class GoogleMapsNitroViewImpl(
         setOnMarkerClickListener(null)
         setOnMapClickListener(null)
       }
-      this@GoogleMapsNitroViewImpl.onDestroy()
+      this@GoogleMapsViewImpl.onDestroy()
       googleMap = null
       reactContext.removeLifecycleEventListener(this)
     }
@@ -684,14 +684,14 @@ class GoogleMapsNitroViewImpl(
   override fun onHostResume() {
     onUi {
       locationHandler.start()
-      this@GoogleMapsNitroViewImpl.onResume()
+      this@GoogleMapsViewImpl.onResume()
     }
   }
 
   override fun onHostPause() {
     onUi {
       locationHandler.stop()
-      this@GoogleMapsNitroViewImpl.onPause()
+      this@GoogleMapsViewImpl.onPause()
     }
   }
 

android/src/main/java/com/googlemapsnitro/LocationHandler.kt → android/src/main/java/com/rngooglemapsplus/LocationHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.annotation.SuppressLint
 import android.content.Intent

android/src/main/java/com/googlemapsnitro/MapMarker.kt → android/src/main/java/com/rngooglemapsplus/MapMarker.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.graphics.Bitmap
 import android.graphics.Canvas

android/src/main/java/com/googlemapsnitro/MapPolygon.kt → android/src/main/java/com/rngooglemapsplus/MapPolygon.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.PolygonOptions

android/src/main/java/com/googlemapsnitro/MapPolyline.kt → android/src/main/java/com/rngooglemapsplus/MapPolyline.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.google.android.gms.maps.model.ButtCap

android/src/main/java/com/googlemapsnitro/PermissionHandler.kt → android/src/main/java/com/rngooglemapsplus/PermissionHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import android.Manifest
 import android.content.pm.PackageManager

android/src/main/java/com/googlemapsnitro/PlayServicesHandler.kt → android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.bridge.ReactContext
 import com.google.android.gms.common.ConnectionResult

android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroModule.kt → android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusModule.kt

@@ -1,9 +1,9 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.margelo.nitro.core.Promise
 
-class HybridGoogleMapsNitroModule : HybridGoogleMapsNitroModuleSpec() {
-  val context = GoogleMapsNitroPackage.AppContextHolder.context
+class RNGoogleMapsPlusModule : HybridRNGoogleMapsPlusModuleSpec() {
+  val context = RNGoogleMapsPlusPackage.AppContextHolder.context
   private val locationHandler: LocationHandler = LocationHandler(context)
   private val permissionHandler: PermissionHandler = PermissionHandler(context)
   private val playServicesHandler: PlayServicesHandler = PlayServicesHandler(context)

android/src/main/java/com/googlemapsnitro/GoogleMapsNitroPackage.kt → android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusPackage.kt

@@ -1,14 +1,14 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.react.BaseReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.model.ReactModuleInfoProvider
 import com.facebook.react.uimanager.ViewManager
-import com.googlemapsnitro.GoogleMapsNitroPackage.AppContextHolder.context
-import com.googlemapsnitro.views.HybridGoogleMapsNitroViewManager
+import com.rngooglemapsplus.RNGoogleMapsPlusPackage.AppContextHolder.context
+import com.rngooglemapsplus.views.HybridRNGoogleMapsPlusViewManager
 
-class GoogleMapsNitroPackage : BaseReactPackage() {
+class RNGoogleMapsPlusPackage : BaseReactPackage() {
   override fun getModule(
     name: String,
     reactContext: ReactApplicationContext,
@@ -19,7 +19,7 @@ class GoogleMapsNitroPackage : BaseReactPackage() {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     context = reactContext
     return listOf(
-      HybridGoogleMapsNitroViewManager(),
+      HybridRNGoogleMapsPlusViewManager(),
     )
   }
 
@@ -29,7 +29,7 @@ class GoogleMapsNitroPackage : BaseReactPackage() {
 
   companion object {
     init {
-      GoogleMapsNitroOnLoad.initializeNative()
+      RNGoogleMapsPlusOnLoad.initializeNative()
     }
   }
 }

android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroView.kt → android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt

@@ -1,4 +1,4 @@
-package com.googlemapsnitro
+package com.rngooglemapsplus
 
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.UiThreadUtil
@@ -10,17 +10,17 @@ import com.google.android.gms.maps.model.MapStyleOptions
 import com.margelo.nitro.core.Promise
 
 @DoNotStrip
-class HybridGoogleMapsNitroView(
+class RNGoogleMapsPlusView(
   val context: ThemedReactContext,
-) : HybridGoogleMapsNitroViewSpec() {
+) : HybridRNGoogleMapsPlusViewSpec() {
   private var currentCustomMapStyle: String = ""
   private var permissionHandler = PermissionHandler(context)
   private var locationHandler = LocationHandler(context)
   private var playServiceHandler = PlayServicesHandler(context)
   private val markerOptions = MarkerOptions()
 
   override val view =
-    GoogleMapsNitroViewImpl(context, locationHandler, playServiceHandler, markerOptions)
+    GoogleMapsViewImpl(context, locationHandler, playServiceHandler, markerOptions)
 
   private val polylineOptions = MapPolylineOptions()
   private val polygonOptions = MapPolygonOptions()

example/android/app/build.gradle

@@ -78,9 +78,9 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
-    namespace "googlemapsnitro.example"
+    namespace "rngooglemapsplus.example"
     defaultConfig {
-        applicationId "googlemapsnitro.example"
+        applicationId "rngooglemapsplus.example"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1

example/android/app/src/main/java/googlemapsnitro/example/MainActivity.kt

@@ -1,4 +1,4 @@
-package googlemapsnitro.example
+package rngooglemapsplus.example
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
@@ -11,7 +11,7 @@ class MainActivity : ReactActivity() {
    * Returns the name of the main component registered from JavaScript. This is used to schedule
    * rendering of the component.
    */
-  override fun getMainComponentName(): String = "GoogleMapsNitroExample"
+  override fun getMainComponentName(): String = "GoogleMapsPlusExample"
 
   /**
    * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]

example/android/app/src/main/java/googlemapsnitro/example/MainApplication.kt

@@ -1,4 +1,4 @@
-package googlemapsnitro.example
+package rngooglemapsplus.example
 
 import android.app.Application
 import com.facebook.react.PackageList

example/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">GoogleMapsNitroExample</string>
+    <string name="app_name">GoogleMapsPlusExample</string>
 </resources>

example/android/settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
 plugins { id("com.facebook.react.settings") }
 extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
-rootProject.name = 'googlemapsnitro.example'
+rootProject.name = 'rngooglemapsplus.example'
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')

example/app.json

@@ -1,4 +1,4 @@
 {
-  "name": "GoogleMapsNitroExample",
-  "displayName": "GoogleMapsNitroExample"
+  "name": "GoogleMapsPlusExample",
+  "displayName": "GoogleMapsPlusExample"
 }