capacitor-google-navigation 0.0.3 → 0.0.5

package/README.md

@@ -134,8 +134,8 @@ startNavigation({ lat, lng, travelMode })
     ↓  fires onRouteChanged on recalculation
 stopNavigation()
     ↓  ends guidance, clears destination
-showNavigationView({ show: false })
-    ↓  dismisses native map, restores app UI
+showNavigationView({ show: false })  — or user taps the ✕ close button
+    ↓  dismisses native map, fires onNavigationClosed, restores app UI
 ```
 
 ---
@@ -154,9 +154,10 @@ interface UseNavigationOptions {
   apiKey: string;
   onArrival?: (event: any) => void;
   onRouteChanged?: () => void;
+  onNavigationClosed?: () => void;
 }
 
-export function useGoogleNavigation({ apiKey, onArrival, onRouteChanged }: UseNavigationOptions) {
+export function useGoogleNavigation({ apiKey, onArrival, onRouteChanged, onNavigationClosed }: UseNavigationOptions) {
   const listeners = useRef<PluginListenerHandle[]>([]);
 
   useEffect(() => {
@@ -176,6 +177,11 @@ export function useGoogleNavigation({ apiKey, onArrival, onRouteChanged }: UseNa
         listeners.current.push(h);
       }
 
+      if (onNavigationClosed) {
+        const h = await GoogleNavigation.addListener('onNavigationClosed', onNavigationClosed);
+        listeners.current.push(h);
+      }
+
       await GoogleNavigation.initialize({ apiKey });
     };
 
@@ -232,6 +238,7 @@ const NavigationPage: React.FC = () => {
     apiKey: import.meta.env.VITE_GOOGLE_NAV_API_KEY as string,
     onArrival: () => setShowArrival(true),
     onRouteChanged: () => console.log('Route recalculated'),
+    onNavigationClosed: () => console.log('User closed navigation'),
   });
 
   return (
@@ -301,6 +308,11 @@ const routeHandle = await GoogleNavigation.addListener('onRouteChanged', () => {
   console.log('Route recalculated');
 });
 
+const closedHandle = await GoogleNavigation.addListener('onNavigationClosed', () => {
+  // Fired when the user taps the ✕ close button on the native navigation view
+  console.log('Navigation closed by user');
+});
+
 // 2. Initialize the SDK (fires onNavigationReady when done)
 await GoogleNavigation.initialize({ apiKey: 'YOUR_API_KEY' });
 
@@ -400,14 +412,14 @@ Show/hide navigation view
 ### addListener(...)
 
 ```typescript
-addListener(eventName: 'onArrival' | 'onRouteChanged' | 'onNavigationReady', listenerFunc: (event: any) => void) => Promise<PluginListenerHandle>
+addListener(eventName: 'onArrival' | 'onRouteChanged' | 'onNavigationReady' | 'onNavigationClosed', listenerFunc: (event: any) => void) => Promise<PluginListenerHandle>
 ```
 
 Add listener for navigation events
 
 | Param              | Type                                                              |
 | ------------------ | ----------------------------------------------------------------- |
-| **`eventName`**    | <code>'onArrival' \| 'onRouteChanged' \| 'onNavigationReady'</code> |
+| **`eventName`**    | <code>'onArrival' \| 'onRouteChanged' \| 'onNavigationReady' \| 'onNavigationClosed'</code> |
 | **`listenerFunc`** | <code>(event: any) =&gt; void</code>                              |
 
 **Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
@@ -446,6 +458,7 @@ Remove all listeners
 | `onNavigationReady` | `{}` | SDK has initialized and the navigator is available |
 | `onArrival` | `{ latitude, longitude, title }` | User arrives at the destination waypoint |
 | `onRouteChanged` | `{}` | The route is recalculated (traffic, missed turn, etc.) |
+| `onNavigationClosed` | `{}` | User tapped the ✕ close button on the native navigation view (iOS) |
 
 ---
 

package/android/src/main/java/com/attributeai/navigation/GoogleNavigation.java

@@ -118,6 +118,10 @@ public class GoogleNavigation {
         }
 
         NavigationFragment fragment = NavigationFragment.newInstance();
+        fragment.setOnCloseListener(() -> {
+            fm.beginTransaction().remove(fragment).commitAllowingStateLoss();
+            plugin.fireEvent("onNavigationClosed", new JSObject());
+        });
         fm.beginTransaction()
             .add(android.R.id.content, fragment, FRAGMENT_TAG)
             .commitAllowingStateLoss();

package/android/src/main/java/com/attributeai/navigation/NavigationFragment.java

@@ -1,9 +1,15 @@
 package com.attributeai.navigation;
 
+import android.graphics.Color;
+import android.graphics.Typeface;
 import android.os.Bundle;
+import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -19,11 +25,16 @@ import com.google.android.libraries.navigation.NavigationView;
 public class NavigationFragment extends Fragment {
 
     private NavigationView navigationView;
+    private Runnable onCloseListener;
 
     public static NavigationFragment newInstance() {
         return new NavigationFragment();
     }
 
+    public void setOnCloseListener(Runnable listener) {
+        this.onCloseListener = listener;
+    }
+
     @Nullable
     @Override
     public View onCreateView(
@@ -33,7 +44,37 @@ public class NavigationFragment extends Fragment {
     ) {
         navigationView = new NavigationView(requireContext());
         navigationView.onCreate(savedInstanceState);
-        return navigationView;
+
+        FrameLayout root = new FrameLayout(requireContext());
+        root.addView(navigationView, new FrameLayout.LayoutParams(
+            FrameLayout.LayoutParams.MATCH_PARENT,
+            FrameLayout.LayoutParams.MATCH_PARENT
+        ));
+
+        Button closeButton = new Button(requireContext());
+        closeButton.setText("✕");
+        closeButton.setTextColor(Color.WHITE);
+        closeButton.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        closeButton.setTypeface(null, Typeface.BOLD);
+        closeButton.setBackgroundColor(Color.argb(153, 0, 0, 0)); // 60% black
+        closeButton.setOnClickListener(v -> {
+            if (onCloseListener != null) onCloseListener.run();
+        });
+
+        int sizePx = (int) TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, 40, getResources().getDisplayMetrics()
+        );
+        int marginPx = (int) TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics()
+        );
+
+        FrameLayout.LayoutParams btnParams = new FrameLayout.LayoutParams(sizePx, sizePx);
+        btnParams.gravity = Gravity.TOP | Gravity.START;
+        btnParams.topMargin = marginPx;
+        btnParams.leftMargin = marginPx;
+        root.addView(closeButton, btnParams);
+
+        return root;
     }
 
     @Override

package/ios/Sources/GoogleNavigationPlugin/GoogleNavigation.swift

@@ -49,6 +49,14 @@ import GoogleNavigation
 
                 let mapVC = NavigationMapViewController(session: session)
                 mapVC.modalPresentationStyle = .fullScreen
+                mapVC.onDismiss = { [weak self] in
+                    guard let self = self else { return }
+                    self.navigationSession?.navigator?.remove(self)
+                    self.navigationSession?.isStarted = false
+                    self.navigationSession = nil
+                    self.mapViewController = nil
+                    self.plugin?.notifyListeners("onNavigationClosed", data: [:])
+                }
                 self.mapViewController = mapVC
 
                 presentingVC.present(mapVC, animated: true) {
@@ -101,7 +109,19 @@ import GoogleNavigation
                 self?.mapViewController?.setCameraFollowing()
                 completion(true, nil)
             } else {
-                completion(false, "Route calculation failed: \(routeStatus.rawValue)")
+                let reason: String
+                switch routeStatus {
+                case .apiKeyNotAuthorized:  reason = "API key not authorized for Navigation SDK"
+                case .networkError:         reason = "Network error — check internet connection"
+                case .noRouteFound:         reason = "No route found to destination"
+                case .locationUnavailable:  reason = "Location unavailable — check permissions"
+                case .quotaExceeded:        reason = "API quota exceeded"
+                case .waypointError:        reason = "Invalid waypoint coordinates"
+                case .travelModeUnsupported: reason = "Travel mode not supported"
+                case .canceled:             reason = "Route request was canceled"
+                default:                    reason = "Unknown error (code \(routeStatus.rawValue))"
+                }
+                completion(false, "Route calculation failed: \(reason)")
             }
         }
     }

package/ios/Sources/GoogleNavigationPlugin/NavigationViewController.swift

@@ -5,6 +5,7 @@ import GoogleNavigation
 class NavigationMapViewController: UIViewController {
     private let session: GMSNavigationSession
     private var mapView: GMSMapView?
+    var onDismiss: (() -> Void)?
 
     init(session: GMSNavigationSession) {
         self.session = session
@@ -15,18 +16,48 @@ class NavigationMapViewController: UIViewController {
         fatalError("init(coder:) not supported")
     }
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-
+    override func loadView() {
         let options = GMSMapViewOptions()
-        options.frame = view.bounds
+        options.frame = UIScreen.main.bounds
         let mapView = GMSMapView(options: options)
-        mapView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        view.addSubview(mapView)
         self.mapView = mapView
+        self.view = mapView
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        guard let mapView = mapView else { return }
+        let enabled = mapView.enableNavigation(with: session)
+        if enabled {
+            mapView.cameraMode = .following
+        }
+
+        addCloseButton()
+    }
+
+    private func addCloseButton() {
+        let button = UIButton(type: .system)
+        button.setImage(UIImage(systemName: "xmark"), for: .normal)
+        button.tintColor = .white
+        button.backgroundColor = UIColor.black.withAlphaComponent(0.6)
+        button.layer.cornerRadius = 20
+        button.translatesAutoresizingMaskIntoConstraints = false
+        button.addTarget(self, action: #selector(closeTapped), for: .touchUpInside)
+        view.addSubview(button)
+
+        NSLayoutConstraint.activate([
+            button.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor, constant: 16),
+            button.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 16),
+            button.widthAnchor.constraint(equalToConstant: 40),
+            button.heightAnchor.constraint(equalToConstant: 40)
+        ])
+    }
 
-        _ = mapView.enableNavigation(with: session)
-        mapView.cameraMode = .following
+    @objc private func closeTapped() {
+        dismiss(animated: true) { [weak self] in
+            self?.onDismiss?()
+        }
     }
 
     func setCameraFollowing() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-google-navigation",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Google maps turn by turn navigation for capcitor",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",