react-native-google-maps-plus 1.0.1 → 1.0.3-dev.1

package/README.md

@@ -1,30 +1,146 @@
 # react-native-google-maps-plus
 
-[![npm version](https://img.shields.io/npm/v/react-native-google-maps-plus.svg)](https://www.npmjs.com/package/react-native-google-maps-plus)
+[![npm version](https://img.shields.io/npm/v/react-native-google-maps-plus.svg?logo=npm&color=cb0000)](https://www.npmjs.com/package/react-native-google-maps-plus)
+[![Dev Release](https://img.shields.io/npm/v/react-native-google-maps-plus/dev.svg?label=dev%20release&color=orange&logo=githubactions)](https://www.npmjs.com/package/react-native-google-maps-plus)
 [![Release](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml/badge.svg)](https://github.com/pinpong/react-native-google-maps-plus/actions/workflows/release.yml)
-[![Issues](https://img.shields.io/github/issues/pinpong/react-native-google-maps-plus)](https://github.com/pinpong/react-native-google-maps-plus/issues)
-[![License](https://img.shields.io/github/license/pinpong/react-native-google-maps-plus)](./LICENSE)
-[![Code Style: Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io/)
-[![TypeScript](https://img.shields.io/badge/%3C/%3E-TypeScript-blue.svg)](https://www.typescriptlang.org/)
-[![Lint](https://img.shields.io/badge/lint-eslint-green.svg)](https://eslint.org/)
-[![React Native](https://img.shields.io/badge/react--native-%3E%3D0.81.0-61dafb.svg)](https://reactnative.dev/)
-[![Platform: Android](https://img.shields.io/badge/platform-android-green.svg)](https://developer.android.com/)
-[![Platform: iOS](https://img.shields.io/badge/platform-iOS-lightgrey.svg)](https://developer.apple.com/ios/)
+[![Issues](https://img.shields.io/github/issues/pinpong/react-native-google-maps-plus?logo=github)](https://github.com/pinpong/react-native-google-maps-plus/issues)
+[![License](https://img.shields.io/github/license/pinpong/react-native-google-maps-plus?logo=open-source-initiative&logoColor=green)](./LICENSE)
+[![Code Style: Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?logo=prettier&logoColor=white)](https://prettier.io/)
+[![TypeScript](https://img.shields.io/badge/%3C/%3E-TypeScript-blue.svg?logo=typescript)](https://www.typescriptlang.org/)
+[![Lint](https://img.shields.io/badge/lint-eslint-green.svg?logo=eslint&logoColor=white)](https://eslint.org/)
+[![React Native](https://img.shields.io/badge/react--native-%3E%3D0.81.0-61dafb.svg?logo=react)](https://reactnative.dev/)
+[![Platform: Android](https://img.shields.io/badge/platform-android-green.svg?logo=android&logoColor=white)](https://developer.android.com/)
+[![Platform: iOS](https://img.shields.io/badge/platform-iOS-lightgrey.svg?logo=apple&logoColor=black)](https://developer.apple.com/ios/)
 
 React-native wrapper for android & IOS google maps sdk
 
 ## Installation
 
+`react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).
+
 ```sh
 yarn add react-native-google-maps-plus react-native-nitro-modules
-
-> `react-native-nitro-modules` is required as this library relies on [Nitro Modules](https://nitro.margelo.com/).
 ```
 
+Dependencies
+
+This package builds on native SVG rendering libraries:
+
+iOS: [SVGKit](https://github.com/SVGKit/SVGKit)
+
+Android: [AndroidSVG](https://bigbadaboom.github.io/androidsvg/)
+
+These are automatically linked when you install the package, but you may need to clean/rebuild your native projects after first install.
+
+## Setup API Key
+
+You will need a valid **Google Maps API Key** from the [Google Cloud Console](https://console.cloud.google.com/).
+
+### Android
+
+It's recommend to use [Secrets Gradle Plugin](https://developers.google.com/maps/documentation/android-sdk/secrets-gradle-plugin) to securely manage your Google Maps API Key.
+
+---
+
+### iOS
+
+See the official [Google Maps iOS SDK configuration guide](https://developers.google.com/maps/documentation/ios-sdk/config#get-key) for more details.
+
+1. Create a `Secrets.xcconfig` file inside the **ios/** folder:
+
+   ```properties
+   MAPS_API_KEY=YOUR_IOS_MAPS_API_KEY
+   ```
+
+   Include it in your project configuration file:
+
+   ```xcconfig
+   #include? "Secrets.xcconfig"
+   ```
+
+2. Reference the API key in your **Info.plist**:
+
+   ```xml
+   <key>MAPS_API_KEY</key>
+   <string>$(MAPS_API_KEY)</string>
+   ```
+
+3. Provide the key programmatically in **AppDelegate.swift**:
+
+   ```swift
+   import GoogleMaps
+
+   @UIApplicationMain
+   class AppDelegate: UIResponder, UIApplicationDelegate {
+     func application(_ application: UIApplication,
+                      didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+       if let apiKey = Bundle.main.object(forInfoDictionaryKey: "MAPS_API_KEY") as? String {
+           GMSServices.provideAPIKey(apiKey)
+       }
+       return true
+     }
+   }
+   ```
+
+---
+
 ## Usage
 
 Checkout the example app in the [example](./example) folder.
 
+# Troubleshooting
+
+## Android
+
+- **API key not found**
+  Make sure `secrets.properties` exists under `android/` and contains your `MAPS_API_KEY`.
+  Run `./gradlew clean` and rebuild.
+
+## iOS
+
+- **`GMSServices must be configured before use`**
+  Ensure your key is in `Info.plist` and/or provided via `GMSServices.provideAPIKey(...)` in `AppDelegate.swift`.
+
+- **Build fails with `Node.h` import error from SVGKit**
+  SVGKit uses a header `Node.h` which can conflict with iOS system headers.
+  You can patch it automatically in your **Podfile** inside the `post_install` hook:
+
+  ```ruby
+  post_install do |installer|
+    react_native_post_install(
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false,
+    )
+    # Force iOS 16+ to avoid deployment target warnings
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '16.0'
+      end
+    end
+
+    # Patch SVGKit includes to avoid Node.h conflicts
+    require 'fileutils'
+    svgkit_path = File.join(installer.sandbox.pod_dir('SVGKit'), 'Source')
+    Dir.glob(File.join(svgkit_path, '**', '*.{h,m}')).each do |file|
+      FileUtils.chmod("u+w", file)
+      text = File.read(file)
+      new_contents = text.gsub('#import "Node.h"', '#import "SVGKit/Node.h"')
+      File.open(file, 'w') { |f| f.write(new_contents) }
+    end
+  end
+  ```
+
+  After applying this, run:
+
+  ```sh
+  cd ios && pod install --repo-update
+  ```
+
+- **Maps not rendering**
+  - Check that your API key has **Maps SDK for Android/iOS** enabled in Google Cloud Console.
+  - Make sure the key is not restricted to wrong bundle IDs or SHA1 fingerprints.
+
 ## Contributing
 
 - [Development workflow](CONTRIBUTING.md#development-workflow)

package/{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)

package/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(

package/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")
 

package/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

package/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);
 }

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

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