Added my location button toggle

README.md

@@ -617,12 +617,13 @@ enableAccessibilityElements(enabled: boolean) => Promise<void>
 ### enableCurrentLocation(...)
 
 ```typescript
-enableCurrentLocation(enabled: boolean) => Promise<void>
+enableCurrentLocation(enabled: boolean, options: EnableCurrentLocationOptions) => Promise<void>
 ```
 
-| Param         | Type                 |
-| ------------- | -------------------- |
-| **`enabled`** | <code>boolean</code> |
+| Param         | Type                                                                                  |
+| ------------- | ------------------------------------------------------------------------------------- |
+| **`enabled`** | <code>boolean</code>                                                                  |
+| **`options`** | <code><a href="#enablecurrentlocationoptions">EnableCurrentLocationOptions</a></code> |
 
 --------------------
 
@@ -1030,6 +1031,13 @@ Configuration properties for a Google Map Camera
 | **`animationDuration`** | <code>number</code>                       | This configuration option is not being used.                                                                           |                    |
 
 
+#### EnableCurrentLocationOptions
+
+| Prop               | Type                 |
+| ------------------ | -------------------- |
+| **`enableButton`** | <code>boolean</code> |
+
+
 #### MapPadding
 
 Controls for setting padding on the 'visible' region of the view.

plugin/README.md

@@ -618,12 +618,13 @@ enableAccessibilityElements(enabled: boolean) => Promise<void>
 ### enableCurrentLocation(...)
 
 ```typescript
-enableCurrentLocation(enabled: boolean) => Promise<void>
+enableCurrentLocation(enabled: boolean, options: EnableCurrentLocationOptions) => Promise<void>
 ```
 
-| Param         | Type                 |
-| ------------- | -------------------- |
-| **`enabled`** | <code>boolean</code> |
+| Param         | Type                                                                                  |
+| ------------- | ------------------------------------------------------------------------------------- |
+| **`enabled`** | <code>boolean</code>                                                                  |
+| **`options`** | <code><a href="#enablecurrentlocationoptions">EnableCurrentLocationOptions</a></code> |
 
 --------------------
 
@@ -1044,6 +1045,13 @@ Configuration properties for a Google Map Camera
 | **`animationDuration`** | <code>number</code>                       | This configuration option is not being used.                                                                           |                    |
 
 
+#### EnableCurrentLocationOptions
+
+| Prop               | Type                 |
+| ------------------ | -------------------- |
+| **`enableButton`** | <code>boolean</code> |
+
+
 #### MapPadding
 
 Controls for setting padding on the 'visible' region of the view.

plugin/android/src/main/java/com/capacitorjs/plugins/googlemaps/CapacitorGoogleMap.kt

@@ -45,7 +45,7 @@ class CapacitorGoogleMap(
     private val markers = HashMap<String, CapacitorGoogleMapMarker>()
     private val polygons = HashMap<String, CapacitorGoogleMapsPolygon>()
     private val circles = HashMap<String, CapacitorGoogleMapsCircle>()
-    private val polylines = HashMap<String, CapacitorGoogleMapPolyline>()        
+    private val polylines = HashMap<String, CapacitorGoogleMapPolyline>()
     private val markerIcons = HashMap<String, Bitmap>()
     private var clusterManager: ClusterManager<CapacitorGoogleMapMarker>? = null
 
@@ -310,7 +310,7 @@ class CapacitorGoogleMap(
                     }
                     val googleMapPolyline = googleMap?.addPolyline(polylineOptions.await())
                     googleMapPolyline?.tag = it.tag
-                    
+
                     it.googleMapsPolyline = googleMapPolyline
 
                     polylines[googleMapPolyline!!.id] = it
@@ -636,11 +636,12 @@ class CapacitorGoogleMap(
     }
 
     @SuppressLint("MissingPermission")
-    fun enableCurrentLocation(enabled: Boolean, callback: (error: GoogleMapsError?) -> Unit) {
+    fun enableCurrentLocation(enabled: Boolean, enableButton: Boolean, callback: (error: GoogleMapsError?) -> Unit) {
         try {
             googleMap ?: throw GoogleMapNotAvailable()
             CoroutineScope(Dispatchers.Main).launch {
                 googleMap?.isMyLocationEnabled = enabled
+                googleMap?.uiSettings?.isMyLocationButtonEnabled = enableButton
                 callback(null)
             }
         } catch (e: GoogleMapsError) {
@@ -739,7 +740,7 @@ class CapacitorGoogleMap(
 
         return polygonOptions
     }
-    
+
     private fun buildPolyline(line: CapacitorGoogleMapPolyline): PolylineOptions {
         val polylineOptions = PolylineOptions()
         polylineOptions.width(line.strokeWidth * this.config.devicePixelRatio)

plugin/android/src/main/java/com/capacitorjs/plugins/googlemaps/CapacitorGoogleMapsPlugin.kt

@@ -1017,7 +1017,9 @@ class CapacitorGoogleMapsPlugin : Plugin(), OnMapsSdkInitializedCallback {
             val enabled =
                     call.getBoolean("enabled") ?: throw InvalidArgumentsError("enabled is missing")
 
-            map.enableCurrentLocation(enabled) { err ->
+            val enableButton = call.getBoolean("enableButton") ?: false
+
+            map.enableCurrentLocation(enabled, enableButton) { err ->
                 if (err != null) {
                     throw err
                 }

plugin/ios/Plugin/CapacitorGoogleMapsPlugin.swift

@@ -686,8 +686,10 @@ public class CapacitorGoogleMapsPlugin: CAPPlugin, GMSMapViewDelegate {
             if enabled && checkLocationPermission() != "granted" {
                 throw GoogleMapErrors.permissionsDeniedLocation
             }
+
+            let enableButton = call.getBool("enableButton") ?? false
 
-            try map.enableCurrentLocation(enabled: enabled)
+            try map.enableCurrentLocation(enabled: enabled, enableButton: enableButton)
 
             call.resolve()
         } catch {

plugin/ios/Plugin/Map.swift

@@ -455,9 +455,10 @@ public class Map {
         }
     }
 
-    func enableCurrentLocation(enabled: Bool) throws {
+    func enableCurrentLocation(enabled: Bool, enableButton: Bool) throws {
         DispatchQueue.main.sync {
             self.mapViewController.GMapView.isMyLocationEnabled = enabled
+            self.mapViewController.GMapView.settings.myLocationButton = enableButton
         }
     }
 

plugin/src/definitions.ts

@@ -458,6 +458,10 @@ export interface CircleClickCallbackData {
   tag?: string;
 }
 
+export interface EnableCurrentLocationOptions {
+  enableButton?: boolean;
+}
+
 export interface MyLocationButtonClickCallbackData {
   mapId: string;
 }

plugin/src/implementation.ts

@@ -135,6 +135,7 @@ export interface PaddingArgs {
 export interface CurrentLocArgs {
   id: string;
   enabled: boolean;
+  enableButton: boolean;
 }
 export interface AddMarkersArgs {
   id: string;

plugin/src/map.ts

@@ -1,7 +1,7 @@
 import { Capacitor } from '@capacitor/core';
 import type { PluginListenerHandle } from '@capacitor/core';
 
-import type {
+import {
   CameraConfig,
   Marker,
   MapPadding,
@@ -19,6 +19,7 @@ import type {
   CircleClickCallbackData,
   Polyline,
   PolylineCallbackData,
+  EnableCurrentLocationOptions,
 } from './definitions';
 import { LatLngBounds, MapType } from './definitions';
 import type { CreateMapArgs } from './implementation';
@@ -55,7 +56,7 @@ export interface GoogleMapInterface {
   enableIndoorMaps(enabled: boolean): Promise<void>;
   enableTrafficLayer(enabled: boolean): Promise<void>;
   enableAccessibilityElements(enabled: boolean): Promise<void>;
-  enableCurrentLocation(enabled: boolean): Promise<void>;
+  enableCurrentLocation(enabled: boolean, options: EnableCurrentLocationOptions): Promise<void>;
   setPadding(padding: MapPadding): Promise<void>;
   /**
    * Get the map's current viewport latitude and longitude bounds.
@@ -532,12 +533,14 @@ export class GoogleMap {
    * Set whether the My Location dot and accuracy circle is enabled.
    *
    * @param enabled
+   * @param options
    * @returns
    */
-  async enableCurrentLocation(enabled: boolean): Promise<void> {
+  async enableCurrentLocation(enabled: boolean, options: EnableCurrentLocationOptions = {}): Promise<void> {
     return CapacitorGoogleMaps.enableCurrentLocation({
       id: this.id,
       enabled,
+      enableButton: options.enableButton ?? false,
     });
   }