From 7217c113bc2e5742bbc4b119eec7672c0b240cba Mon Sep 17 00:00:00 2001 From: pinpong Date: Thu, 2 Oct 2025 17:18:59 +0700 Subject: [PATCH 1/4] fix: name conflict --- CONTRIBUTING.md | 4 +- ...sNitro.podspec => RNGoogleMapsPlus.podspec | 4 +- android/CMakeLists.txt | 6 +- android/build.gradle | 8 +- android/gradle.properties | 16 ++-- android/src/main/cpp/cpp-adapter.cpp | 4 +- .../Color.kt | 2 +- .../GoogleMapsViewImpl.kt} | 14 +-- .../LocationHandler.kt | 2 +- .../MapMarker.kt | 2 +- .../MapPolygon.kt | 2 +- .../MapPolyline.kt | 2 +- .../PermissionHandler.kt | 2 +- .../PlayServicesHandler.kt | 2 +- .../RNGoogleMapsPlusModule.kt} | 6 +- .../RNGoogleMapsPlusPackage.kt} | 12 +-- .../RNGoogleMapsPlusView.kt} | 8 +- example/android/app/build.gradle | 4 +- .../googlemapsnitro/example/MainActivity.kt | 4 +- .../example/MainApplication.kt | 2 +- .../app/src/main/res/values/strings.xml | 2 +- example/android/settings.gradle | 2 +- example/app.json | 4 +- .../ios/GoogleMapsNitroExample/Debug.xcconfig | 2 - .../GoogleMapsNitroExample/Release.xcconfig | 2 - .../project.pbxproj | 88 +++++++++---------- .../xcschemes/GoogleMapsPlusExample.xcscheme} | 18 ++-- .../contents.xcworkspacedata | 2 +- .../AppDelegate.swift | 2 +- .../ios/GoogleMapsPlusExample/Debug.xcconfig | 2 + .../AppIcon.appiconset/Contents.json | 0 .../Images.xcassets/Contents.json | 0 .../Info.plist | 2 +- .../LaunchScreen.storyboard | 2 +- .../PrivacyInfo.xcprivacy | 0 .../GoogleMapsPlusExample/Release.xcconfig | 2 + .../de.lproj/InfoPlist.strings | 0 .../en.lproj/InfoPlist.strings | 0 example/ios/Podfile | 2 +- example/ios/Podfile.lock | 74 ++++++++-------- example/src/App.tsx | 1 - ...ViewImpl.swift => GoogleMapViewImpl.swift} | 2 +- ...ule.swift => RNGoogleMapsPlusModule.swift} | 2 +- ...oView.swift => RNGoogleMapsPlusView.swift} | 6 +- nitro.json | 22 ++--- package.json | 8 +- scripts/post-script.js | 16 ++-- ...tro.ts => RNGoogleMapsPlusModule.nitro.ts} | 2 +- ...nitro.ts => RNGoogleMapsPlusView.nitro.ts} | 10 +-- src/index.tsx | 22 ++--- src/types.ts | 4 +- 51 files changed, 206 insertions(+), 201 deletions(-) rename GoogleMapsNitro.podspec => RNGoogleMapsPlus.podspec (88%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/Color.kt (98%) rename android/src/main/java/com/{googlemapsnitro/GoogleMapsNitroViewImpl.kt => rngooglemapsplus/GoogleMapsViewImpl.kt} (98%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/LocationHandler.kt (99%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/MapMarker.kt (99%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/MapPolygon.kt (97%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/MapPolyline.kt (98%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/PermissionHandler.kt (99%) rename android/src/main/java/com/{googlemapsnitro => rngooglemapsplus}/PlayServicesHandler.kt (95%) rename android/src/main/java/com/{googlemapsnitro/HybridGoogleMapsNitroModule.kt => rngooglemapsplus/RNGoogleMapsPlusModule.kt} (80%) rename android/src/main/java/com/{googlemapsnitro/GoogleMapsNitroPackage.kt => rngooglemapsplus/RNGoogleMapsPlusPackage.kt} (70%) rename android/src/main/java/com/{googlemapsnitro/HybridGoogleMapsNitroView.kt => rngooglemapsplus/RNGoogleMapsPlusView.kt} (98%) delete mode 100644 example/ios/GoogleMapsNitroExample/Debug.xcconfig delete mode 100644 example/ios/GoogleMapsNitroExample/Release.xcconfig rename example/ios/{GoogleMapsNitroExample.xcodeproj => GoogleMapsPlusExample.xcodeproj}/project.pbxproj (82%) rename example/ios/{GoogleMapsNitroExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsNitroExample.xcscheme => GoogleMapsPlusExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsPlusExample.xcscheme} (80%) rename example/ios/{GoogleMapsNitroExample.xcworkspace => GoogleMapsPlusExample.xcworkspace}/contents.xcworkspacedata (75%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/AppDelegate.swift (96%) create mode 100644 example/ios/GoogleMapsPlusExample/Debug.xcconfig rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/Images.xcassets/Contents.json (100%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/Info.plist (97%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/LaunchScreen.storyboard (95%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/PrivacyInfo.xcprivacy (100%) create mode 100644 example/ios/GoogleMapsPlusExample/Release.xcconfig rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/de.lproj/InfoPlist.strings (100%) rename example/ios/{GoogleMapsNitroExample => GoogleMapsPlusExample}/en.lproj/InfoPlist.strings (100%) rename ios/{GoogleMapNitroViewImpl.swift => GoogleMapViewImpl.swift} (99%) rename ios/{HybridGoogleMapsNitroModule.swift => RNGoogleMapsPlusModule.swift} (89%) rename ios/{HybridGoogleMapsNitroView.swift => RNGoogleMapsPlusView.swift} (98%) rename src/{GoogleMapsNitroModule.nitro.ts => RNGoogleMapsPlusModule.nitro.ts} (90%) rename src/{GoogleMapsNitroView.nitro.ts => RNGoogleMapsPlusView.nitro.ts} (86%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 97edde6..c3d1def 100644 --- a/CONTRIBUTING.md +++ b/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. diff --git a/GoogleMapsNitro.podspec b/RNGoogleMapsPlus.podspec similarity index 88% rename from GoogleMapsNitro.podspec rename to RNGoogleMapsPlus.podspec index 53506e7..4aeb18d 100644 --- a/GoogleMapsNitro.podspec +++ b/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) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index bc98e06..ed0a899 100644 --- a/android/CMakeLists.txt +++ b/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( diff --git a/android/build.gradle b/android/build.gradle index 65d873b..0ab758e 100644 --- a/android/build.gradle +++ b/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") diff --git a/android/gradle.properties b/android/gradle.properties index fa7ea19..9da52ae 100644 --- a/android/gradle.properties +++ b/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 diff --git a/android/src/main/cpp/cpp-adapter.cpp b/android/src/main/cpp/cpp-adapter.cpp index 8aed62f..b4e91ce 100644 --- a/android/src/main/cpp/cpp-adapter.cpp +++ b/android/src/main/cpp/cpp-adapter.cpp @@ -1,6 +1,6 @@ #include -#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); } diff --git a/android/src/main/java/com/googlemapsnitro/Color.kt b/android/src/main/java/com/rngooglemapsplus/Color.kt similarity index 98% rename from android/src/main/java/com/googlemapsnitro/Color.kt rename to android/src/main/java/com/rngooglemapsplus/Color.kt index 1f90ad9..dff40bf 100644 --- a/android/src/main/java/com/googlemapsnitro/Color.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/GoogleMapsNitroViewImpl.kt b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt similarity index 98% rename from android/src/main/java/com/googlemapsnitro/GoogleMapsNitroViewImpl.kt rename to android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt index eb34be8..3d227a4 100644 --- a/android/src/main/java/com/googlemapsnitro/GoogleMapsNitroViewImpl.kt +++ b/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() } } diff --git a/android/src/main/java/com/googlemapsnitro/LocationHandler.kt b/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt similarity index 99% rename from android/src/main/java/com/googlemapsnitro/LocationHandler.kt rename to android/src/main/java/com/rngooglemapsplus/LocationHandler.kt index b3d48fe..22c9101 100644 --- a/android/src/main/java/com/googlemapsnitro/LocationHandler.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/MapMarker.kt b/android/src/main/java/com/rngooglemapsplus/MapMarker.kt similarity index 99% rename from android/src/main/java/com/googlemapsnitro/MapMarker.kt rename to android/src/main/java/com/rngooglemapsplus/MapMarker.kt index 54c85dc..53cc25b 100644 --- a/android/src/main/java/com/googlemapsnitro/MapMarker.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/MapPolygon.kt b/android/src/main/java/com/rngooglemapsplus/MapPolygon.kt similarity index 97% rename from android/src/main/java/com/googlemapsnitro/MapPolygon.kt rename to android/src/main/java/com/rngooglemapsplus/MapPolygon.kt index 46cee79..f2a152e 100644 --- a/android/src/main/java/com/googlemapsnitro/MapPolygon.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/MapPolyline.kt b/android/src/main/java/com/rngooglemapsplus/MapPolyline.kt similarity index 98% rename from android/src/main/java/com/googlemapsnitro/MapPolyline.kt rename to android/src/main/java/com/rngooglemapsplus/MapPolyline.kt index 49e8d35..86e01b9 100644 --- a/android/src/main/java/com/googlemapsnitro/MapPolyline.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/PermissionHandler.kt b/android/src/main/java/com/rngooglemapsplus/PermissionHandler.kt similarity index 99% rename from android/src/main/java/com/googlemapsnitro/PermissionHandler.kt rename to android/src/main/java/com/rngooglemapsplus/PermissionHandler.kt index d803725..a1bd39a 100644 --- a/android/src/main/java/com/googlemapsnitro/PermissionHandler.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/PlayServicesHandler.kt b/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt similarity index 95% rename from android/src/main/java/com/googlemapsnitro/PlayServicesHandler.kt rename to android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt index a19e10e..6742d76 100644 --- a/android/src/main/java/com/googlemapsnitro/PlayServicesHandler.kt +++ b/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 diff --git a/android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroModule.kt b/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusModule.kt similarity index 80% rename from android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroModule.kt rename to android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusModule.kt index 31be457..82228e6 100644 --- a/android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroModule.kt +++ b/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) diff --git a/android/src/main/java/com/googlemapsnitro/GoogleMapsNitroPackage.kt b/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusPackage.kt similarity index 70% rename from android/src/main/java/com/googlemapsnitro/GoogleMapsNitroPackage.kt rename to android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusPackage.kt index f1c8000..c9c73b1 100644 --- a/android/src/main/java/com/googlemapsnitro/GoogleMapsNitroPackage.kt +++ b/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> { context = reactContext return listOf( - HybridGoogleMapsNitroViewManager(), + HybridRNGoogleMapsPlusViewManager(), ) } @@ -29,7 +29,7 @@ class GoogleMapsNitroPackage : BaseReactPackage() { companion object { init { - GoogleMapsNitroOnLoad.initializeNative() + RNGoogleMapsPlusOnLoad.initializeNative() } } } diff --git a/android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroView.kt b/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt similarity index 98% rename from android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroView.kt rename to android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt index fb7c956..32de0f3 100644 --- a/android/src/main/java/com/googlemapsnitro/HybridGoogleMapsNitroView.kt +++ b/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,9 +10,9 @@ 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) @@ -20,7 +20,7 @@ class HybridGoogleMapsNitroView( 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() diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 37307d3..0193f09 100644 --- a/example/android/app/build.gradle +++ b/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 diff --git a/example/android/app/src/main/java/googlemapsnitro/example/MainActivity.kt b/example/android/app/src/main/java/googlemapsnitro/example/MainActivity.kt index c698ebe..36bf933 100644 --- a/example/android/app/src/main/java/googlemapsnitro/example/MainActivity.kt +++ b/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] diff --git a/example/android/app/src/main/java/googlemapsnitro/example/MainApplication.kt b/example/android/app/src/main/java/googlemapsnitro/example/MainApplication.kt index 9f85ff9..101c86a 100644 --- a/example/android/app/src/main/java/googlemapsnitro/example/MainApplication.kt +++ b/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 diff --git a/example/android/app/src/main/res/values/strings.xml b/example/android/app/src/main/res/values/strings.xml index 76648a7..2bfc6a4 100644 --- a/example/android/app/src/main/res/values/strings.xml +++ b/example/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - GoogleMapsNitroExample + GoogleMapsPlusExample diff --git a/example/android/settings.gradle b/example/android/settings.gradle index a0754c0..4245ebc 100644 --- a/example/android/settings.gradle +++ b/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') diff --git a/example/app.json b/example/app.json index 1628c66..4a119a7 100644 --- a/example/app.json +++ b/example/app.json @@ -1,4 +1,4 @@ { - "name": "GoogleMapsNitroExample", - "displayName": "GoogleMapsNitroExample" + "name": "GoogleMapsPlusExample", + "displayName": "GoogleMapsPlusExample" } diff --git a/example/ios/GoogleMapsNitroExample/Debug.xcconfig b/example/ios/GoogleMapsNitroExample/Debug.xcconfig deleted file mode 100644 index e14a614..0000000 --- a/example/ios/GoogleMapsNitroExample/Debug.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "Pods/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample.debug.xcconfig" -#include "Secrets.xcconfig" diff --git a/example/ios/GoogleMapsNitroExample/Release.xcconfig b/example/ios/GoogleMapsNitroExample/Release.xcconfig deleted file mode 100644 index cceb50c..0000000 --- a/example/ios/GoogleMapsNitroExample/Release.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -#include "Pods/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample.release.xcconfig" -#include "Secrets.xcconfig" diff --git a/example/ios/GoogleMapsNitroExample.xcodeproj/project.pbxproj b/example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj similarity index 82% rename from example/ios/GoogleMapsNitroExample.xcodeproj/project.pbxproj rename to example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj index 12bfbf1..64e6606 100644 --- a/example/ios/GoogleMapsNitroExample.xcodeproj/project.pbxproj +++ b/example/ios/GoogleMapsPlusExample.xcodeproj/project.pbxproj @@ -15,23 +15,23 @@ 50142BCB3C4DD87E00709364 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */; }; 761780ED2CA45674006654EE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 761780EC2CA45674006654EE /* AppDelegate.swift */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; - 89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsNitroExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsNitroExample.framework */; }; + 89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsPlusExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsNitroExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsNitroExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07F961A680F5B00A75B9A /* GoogleMapsNitroExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsNitroExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GoogleMapsNitroExample/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = GoogleMapsNitroExample/Info.plist; sourceTree = ""; }; - 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = GoogleMapsNitroExample/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 1C2CD62B2E2A54A300F92915 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = GoogleMapsNitroExample/Debug.xcconfig; sourceTree = ""; }; - 1C2CD62C2E2A54A300F92915 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = GoogleMapsNitroExample/Release.xcconfig; sourceTree = ""; }; + 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GoogleMapsPlusExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07F961A680F5B00A75B9A /* GoogleMapsPlusExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GoogleMapsPlusExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = GoogleMapsPlusExample/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = GoogleMapsPlusExample/Info.plist; sourceTree = ""; }; + 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PrivacyInfo.xcprivacy; path = GoogleMapsPlusExample/PrivacyInfo.xcprivacy; sourceTree = ""; }; + 1C2CD62B2E2A54A300F92915 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = GoogleMapsPlusExample/Debug.xcconfig; sourceTree = ""; }; + 1C2CD62C2E2A54A300F92915 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = GoogleMapsPlusExample/Release.xcconfig; sourceTree = ""; }; 1CFDC6A32E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; 1CFDC6A62E6CA144005652FB /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = ""; }; - 761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = GoogleMapsNitroExample/AppDelegate.swift; sourceTree = ""; }; - 784D90989C3F0C69A83034D7 /* Pods-GoogleMapsNitroExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsNitroExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample.debug.xcconfig"; sourceTree = ""; }; - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GoogleMapsNitroExample/LaunchScreen.storyboard; sourceTree = ""; }; - CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsNitroExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsNitroExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample.release.xcconfig"; sourceTree = ""; }; + 761780EC2CA45674006654EE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = GoogleMapsPlusExample/AppDelegate.swift; sourceTree = ""; }; + 784D90989C3F0C69A83034D7 /* Pods-GoogleMapsPlusExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.debug.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig"; sourceTree = ""; }; + 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GoogleMapsPlusExample/LaunchScreen.storyboard; sourceTree = ""; }; + CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsPlusExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GoogleMapsPlusExample.release.xcconfig"; path = "Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.release.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -40,14 +40,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsNitroExample.framework in Frameworks */, + 89A7882DE3880107EB2CBBE5 /* Pods_GoogleMapsPlusExample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 13B07FAE1A68108700A75B9A /* GoogleMapsNitroExample */ = { + 13B07FAE1A68108700A75B9A /* GoogleMapsPlusExample */ = { isa = PBXGroup; children = ( 1C2CD62B2E2A54A300F92915 /* Debug.xcconfig */, @@ -60,7 +60,7 @@ 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, 13B07FB81A68108700A75B9A /* PrivacyInfo.xcprivacy */, ); - name = GoogleMapsNitroExample; + name = GoogleMapsPlusExample; sourceTree = ""; }; 1CFDC6A52E6CA144005652FB /* de.lproj */ = { @@ -69,7 +69,7 @@ 1CFDC6A32E6CA144005652FB /* InfoPlist.strings */, ); name = de.lproj; - path = GoogleMapsNitroExample/de.lproj; + path = GoogleMapsPlusExample/de.lproj; sourceTree = ""; }; 1CFDC6A82E6CA144005652FB /* en.lproj */ = { @@ -78,14 +78,14 @@ 1CFDC6A62E6CA144005652FB /* InfoPlist.strings */, ); name = en.lproj; - path = GoogleMapsNitroExample/en.lproj; + path = GoogleMapsPlusExample/en.lproj; sourceTree = ""; }; 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsNitroExample.framework */, + 0F220CF45106F6693F3EE2E0 /* Pods_GoogleMapsPlusExample.framework */, ); name = Frameworks; sourceTree = ""; @@ -100,7 +100,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* GoogleMapsNitroExample */, + 13B07FAE1A68108700A75B9A /* GoogleMapsPlusExample */, 832341AE1AAA6A7D00B99B32 /* Libraries */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, @@ -114,7 +114,7 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* GoogleMapsNitroExample.app */, + 13B07F961A680F5B00A75B9A /* GoogleMapsPlusExample.app */, ); name = Products; sourceTree = ""; @@ -122,8 +122,8 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 784D90989C3F0C69A83034D7 /* Pods-GoogleMapsNitroExample.debug.xcconfig */, - CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsNitroExample.release.xcconfig */, + 784D90989C3F0C69A83034D7 /* Pods-GoogleMapsPlusExample.debug.xcconfig */, + CE69916FEF4DE92FC3CC2A4C /* Pods-GoogleMapsPlusExample.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -131,9 +131,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 13B07F861A680F5B00A75B9A /* GoogleMapsNitroExample */ = { + 13B07F861A680F5B00A75B9A /* GoogleMapsPlusExample */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsNitroExample" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsPlusExample" */; buildPhases = ( 4E15D3C08A668E0F5197AB1A /* [CP] Check Pods Manifest.lock */, 13B07F871A680F5B00A75B9A /* Sources */, @@ -147,9 +147,9 @@ ); dependencies = ( ); - name = GoogleMapsNitroExample; - productName = GoogleMapsNitroExample; - productReference = 13B07F961A680F5B00A75B9A /* GoogleMapsNitroExample.app */; + name = GoogleMapsPlusExample; + productName = GoogleMapsPlusExample; + productReference = 13B07F961A680F5B00A75B9A /* GoogleMapsPlusExample.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -165,7 +165,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoogleMapsNitroExample" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoogleMapsPlusExample" */; compatibilityVersion = "Xcode 15.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -179,7 +179,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* GoogleMapsNitroExample */, + 13B07F861A680F5B00A75B9A /* GoogleMapsPlusExample */, ); }; /* End PBXProject section */ @@ -233,7 +233,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-GoogleMapsNitroExample-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-GoogleMapsPlusExample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -246,15 +246,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-resources.sh\"\n"; showEnvVarsInLog = 0; }; A4CAAB1E58D131C3CE20A532 /* [CP] Embed Pods Frameworks */ = { @@ -263,15 +263,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsNitroExample/Pods-GoogleMapsNitroExample-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -298,7 +298,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; - INFOPLIST_FILE = GoogleMapsNitroExample/Info.plist; + INFOPLIST_FILE = GoogleMapsPlusExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -310,8 +310,8 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = googlemapsnitro.example; - PRODUCT_NAME = GoogleMapsNitroExample; + PRODUCT_BUNDLE_IDENTIFIER = rngooglemapsplus.example; + PRODUCT_NAME = GoogleMapsPlusExample; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -327,7 +327,7 @@ CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = GoogleMapsNitroExample/Info.plist; + INFOPLIST_FILE = GoogleMapsPlusExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -339,8 +339,8 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = googlemapsnitro.example; - PRODUCT_NAME = GoogleMapsNitroExample; + PRODUCT_BUNDLE_IDENTIFIER = rngooglemapsplus.example; + PRODUCT_NAME = GoogleMapsPlusExample; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; @@ -529,7 +529,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsNitroExample" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "GoogleMapsPlusExample" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -538,7 +538,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoogleMapsNitroExample" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "GoogleMapsPlusExample" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/example/ios/GoogleMapsNitroExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsNitroExample.xcscheme b/example/ios/GoogleMapsPlusExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsPlusExample.xcscheme similarity index 80% rename from example/ios/GoogleMapsNitroExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsNitroExample.xcscheme rename to example/ios/GoogleMapsPlusExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsPlusExample.xcscheme index 07ee8d0..9559ce8 100644 --- a/example/ios/GoogleMapsNitroExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsNitroExample.xcscheme +++ b/example/ios/GoogleMapsPlusExample.xcodeproj/xcshareddata/xcschemes/GoogleMapsPlusExample.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "GoogleMapsPlusExample.app" + BlueprintName = "GoogleMapsPlusExample" + ReferencedContainer = "container:GoogleMapsPlusExample.xcodeproj"> @@ -45,9 +45,9 @@ + BuildableName = "GoogleMapsPlusExample.app" + BlueprintName = "GoogleMapsPlusExample" + ReferencedContainer = "container:GoogleMapsPlusExample.xcodeproj"> @@ -62,9 +62,9 @@ + BuildableName = "GoogleMapsPlusExample.app" + BlueprintName = "GoogleMapsPlusExample" + ReferencedContainer = "container:GoogleMapsPlusExample.xcodeproj"> diff --git a/example/ios/GoogleMapsNitroExample.xcworkspace/contents.xcworkspacedata b/example/ios/GoogleMapsPlusExample.xcworkspace/contents.xcworkspacedata similarity index 75% rename from example/ios/GoogleMapsNitroExample.xcworkspace/contents.xcworkspacedata rename to example/ios/GoogleMapsPlusExample.xcworkspace/contents.xcworkspacedata index eceea25..dfcea38 100644 --- a/example/ios/GoogleMapsNitroExample.xcworkspace/contents.xcworkspacedata +++ b/example/ios/GoogleMapsPlusExample.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:GoogleMapsPlusExample.xcodeproj"> diff --git a/example/ios/GoogleMapsNitroExample/AppDelegate.swift b/example/ios/GoogleMapsPlusExample/AppDelegate.swift similarity index 96% rename from example/ios/GoogleMapsNitroExample/AppDelegate.swift rename to example/ios/GoogleMapsPlusExample/AppDelegate.swift index 1445e15..157fcf7 100644 --- a/example/ios/GoogleMapsNitroExample/AppDelegate.swift +++ b/example/ios/GoogleMapsPlusExample/AppDelegate.swift @@ -29,7 +29,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { window = UIWindow(frame: UIScreen.main.bounds) factory.startReactNative( - withModuleName: "GoogleMapsNitroExample", + withModuleName: "GoogleMapsPlusExample", in: window, launchOptions: launchOptions ) diff --git a/example/ios/GoogleMapsPlusExample/Debug.xcconfig b/example/ios/GoogleMapsPlusExample/Debug.xcconfig new file mode 100644 index 0000000..97e2231 --- /dev/null +++ b/example/ios/GoogleMapsPlusExample/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-GoogleMapsPlusExample/Pods-GoogleMapsPlusExample.debug.xcconfig" +#include "Secrets.xcconfig" diff --git a/example/ios/GoogleMapsNitroExample/Images.xcassets/AppIcon.appiconset/Contents.json b/example/ios/GoogleMapsPlusExample/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from example/ios/GoogleMapsNitroExample/Images.xcassets/AppIcon.appiconset/Contents.json rename to example/ios/GoogleMapsPlusExample/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/example/ios/GoogleMapsNitroExample/Images.xcassets/Contents.json b/example/ios/GoogleMapsPlusExample/Images.xcassets/Contents.json similarity index 100% rename from example/ios/GoogleMapsNitroExample/Images.xcassets/Contents.json rename to example/ios/GoogleMapsPlusExample/Images.xcassets/Contents.json diff --git a/example/ios/GoogleMapsNitroExample/Info.plist b/example/ios/GoogleMapsPlusExample/Info.plist similarity index 97% rename from example/ios/GoogleMapsNitroExample/Info.plist rename to example/ios/GoogleMapsPlusExample/Info.plist index 1d981f3..f528e9c 100644 --- a/example/ios/GoogleMapsNitroExample/Info.plist +++ b/example/ios/GoogleMapsPlusExample/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - GoogleMapsNitroExample + GoogleMapsPlusExample CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/example/ios/GoogleMapsNitroExample/LaunchScreen.storyboard b/example/ios/GoogleMapsPlusExample/LaunchScreen.storyboard similarity index 95% rename from example/ios/GoogleMapsNitroExample/LaunchScreen.storyboard rename to example/ios/GoogleMapsPlusExample/LaunchScreen.storyboard index 810f719..8d49bc8 100644 --- a/example/ios/GoogleMapsNitroExample/LaunchScreen.storyboard +++ b/example/ios/GoogleMapsPlusExample/LaunchScreen.storyboard @@ -16,7 +16,7 @@ -