capacitor-google-navigation 0.0.7 → 0.0.8

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

@@ -1,5 +1,6 @@
 package com.attributeai.navigation;
 
+import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
@@ -25,6 +26,7 @@ import com.google.android.libraries.navigation.NavigationView;
 public class NavigationFragment extends Fragment {
 
     private NavigationView navigationView;
+    private Button closeButton;
     private Runnable onCloseListener;
 
     public static NavigationFragment newInstance() {
@@ -44,57 +46,29 @@ public class NavigationFragment extends Fragment {
     ) {
         navigationView = new NavigationView(requireContext());
         navigationView.onCreate(savedInstanceState);
-
-        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
-    public void onStart() {
-        super.onStart();
-        if (navigationView != null) navigationView.onStart();
+        return navigationView;
     }
 
     @Override
     public void onResume() {
         super.onResume();
         if (navigationView != null) navigationView.onResume();
+        attachCloseButtonToDecorView();
     }
 
     @Override
     public void onPause() {
+        detachCloseButtonFromDecorView();
         if (navigationView != null) navigationView.onPause();
         super.onPause();
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (navigationView != null) navigationView.onStart();
+    }
+
     @Override
     public void onStop() {
         if (navigationView != null) navigationView.onStop();
@@ -103,6 +77,7 @@ public class NavigationFragment extends Fragment {
 
     @Override
     public void onDestroyView() {
+        detachCloseButtonFromDecorView();
         if (navigationView != null) navigationView.onDestroy();
         super.onDestroyView();
     }
@@ -112,4 +87,51 @@ public class NavigationFragment extends Fragment {
         super.onSaveInstanceState(outState);
         if (navigationView != null) navigationView.onSaveInstanceState(outState);
     }
+
+    // MARK: - Close button attached to the Activity decor view, above all SDK UI
+
+    private void attachCloseButtonToDecorView() {
+        Activity activity = getActivity();
+        if (activity == null || closeButton != null) return;
+
+        int sizePx = (int) TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, 40, getResources().getDisplayMetrics()
+        );
+        int marginPx = (int) TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics()
+        );
+        int statusBarHeight = getStatusBarHeight(activity);
+
+        Button button = new Button(requireContext());
+        button.setText("✕");
+        button.setTextColor(Color.WHITE);
+        button.setTextSize(TypedValue.COMPLEX_UNIT_SP, 16);
+        button.setTypeface(null, Typeface.BOLD);
+        button.setBackgroundColor(Color.argb(153, 0, 0, 0));
+        button.setOnClickListener(v -> {
+            if (onCloseListener != null) onCloseListener.run();
+        });
+
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(sizePx, sizePx);
+        params.gravity = Gravity.TOP | Gravity.START;
+        params.topMargin = statusBarHeight + marginPx;
+        params.leftMargin = marginPx;
+
+        ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        decorView.addView(button, params);
+        this.closeButton = button;
+    }
+
+    private void detachCloseButtonFromDecorView() {
+        Activity activity = getActivity();
+        if (activity == null || closeButton == null) return;
+        ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        decorView.removeView(closeButton);
+        closeButton = null;
+    }
+
+    private int getStatusBarHeight(Activity activity) {
+        int resourceId = activity.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        return resourceId > 0 ? activity.getResources().getDimensionPixelSize(resourceId) : 0;
+    }
 }

package/ios/Sources/GoogleNavigationPlugin/NavigationViewController.swift

@@ -5,6 +5,7 @@ import GoogleNavigation
 class NavigationMapViewController: UIViewController {
     private let session: GMSNavigationSession
     private var mapView: GMSMapView?
+    private var overlayWindow: UIWindow?
     var onDismiss: (() -> Void)?
 
     init(session: GMSNavigationSession) {
@@ -26,18 +27,41 @@ class NavigationMapViewController: UIViewController {
         container.addSubview(mapView)
         self.mapView = mapView
 
-        // Overlay sits above the map and all Google-rendered UI
-        let overlay = UIView()
-        overlay.translatesAutoresizingMaskIntoConstraints = false
-        overlay.isUserInteractionEnabled = true
-        overlay.backgroundColor = .clear
-        container.addSubview(overlay)
-        NSLayoutConstraint.activate([
-            overlay.topAnchor.constraint(equalTo: container.topAnchor),
-            overlay.bottomAnchor.constraint(equalTo: container.bottomAnchor),
-            overlay.leadingAnchor.constraint(equalTo: container.leadingAnchor),
-            overlay.trailingAnchor.constraint(equalTo: container.trailingAnchor),
-        ])
+        self.view = container
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        guard let mapView = mapView else { return }
+        let enabled = mapView.enableNavigation(with: session)
+        if enabled {
+            mapView.cameraMode = .following
+        }
+    }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        addCloseButtonWindow()
+    }
+
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        tearDownCloseButtonWindow()
+    }
+
+    // MARK: - Close button in a top-level UIWindow above all SDK UI
+
+    private func addCloseButtonWindow() {
+        guard let scene = view.window?.windowScene else { return }
+
+        let window = UIWindow(windowScene: scene)
+        window.windowLevel = .alert + 1
+        window.backgroundColor = .clear
+        window.isHidden = false
+
+        let overlayVC = UIViewController()
+        overlayVC.view.backgroundColor = .clear
+        window.rootViewController = overlayVC
 
         let button = UIButton(type: .system)
         button.setImage(UIImage(systemName: "xmark"), for: .normal)
@@ -46,27 +70,25 @@ class NavigationMapViewController: UIViewController {
         button.layer.cornerRadius = 20
         button.translatesAutoresizingMaskIntoConstraints = false
         button.addTarget(self, action: #selector(closeTapped), for: .touchUpInside)
-        overlay.addSubview(button)
+        overlayVC.view.addSubview(button)
+
         NSLayoutConstraint.activate([
-            button.topAnchor.constraint(equalTo: overlay.safeAreaLayoutGuide.topAnchor, constant: 16),
-            button.leadingAnchor.constraint(equalTo: overlay.leadingAnchor, constant: 16),
+            button.topAnchor.constraint(equalTo: overlayVC.view.safeAreaLayoutGuide.topAnchor, constant: 16),
+            button.leadingAnchor.constraint(equalTo: overlayVC.view.leadingAnchor, constant: 16),
             button.widthAnchor.constraint(equalToConstant: 40),
             button.heightAnchor.constraint(equalToConstant: 40),
         ])
 
-        self.view = container
+        self.overlayWindow = window
     }
 
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        guard let mapView = mapView else { return }
-        let enabled = mapView.enableNavigation(with: session)
-        if enabled {
-            mapView.cameraMode = .following
-        }
+    private func tearDownCloseButtonWindow() {
+        overlayWindow?.isHidden = true
+        overlayWindow = nil
     }
 
     @objc private func closeTapped() {
+        tearDownCloseButtonWindow()
         dismiss(animated: true) { [weak self] in
             self?.onDismiss?()
         }

package/package.json

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