Clearer Bluetooth required message when trying to connect / no scan button if BLE is disabled

Author: MrAlders0n

android/local.properties

@@ -2,4 +2,4 @@ sdk.dir=/opt/homebrew/share/android-commandlinetools
 flutter.sdk=/opt/homebrew/share/flutter
 flutter.buildMode=release
 flutter.versionName=1.0.0
-flutter.versionCode=1769747121
+flutter.versionCode=1

lib/providers/app_state_provider.dart

@@ -89,6 +89,10 @@ class AppStateProvider extends ChangeNotifier {
   String? _connectionError;
   bool _isAuthError = false;  // Track if connection failed due to auth
 
+  // Bluetooth adapter state (on/off)
+  BluetoothAdapterState _bluetoothAdapterState = BluetoothAdapterState.unknown;
+  StreamSubscription? _adapterStateSubscription;
+
   // GPS state
   GpsStatus _gpsStatus = GpsStatus.permissionDenied;
   Position? _currentPosition;
@@ -194,6 +198,9 @@ class AppStateProvider extends ChangeNotifier {
   ConnectionStep get connectionStep => _connectionStep;
   String? get connectionError => _connectionError;
   bool get isAuthError => _isAuthError;
+  BluetoothAdapterState get bluetoothAdapterState => _bluetoothAdapterState;
+  bool get isBluetoothOn => _bluetoothAdapterState == BluetoothAdapterState.on;
+  bool get isBluetoothOff => _bluetoothAdapterState == BluetoothAdapterState.off;
   GpsStatus get gpsStatus => _gpsStatus;
   Position? get currentPosition => _currentPosition;
   DeviceModel? get deviceModel => _deviceModel;
@@ -380,6 +387,20 @@ class AppStateProvider extends ChangeNotifier {
     // Set device ID for API
     _apiService.setDeviceId(_deviceId);
 
+    // Listen to Bluetooth adapter state changes (on/off)
+    _adapterStateSubscription = _bluetoothService.adapterStateStream.listen((state) {
+      final previousState = _bluetoothAdapterState;
+      _bluetoothAdapterState = state;
+
+      if (state != previousState) {
+        debugLog('[BLE] Adapter state changed: $state');
+
+        // If Bluetooth was turned off while connected, the BLE disconnect handler
+        // will take care of session cleanup via connectionStream
+        notifyListeners();
+      }
+    });
+
     // Listen to Bluetooth connection changes
     _bluetoothService.connectionStream.listen((status) async {
       _connectionStatus = status;
@@ -2541,6 +2562,7 @@ class AppStateProvider extends ChangeNotifier {
 
   @override
   void dispose() {
+    _adapterStateSubscription?.cancel();
     _logRxDataSubscription?.cancel();
     _noiseFloorSubscription?.cancel();
     _batterySubscription?.cancel();

lib/screens/connection_screen.dart

@@ -77,9 +77,11 @@ class _ConnectionScreenState extends State<ConnectionScreen> with WidgetsBinding
 
     // Build FAB for scanning - only show when fully disconnected and idle
     // Hide FAB entirely during maintenance mode (maintenance UI has its own buttons)
+    // Hide FAB when Bluetooth is off (shows full-screen message instead)
     Widget? fab;
     if (appState.connectionStep == ConnectionStep.disconnected &&
-        (!appState.maintenanceMode || appState.offlineMode)) {
+        (!appState.maintenanceMode || appState.offlineMode) &&
+        !appState.isBluetoothOff) {
       // Offline mode bypasses both zone and maintenance checks
       final canScan = appState.offlineMode || appState.inZone == true;
       fab = isLandscape
@@ -806,8 +808,9 @@ class _ConnectionScreenState extends State<ConnectionScreen> with WidgetsBinding
   }) {
     final isLandscape = MediaQuery.of(context).orientation == Orientation.landscape;
 
-    return SingleChildScrollView(
-      child: Center(
+    // Use Center with CustomScrollView for both vertical centering and scroll capability
+    return Center(
+      child: SingleChildScrollView(
         child: Padding(
           padding: EdgeInsets.all(isLandscape ? 16 : 32),
           child: Column(
@@ -930,6 +933,24 @@ class _ConnectionScreenState extends State<ConnectionScreen> with WidgetsBinding
       );
     }
 
+    // Show Bluetooth off message (takes priority over zone checks)
+    if (appState.isBluetoothOff) {
+      return Column(
+        children: [
+          _buildZoneStatusBar(context, appState),
+          Expanded(
+            child: _buildMessageContent(
+              context: context,
+              icon: Icons.bluetooth_disabled,
+              iconColor: Colors.red.withValues(alpha: 0.7),
+              title: 'Bluetooth is Off',
+              message: 'Please enable Bluetooth to scan for MeshCore devices.',
+            ),
+          ),
+        ],
+      );
+    }
+
     // Show onboarding message when outside zone (but NOT when offline mode is enabled)
     if (appState.inZone == false && !appState.offlineMode) {
       return Column(

lib/services/bluetooth/bluetooth_service.dart

@@ -29,6 +29,16 @@ class DiscoveredDevice {
   String toString() => 'DiscoveredDevice($name, $id, rssi=$rssi)';
 }
 
+/// Bluetooth adapter state
+enum BluetoothAdapterState {
+  unknown,
+  on,
+  off,
+  turningOn,
+  turningOff,
+  unavailable,
+}
+
 /// Abstract Bluetooth service interface
 /// Platform implementations provided by MobileBluetoothService and WebBluetoothService
 abstract class BluetoothService {
@@ -38,6 +48,9 @@ abstract class BluetoothService {
   /// Stream of received data from device
   Stream<Uint8List> get dataStream;
 
+  /// Stream of Bluetooth adapter state changes (on/off)
+  Stream<BluetoothAdapterState> get adapterStateStream;
+
   /// Current connection status
   ConnectionStatus get connectionStatus;
 

lib/services/bluetooth/mobile_bluetooth.dart

@@ -63,6 +63,26 @@ class MobileBluetoothService implements BluetoothService {
     return _dataController!.stream;
   }
 
+  @override
+  Stream<BluetoothAdapterState> get adapterStateStream {
+    return fbp.FlutterBluePlus.adapterState.map((state) {
+      switch (state) {
+        case fbp.BluetoothAdapterState.on:
+          return BluetoothAdapterState.on;
+        case fbp.BluetoothAdapterState.off:
+          return BluetoothAdapterState.off;
+        case fbp.BluetoothAdapterState.turningOn:
+          return BluetoothAdapterState.turningOn;
+        case fbp.BluetoothAdapterState.turningOff:
+          return BluetoothAdapterState.turningOff;
+        case fbp.BluetoothAdapterState.unavailable:
+          return BluetoothAdapterState.unavailable;
+        default:
+          return BluetoothAdapterState.unknown;
+      }
+    });
+  }
+
   @override
   ConnectionStatus get connectionStatus => _connectionStatus;
 

lib/services/bluetooth/web_bluetooth.dart

@@ -29,6 +29,14 @@ class WebBluetoothService implements BluetoothService {
   @override
   Stream<Uint8List> get dataStream => _dataController.stream;
 
+  @override
+  Stream<BluetoothAdapterState> get adapterStateStream {
+    // Web Bluetooth availability stream (true = available, false = not available)
+    return _webBluetooth.isAvailable.map((available) {
+      return available ? BluetoothAdapterState.on : BluetoothAdapterState.off;
+    });
+  }
+
   @override
   ConnectionStatus get connectionStatus => _connectionStatus;