v2.2.0: Fix floating window sizing and state synchronization

- Fix overlay size calculation to use physical pixels instead of scaled logical pixels
- Add proper state synchronization between main app and overlay for close events
- Improve overlay close button functionality with bidirectional communication
- Add comprehensive debug output for screen size analysis
- Update overlay visual tweaks (close button sizing, speed display improvements)

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

.claude/settings.local.json

@@ -15,7 +15,8 @@
       "Bash(powershell:*)",
       "WebFetch(domain:docs.anthropic.com)",
       "WebSearch",
-      "WebFetch(domain:pub.dev)"
+      "WebFetch(domain:pub.dev)",
+      "Bash(git commit:*)"
     ],
     "defaultMode": "acceptEdits"
   },

CLAUDE.md

@@ -25,21 +25,29 @@ A customizable Flutter GPS speedometer app targeting Android devices, emphasizin
 
 ### Technical Stack
 ```
-Dependencies: geolocator, permission_handler, provider, shared_preferences, flutter_material_color_picker
+Dependencies: geolocator, permission_handler, provider, shared_preferences, flutter_material_color_picker, flutter_overlay_window
 Platforms: Android (primary), iOS support included but untested
 Architecture: Provider + Consumer pattern for reactive state management
-Permissions: Location services with graceful degradation
+Permissions: Location services + SYSTEM_ALERT_WINDOW for overlay functionality
 ```
 
 ## Recent Updates (v2.1.0)
 
-### ✅ Completed Features
+### ✅ Completed Features (Master Branch - Stable)
-- [x] **Floating Window Overlay**: System-level overlay window for persistent speed display
+- [x] **Split Decimal Display**: Main speed prominent with smaller, faded decimal fraction for better readability
-- [x] **Split Decimal Display**: Main speed prominent, decimal fraction smaller and faded
+- [x] **Optimized Content Sizing**: Maximized readability with improved responsive layout and flex ratios
-- [x] **Optimized Content Sizing**: Maximized readability with improved flex ratios
+- [x] **Basic Floating Window**: Simple overlay with "GPS SPEEDO" text and close button (stable implementation)
-- [x] **Navigation Icon Trigger**: Tap compass area to launch floating window
+- [x] **Navigation Icon Trigger**: Tap compass/navigation area to launch floating window overlay
-- [x] **Multiple Close Options**: Overlay close button and long-press navigation area
+- [x] **Multiple Close Options**: Overlay close button and long-press navigation area for easy dismissal
-- [x] **Android Permissions**: SYSTEM_ALERT_WINDOW and foreground service support
+- [x] **Android System Integration**: SYSTEM_ALERT_WINDOW permissions and foreground service configuration
+
+### 🚧 Work in Progress Features (dev/floating-window-wip Branch - Seriously Buggy)
+- [ ] **Advanced Floating Window Overlay**: System-level overlay with live GPS data - basic functionality works but seriously buggy
+  - GPS data synchronization implemented but unreliable
+  - Theme/unit sync between main app and overlay works partially
+  - Proportional sizing and positioning needs major refinement
+  - Close button functionality works but overlay behavior inconsistent
+  - Performance may impact main app, needs optimization
 
 ### Previous Updates (v1.1)
 - [x] **Portrait/Landscape Support**: Automatic orientation detection implemented  
@@ -48,10 +56,19 @@ Permissions: Location services with graceful degradation
 
 ## TODO - Future Improvements
 
-### Critical Issues
+### Known Issues
-- [ ] **Dependency Updates**: Update 10 packages to latest compatible versions
+
+**Master Branch (v2.1.0 - Stable):**
+- [ ] **Dependency Updates**: Update packages to latest compatible versions
 - [ ] **Orientation Override**: Fix auto-rotate to work regardless of system toggle status
 
+**Dev Branch (floating-window-wip - Seriously Buggy):**
+- [ ] **Floating Window Reliability**: Overlay behavior inconsistent across different devices and Android versions
+- [ ] **GPS Data Sync**: Real-time GPS synchronization between main app and overlay unreliable
+- [ ] **Theme/Unit Sync**: Setting synchronization works partially but not consistently
+- [ ] **Overlay Positioning**: Poor positioning stability, sizing calculations need major work
+- [ ] **Performance**: Overlay may impact main app performance, needs optimization
+
 ### UI/UX Enhancements
 - [ ] **Background Customization**: Custom background color selection
 - [ ] **Interface Rearrangement**: User-defined layout customization
@@ -74,6 +91,11 @@ Permissions: Location services with graceful degradation
 - **Memory**: Project uses automatic Claude Code memory - this file for major decisions only
 - **Git**: Active repository at `https://github.com/mikkelimatlock/gps_speedo`
 
+## Branch Strategy
+- **master**: Stable releases, ready for production APK builds
+- **dev/floating-window-wip**: Advanced floating window development (seriously buggy, not for release)
+- Tagged releases: v2.1.0 on master branch contains stable basic floating window
+
 ## Code Patterns to Maintain
 - Provider pattern for state management
 - Separate widgets for reusability  

lib/main.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:flutter/foundation.dart'; // For kDebugMode
 import 'dart:async';
 import 'package:geolocator/geolocator.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -9,6 +9,13 @@ import 'gps_service.dart';
 import 'color_themes.dart';
 import 'dart:math' as math; // Import for math.pi
 
+// Debug helper - only prints in debug builds
+void customDebugPrint(String message) {
+  if (kDebugMode) {
+    print(message);
+  }
+}
+
 void main() {
   runApp(const SpeedoApp());
 }
@@ -16,57 +23,10 @@ void main() {
 // Entry point for overlay window
 @pragma("vm:entry-point")
 void overlayMain() {
-  runApp(MaterialApp(
+  customDebugPrint('[Overlay] 🚀 overlayMain() called');
+  runApp(const MaterialApp(
     debugShowCheckedModeBanner: false,
-    home: Scaffold(
+    home: OverlaySpeedometer(),
-      backgroundColor: Colors.transparent,
-      body: Container(
-        width: 180,
-        height: 100,
-        decoration: BoxDecoration(
-          color: Colors.black.withOpacity(0.8),
-          borderRadius: BorderRadius.circular(12),
-          border: Border.all(color: Colors.green.withOpacity(0.7), width: 2),
-        ),
-        child: Stack(
-          children: [
-            const Center(
-              child: Text(
-                'GPS\nSPEEDO',
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  color: Colors.green, 
-                  fontSize: 16,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-            // Close button
-            Positioned(
-              top: 4,
-              right: 4,
-              child: GestureDetector(
-                onTap: () => FlutterOverlayWindow.closeOverlay(),
-                child: Container(
-                  width: 24,
-                  height: 24,
-                  decoration: BoxDecoration(
-                    color: Colors.red.withOpacity(0.8),
-                    borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: Colors.white, width: 1),
-                  ),
-                  child: const Icon(
-                    Icons.close,
-                    color: Colors.white,
-                    size: 16,
-                  ),
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    ),
   ));
 }
 
@@ -107,6 +67,28 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
   StreamSubscription<Position>? _positionSubscription;
   String _errorMessage = '';
   bool _isInBackground = false;
+  bool _isOverlayActive = false;
+  
+  // Single source of truth for overlay sizing
+  Map<String, int> _getOverlaySize() {
+    final window = WidgetsBinding.instance.platformDispatcher.views.first;
+    final physicalSize = window.physicalSize;
+    final devicePixelRatio = window.devicePixelRatio;
+    final systemSize = physicalSize / devicePixelRatio;
+    
+    customDebugPrint('[Main] 🔍 Screen size analysis:');
+    customDebugPrint('  physicalSize: ${physicalSize.width.round()}x${physicalSize.height.round()}');
+    customDebugPrint('  devicePixelRatio: $devicePixelRatio');
+    customDebugPrint('  calculated systemSize: ${systemSize.width.round()}x${systemSize.height.round()}');
+    
+    // Use actual physical pixels, not scaled logical pixels
+    final overlayWidth = (physicalSize.width * 0.4).round(); // 40% of actual screen width
+    final overlayHeight = (overlayWidth * 0.6).round();
+    
+    customDebugPrint('  using fixed overlay size: ${overlayWidth}x${overlayHeight}');
+    
+    return {'width': overlayWidth, 'height': overlayHeight};
+  }
 
   @override
   void initState() {
@@ -114,6 +96,18 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
     WidgetsBinding.instance.addObserver(this);
     _initializeGps();
     _enableWakelock();
+    _listenToOverlayMessages();
+  }
+  
+  void _listenToOverlayMessages() {
+    FlutterOverlayWindow.overlayListener.listen((data) {
+      if (data is Map && data['action'] == 'overlayClosed') {
+        customDebugPrint('[Main] 📡 Received overlay close notification');
+        setState(() {
+          _isOverlayActive = false;
+        });
+      }
+    });
   }
 
   Future<void> _enableWakelock() async {
@@ -157,8 +151,6 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
 
   void _handleBackgroundTransition() {
     // When app goes to background, show floating window if GPS is active and no error
-    print('App went to background, checking conditions for floating window...');
-    print('Speed: $_speed, Error: $_errorMessage');
     // Temporarily disable auto-trigger for debugging
     // if (_speed >= 0 && _errorMessage.isEmpty) {
     //   _showFloatingWindow();
@@ -200,29 +192,71 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
       _heading = position.heading;
       _errorMessage = '';
     });
+    
+    // Push display data to overlay if active
+    _pushDataToOverlay();
+  }
+  
+  void _pushDataToOverlay() {
+    // Send complete display data to overlay including screen size
+    final displaySpeed = _currentUnit.convert(_speed);
+    final speedText = displaySpeed < 1.0 ? '--' : displaySpeed.toInt().toString();
+    final headingText = GpsService.formatHeading(_heading);
+    
+    customDebugPrint('[Main] 📤 SENDING to overlay:');
+    customDebugPrint('  speedText: "$speedText"');
+    customDebugPrint('  headingText: "$headingText"');
+    customDebugPrint('  direction: ${_heading.toStringAsFixed(1)}°');
+    customDebugPrint('  unit: ${_currentUnit.label}, theme: $_currentThemeIndex');
+    
+    FlutterOverlayWindow.shareData({
+      'action': 'updateDisplay',
+      'speedText': speedText,
+      'headingText': headingText,
+      'heading': _heading,
+      'unitIndex': _currentUnit.index,
+      'themeIndex': _currentThemeIndex,
+    });
   }
 
   void _cycleUnit() {
     setState(() {
       _currentUnit = _currentUnit.next;
     });
+    // Push updated display data to overlay
+    _pushDataToOverlay();
   }
 
   void _cycleTheme() {
     setState(() {
       _currentThemeIndex = ColorThemes.getNextThemeIndex(_currentThemeIndex);
     });
+    // Push updated display data to overlay
+    _pushDataToOverlay();
   }
 
   Future<void> _showFloatingWindow() async {
     try {
-      // Share current unit with overlay
+      // Use centralized sizing function
+      final overlaySize = _getOverlaySize();
+      
+      // Send initial display data WITH size info (only needed on creation)
+      final displaySpeed = _currentUnit.convert(_speed);
+      final speedText = displaySpeed < 1.0 ? '--' : displaySpeed.toInt().toString();
+      final headingText = GpsService.formatHeading(_heading);
+      
       await FlutterOverlayWindow.shareData({
-        'action': 'updateUnit',
+        'action': 'updateDisplay',
+        'speedText': speedText,
+        'headingText': headingText,
+        'heading': _heading,
         'unitIndex': _currentUnit.index,
+        'themeIndex': _currentThemeIndex,
+        'overlayWidth': overlaySize['width']!.toDouble(),
+        'overlayHeight': overlaySize['height']!.toDouble(),
       });
 
-      // Show the overlay with safer positioning
+      // Show the overlay with proportional sizing based on system resolution
       await FlutterOverlayWindow.showOverlay(
         enableDrag: true,
         overlayTitle: "GPS Speedometer",
@@ -230,19 +264,34 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
         flag: OverlayFlag.defaultFlag,
         visibility: NotificationVisibility.visibilityPublic,
         positionGravity: PositionGravity.none,
-        width: 180,
+        // Use consistent sizing from centralized function
-        height: 100,
+        width: overlaySize['width']!,
+        height: overlaySize['height']!,
       );
+      
+      customDebugPrint('[Main] 🟢 OVERLAY LAUNCHED - Size: ${overlaySize['width']}x${overlaySize['height']}');
+      setState(() {
+        _isOverlayActive = true;
+      });
     } catch (e) {
-      print('Error showing floating window: $e');
+      // Silent error handling - floating window issues shouldn't crash main app
     }
   }
 
   Future<void> _closeFloatingWindow() async {
+    if (!_isOverlayActive) {
+      customDebugPrint('[Main] ⚠️  No overlay to close');
+      return;
+    }
+    
     try {
       await FlutterOverlayWindow.closeOverlay();
+      customDebugPrint('[Main] 🔴 OVERLAY CLOSED - Requested from main app');
+      setState(() {
+        _isOverlayActive = false;
+      });
     } catch (e) {
-      print('Error closing floating window: $e');
+      customDebugPrint('[Main] ❌ Error closing overlay: $e');
     }
   }
   
@@ -327,7 +376,7 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
       children: [
         // Speed area - takes most space, precise tap targets on text only
         Expanded(
-          flex: 7,
+          flex: 65,
           child: Container(
             width: double.infinity,
             color: Colors.transparent,
@@ -382,10 +431,20 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
         ),
         // Compass area - compact but fully tappable for floating window
         Expanded(
-          flex: 3,
+          flex: 32,
           child: GestureDetector(
-            onTap: _showFloatingWindow, // Tap navigation icon to show floating window
+            onTap: () {
-            onLongPress: _closeFloatingWindow, // Long press to close floating window
+              customDebugPrint('[Main] 🖱️  Navigation area tapped - overlay active: $_isOverlayActive');
+              if (_isOverlayActive) {
+                _closeFloatingWindow();
+              } else {
+                _showFloatingWindow();
+              }
+            },
+            onLongPress: () {
+              customDebugPrint('[Main] 🖱️  Navigation area long-pressed - overlay active: $_isOverlayActive');
+              _closeFloatingWindow();
+            },
             child: Container(
               width: double.infinity,
               color: Colors.transparent,
@@ -457,7 +516,11 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
                   )
                 else ...[
                   Flexible(
-                    flex: 4,
+                    flex: 1,
+                    child: FittedBox(),
+                  ),
+                  Flexible(
+                    flex: 20,
                     child: GestureDetector(
                       onTap: _cycleTheme,
                       child: FittedBox(
@@ -467,7 +530,7 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
                     ),
                   ),
                   Flexible(
-                    flex: 1,
+                    flex: 7,
                     child: GestureDetector(
                       onTap: _cycleUnit,
                       child: FittedBox(
@@ -483,6 +546,10 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
                       ),
                     ),
                   ),
+                  Flexible(
+                    flex: 5,
+                    child: FittedBox(),
+                  ),
                 ],
               ],
             ),
@@ -492,8 +559,18 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
         Expanded(
           flex: 33,
           child: GestureDetector(
-            onTap: _showFloatingWindow,
+            onTap: () {
-            onLongPress: _closeFloatingWindow, // Long press to close floating window
+              customDebugPrint('[Main] 🖱️  Navigation area tapped (landscape) - overlay active: $_isOverlayActive');
+              if (_isOverlayActive) {
+                _closeFloatingWindow();
+              } else {
+                _showFloatingWindow();
+              }
+            },
+            onLongPress: () {
+              customDebugPrint('[Main] 🖱️  Navigation area long-pressed (landscape) - overlay active: $_isOverlayActive');
+              _closeFloatingWindow();
+            },
             child: Container(
               height: double.infinity,
               color: Colors.transparent,
@@ -539,77 +616,221 @@ class _SpeedometerScreenState extends State<SpeedometerScreen> with WidgetsBindi
   }
 }
 
-class SimpleOverlaySpeedometer extends StatelessWidget {
+class OverlaySpeedometer extends StatefulWidget {
-  const SimpleOverlaySpeedometer({super.key});
+  const OverlaySpeedometer({super.key});
+
+  @override
+  State<OverlaySpeedometer> createState() => _OverlaySpeedometerState();
+}
+
+class _OverlaySpeedometerState extends State<OverlaySpeedometer> {
+  String _speedText = '--';
+  String _headingText = 'N/A';
+  double _heading = -1.0;
+  int _currentThemeIndex = 0;
+  double _systemScreenWidth = 400;
+  double _overlayWidth = 280;
+  double _overlayHeight = 140;
+
+  @override
+  void initState() {
+    super.initState();
+    customDebugPrint('[Overlay] 🟢 CREATED - Floating window initialized');
+    _getSystemScreenSize();
+    _listenToMainAppMessages();
+  }
+
+  void _getSystemScreenSize() {
+    try {
+      // Get actual system screen resolution, not just app window size
+      final window = WidgetsBinding.instance.platformDispatcher.views.first;
+      final physicalSize = window.physicalSize;
+      final devicePixelRatio = window.devicePixelRatio;
+      final systemSize = physicalSize / devicePixelRatio;
+      
+      customDebugPrint('[Overlay] 🔍 Screen detection:');
+      customDebugPrint('  physicalSize: ${physicalSize.width.round()}x${physicalSize.height.round()}');
+      customDebugPrint('  devicePixelRatio: $devicePixelRatio');
+      customDebugPrint('  calculated systemSize: ${systemSize.width.round()}x${systemSize.height.round()}');
+      
+      setState(() {
+        _systemScreenWidth = systemSize.width;
+      });
+      
+      customDebugPrint('[Overlay] ✅ _systemScreenWidth set to: ${_systemScreenWidth.round()}');
+    } catch (e) {
+      customDebugPrint('[Overlay] ❌ Error getting system screen size: $e');
+      // Fallback to reasonable default
+      setState(() {
+        _systemScreenWidth = 400;
+      });
+    }
+  }
+
+  void _listenToMainAppMessages() {
+    FlutterOverlayWindow.overlayListener.listen((data) {
+      if (data is Map && data['action'] == 'updateDisplay') {
+        setState(() {
+          _speedText = data['speedText'] ?? '--';
+          _headingText = data['headingText'] ?? 'N/A';
+          _heading = data['heading']?.toDouble() ?? -1.0;
+          _currentThemeIndex = data['themeIndex'] ?? 0;
+          // Update screen size and overlay dimensions if provided by main app
+          if (data.containsKey('systemScreenWidth')) {
+            _systemScreenWidth = data['systemScreenWidth']?.toDouble() ?? _systemScreenWidth;
+          }
+          if (data.containsKey('overlayWidth')) {
+            _overlayWidth = data['overlayWidth']?.toDouble() ?? _overlayWidth;
+          }
+          if (data.containsKey('overlayHeight')) {
+            _overlayHeight = data['overlayHeight']?.toDouble() ?? _overlayHeight;
+          }
+        });
+        
+        customDebugPrint('[Overlay] 📡 UPDATE received:');
+        customDebugPrint('  speedText: "$_speedText"');
+        customDebugPrint('  headingText: "$_headingText"'); 
+        customDebugPrint('  direction: ${_heading.toStringAsFixed(1)}°');
+        customDebugPrint('  themeIndex: $_currentThemeIndex');
+        customDebugPrint('  systemScreenWidth: ${_systemScreenWidth.round()}');
+        customDebugPrint('  overlaySize from main: ${_overlayWidth.round()}x${_overlayHeight.round()}');
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    customDebugPrint('[Overlay] 🔴 DESTROYED - Floating window disposed');
+    // No GPS subscription to cancel - overlay is display-only
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
-    print("SimpleOverlaySpeedometer build() called");
+    final currentTheme = ColorThemes.getTheme(_currentThemeIndex);
+    
+    // Use overlay dimensions provided by main app (not calculated locally)
+    final fontSize = (_overlayWidth * 0.2); // Font size proportional to actual overlay width
+    
+    customDebugPrint('[Overlay] 📐 Window size: ${_overlayWidth.round()}x${_overlayHeight.round()}, fontSize: ${fontSize.round()}');
+
     return Material(
       color: Colors.transparent,
-      child: Container(
+      child: SizedBox(
-        width: 200,
+        // Use SizedBox to fill the overlay window completely
-        height: 120,
+        width: double.infinity,
-        decoration: BoxDecoration(
+        height: double.infinity,
-          color: Colors.red.withOpacity(0.9), // Highly visible red background
+        child: Container(
-          borderRadius: BorderRadius.circular(16),
+          decoration: BoxDecoration(
-          border: Border.all(color: Colors.yellow, width: 3), // Bright yellow border
+            color: currentTheme.background.withOpacity(0.85),
-        ),
+            borderRadius: BorderRadius.circular(12),
-        child: Stack(
+            border: Border.all(
-          children: [
+              color: currentTheme.speedText.withOpacity(0.3), 
-            // Test content - much more visible
+              width: 1
-            Center(
+            ),
-              child: Column(
+          ),
-                mainAxisAlignment: MainAxisAlignment.center,
+          child: Stack(
+            children: [
+              // Main content - landscape layout (1:1 flex as per NOTES.txt)
+              Row(
                 children: [
-                  const Text(
+                  // Speed section - left half
-                    'FLOATING',
+                  Expanded(
-                    style: TextStyle(
+                    flex: 1,
-                      fontSize: 20,
+                    child: Container(
-                      fontWeight: FontWeight.bold,
+                      padding: const EdgeInsets.all(8),
-                      color: Colors.white,
+                      child: Center(
+                        child: FittedBox(
+                          fit: BoxFit.contain,
+                          child: Text(
+                            (_speedText == "--" ? "0" : _speedText),
+                            style: TextStyle(
+                              fontSize: fontSize,
+                              fontWeight: FontWeight.w300,
+                              color: currentTheme.speedText,
+                              fontFamily: 'DIN1451Alt',
+                            ),
+                          ),
+                        ),
+                      ),
                     ),
                   ),
-                  const Text(
+                  // Direction section - right half (same as full-screen behavior)
-                    'WINDOW',
+                  Expanded(
-                    style: TextStyle(
+                    flex: 1,
-                      fontSize: 16,
+                    child: Container(
-                      fontWeight: FontWeight.bold,
+                      padding: const EdgeInsets.all(8),
-                      color: Colors.yellow,
+                      child: Column(
-                    ),
+                        mainAxisAlignment: MainAxisAlignment.center,
-                  ),
+                        children: [
-                  const Text(
+                          Flexible(
-                    'WORKING!',
+                            flex: 2,
-                    style: TextStyle(
+                            child: Transform.rotate(
-                      fontSize: 12,
+                              angle: (_heading >= 0 && _heading < 360) ? (_heading * math.pi / 180.0) : 0,
-                      color: Colors.white,
+                              child: FittedBox(
+                                fit: BoxFit.contain,
+                                child: Icon(
+                                  Icons.navigation,
+                                  size: fontSize * 0.8,
+                                  color: currentTheme.headingText,
+                                ),
+                              ),
+                            ),
+                          ),
+                          Flexible(
+                            flex: 1,
+                            child: FittedBox(
+                              fit: BoxFit.contain,
+                              child: Text(
+                                _headingText,
+                                style: TextStyle(
+                                  fontSize: fontSize * 0.4,
+                                  color: currentTheme.headingText,
+                                  fontFamily: 'DIN1451Alt',
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
                   ),
                 ],
               ),
-            ),
+              // Semi-transparent close button (only interaction as per NOTES.txt)
-            // Close button
+              Positioned(
-            Positioned(
+                top: 4,
-              top: 2,
+                right: 4,
-              right: 2,
+                child: GestureDetector(
-              child: GestureDetector(
+                  onTap: () {
-                onTap: () => FlutterOverlayWindow.closeOverlay(),
+                    customDebugPrint('[Overlay] 🔴 Close button tapped');
-                child: Container(
+                    // Notify main app that overlay is closing
-                  width: 20,
+                    FlutterOverlayWindow.shareData({
-                  height: 20,
+                      'action': 'overlayClosed',
-                  decoration: BoxDecoration(
+                    });
-                    color: Color.fromARGB(255, 255, 171, 16), // call the current background colour defined as in `color_themes.dart`
+                    FlutterOverlayWindow.closeOverlay();
-                    borderRadius: BorderRadius.circular(10),
+                  },
-                  ),
+                  child: Container(
-                  child: const Icon(
+                    width: 18,
-                    Icons.close,
+                    height: 18, // fixed
-                    color: Colors.white,
+                    decoration: BoxDecoration(
-                    size: 12,
+                      color: Colors.transparent,
+                      borderRadius: BorderRadius.circular(_overlayHeight * 0.1),
+                      border: Border.all(
+                        color: currentTheme.speedTextSub.withOpacity(0.9),
+                        width: 1
+                      ),
+                    ),
+                    child: Icon(
+                      Icons.close,
+                      color: currentTheme.speedText.withOpacity(0.9),
+                      size: 15,
+                    ),
                   ),
                 ),
               ),
-            ),
+            ],
-          ],
+          ),
         ),
       ),
     );

pubspec.yaml

@@ -2,7 +2,7 @@ name: gps_speedo
 description: "Speedo - A Flutter application."
 publish_to: 'none'
 
-version: 2.1.0+2
+version: 2.2.0+1
 
 environment:
   sdk: ^3.9.0