fix: save and apply scan mode and badge names via provider

samruddhi-Rahegaonkar · samruddhi-Rahegaonkar · commit a1e36d3a21e8 · 2025-07-01T10:08:03.000+05:30
diff --git a/lib/bademagic_module/bluetooth/scan_state.dart b/lib/bademagic_module/bluetooth/scan_state.dart
@@ -22,51 +22,54 @@ class ScanState extends NormalBleState {
     StreamSubscription<List<ScanResult>>? subscription;
     toast.showToast("Searching for device...");
 
-    Completer<BleState?> nextStateCompleter = Completer();
+    final Completer<BleState?> nextStateCompleter = Completer();
     bool isCompleted = false;
 
     ScanResult? foundDevice;
 
     try {
       subscription = FlutterBluePlus.scanResults.listen(
         (results) async {
-          if (!isCompleted && results.isNotEmpty) {
-            try {
-              final foundDevice = results.firstWhere(
-                (result) {
-                  final matchesUuid = result.advertisementData.serviceUuids
-                      .contains(Guid("0000fee0-0000-1000-8000-00805f9b34fb"));
-
-                  final deviceName = result.device.name.trim().toLowerCase();
-                  final matchesName = mode == BadgeScanMode.any ||
-                      allowedNames
-                          .map((e) => e.trim().toLowerCase())
-                          .contains(deviceName);
-
-                  return matchesUuid && matchesName;
-                },
-                orElse: () => throw Exception("Matching device not found."),
-              );
-
-              toast.showToast('Device found. Connecting...');
-              isCompleted = true;
-              FlutterBluePlus.stopScan();
-
-              nextStateCompleter.complete(ConnectState(
-                scanResult: foundDevice,
-                manager: manager,
-              ));
-            } catch (e) {
-              logger.w("No matching device found in this scan batch: $e");
-            }
+          if (isCompleted || results.isEmpty) return;
+
+          try {
+            final normalizedAllowedNames = allowedNames
+                .map((e) => e.trim().toLowerCase())
+                .where((e) => e.isNotEmpty)
+                .toList();
+
+            final foundDevice = results.firstWhere(
+              (result) {
+                final matchesUuid = result.advertisementData.serviceUuids
+                    .contains(Guid("0000fee0-0000-1000-8000-00805f9b34fb"));
+
+                final deviceName = result.device.name.trim().toLowerCase();
+                final matchesName = mode == BadgeScanMode.any ||
+                    normalizedAllowedNames.contains(deviceName);
+
+                return matchesUuid && matchesName;
+              },
+              orElse: () => throw Exception("Matching device not found."),
+            );
+
+            isCompleted = true;
+            FlutterBluePlus.stopScan();
+            toast.showToast('Device found. Connecting...');
+
+            nextStateCompleter.complete(ConnectState(
+              scanResult: foundDevice,
+              manager: manager,
+            ));
+          } catch (e) {
+            logger.w("No matching device found in this batch: $e");
           }
         },
         onError: (e) async {
           if (!isCompleted) {
             isCompleted = true;
             logger.e("Scan error: $e");
             toast.showErrorToast('Scan error occurred.');
-            nextStateCompleter.completeError(e);
+            nextStateCompleter.completeError(Exception("Scan error: $e"));
           }
         },
       );
diff --git a/lib/view/badgeScanSettingsWidget.dart b/lib/view/badgeScanSettingsWidget.dart
@@ -1,5 +1,6 @@
 import 'package:badgemagic/providers/BadgeScanProvider.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class BadgeScanSettingsWidget extends StatefulWidget {
   final Function(BadgeScanMode mode, List<String> names) onSave;
@@ -12,8 +13,56 @@ class BadgeScanSettingsWidget extends StatefulWidget {
 }
 
 class _BadgeScanSettingsWidgetState extends State<BadgeScanSettingsWidget> {
-  BadgeScanMode _mode = BadgeScanMode.any;
-  List<String> _badgeNames = ["LED Badge Magic", "LSLED", "VBLAB"];
+  late BadgeScanMode _mode;
+  final List<TextEditingController> _controllers = [];
+
+  @override
+  void initState() {
+    super.initState();
+    final provider = Provider.of<BadgeScanProvider>(context, listen: false);
+    _mode = provider.mode;
+    for (var name in provider.badgeNames) {
+      _controllers.add(TextEditingController(text: name));
+    }
+  }
+
+  void _addBadgeName() {
+    setState(() {
+      _controllers.add(TextEditingController());
+    });
+  }
+
+  void _removeBadgeName(int index) {
+    setState(() {
+      _controllers.removeAt(index).dispose();
+    });
+  }
+
+  void _onSave() {
+    final updatedNames = _controllers
+        .map((c) => c.text.trim())
+        .where((name) => name.isNotEmpty)
+        .toList();
+
+    final provider = Provider.of<BadgeScanProvider>(context, listen: false);
+    provider.setMode(_mode);
+    provider.setBadgeNames(updatedNames);
+
+    ScaffoldMessenger.of(context).showSnackBar(
+      const SnackBar(content: Text('Scan settings saved successfully')),
+    );
+
+    widget.onSave(_mode, updatedNames);
+    Navigator.pop(context);
+  }
+
+  @override
+  void dispose() {
+    for (var c in _controllers) {
+      c.dispose();
+    }
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -23,11 +72,8 @@ class _BadgeScanSettingsWidgetState extends State<BadgeScanSettingsWidget> {
         actions: [
           IconButton(
             icon: const Icon(Icons.save),
-            onPressed: () {
-              widget.onSave(_mode, _badgeNames);
-              Navigator.pop(context);
-            },
-          )
+            onPressed: _onSave,
+          ),
         ],
       ),
       body: Column(
@@ -47,28 +93,24 @@ class _BadgeScanSettingsWidgetState extends State<BadgeScanSettingsWidget> {
           if (_mode == BadgeScanMode.specific)
             Expanded(
               child: ListView.builder(
-                itemCount: _badgeNames.length,
+                itemCount: _controllers.length,
                 itemBuilder: (context, index) {
                   return Row(
                     children: [
                       Expanded(
                         child: Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0),
                           child: TextField(
-                            controller:
-                                TextEditingController(text: _badgeNames[index]),
+                            controller: _controllers[index],
                             decoration: const InputDecoration(
                               labelText: 'Badge Name',
                             ),
-                            onChanged: (val) => _badgeNames[index] = val,
                           ),
                         ),
                       ),
                       IconButton(
                         icon: const Icon(Icons.remove_circle_outline),
-                        onPressed: () {
-                          setState(() => _badgeNames.removeAt(index));
-                        },
+                        onPressed: () => _removeBadgeName(index),
                       ),
                     ],
                   );
@@ -79,7 +121,7 @@ class _BadgeScanSettingsWidgetState extends State<BadgeScanSettingsWidget> {
             Padding(
               padding: const EdgeInsets.all(12.0),
               child: ElevatedButton.icon(
-                onPressed: () => setState(() => _badgeNames.add("")),
+                onPressed: _addBadgeName,
                 icon: const Icon(Icons.add),
                 label: const Text("Add more"),
               ),
diff --git a/lib/view/settings_screen.dart b/lib/view/settings_screen.dart
@@ -3,6 +3,7 @@ import 'package:badgemagic/providers/BadgeScanProvider.dart';
 import 'package:badgemagic/view/widgets/common_scaffold_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
 
 class SettingsScreen extends StatefulWidget {
   const SettingsScreen({super.key});
@@ -15,13 +16,19 @@ class SettingsScreenState extends State<SettingsScreen> {
   String selectedLanguage = 'ENGLISH';
   final List<String> languages = ['ENGLISH', 'CHINESE'];
 
-  BadgeScanMode _scanMode = BadgeScanMode.any;
-  List<String> _badgeNames = ['LSLED', 'VBLAB'];
+  late BadgeScanMode _scanMode;
+  late List<TextEditingController> _controllers;
 
   @override
   void initState() {
-    _setOrientation();
     super.initState();
+    _setOrientation();
+
+    final scanProvider = Provider.of<BadgeScanProvider>(context, listen: false);
+    _scanMode = scanProvider.mode;
+    _controllers = scanProvider.badgeNames
+        .map((name) => TextEditingController(text: name))
+        .toList();
   }
 
   void _setOrientation() {
@@ -31,6 +38,14 @@ class SettingsScreenState extends State<SettingsScreen> {
     ]);
   }
 
+  @override
+  void dispose() {
+    for (final controller in _controllers) {
+      controller.dispose();
+    }
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return CommonScaffold(
@@ -65,47 +80,55 @@ class SettingsScreenState extends State<SettingsScreen> {
               onChanged: (value) => setState(() => _scanMode = value!),
             ),
             if (_scanMode == BadgeScanMode.specific)
-              ..._badgeNames.asMap().entries.map(
-                (entry) {
-                  final index = entry.key;
-                  final name = entry.value;
-                  return Row(
-                    children: [
-                      Expanded(
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 4),
-                          child: TextField(
-                            controller: TextEditingController(text: name),
-                            onChanged: (val) => _badgeNames[index] = val,
-                            decoration: const InputDecoration(
-                              hintText: 'Badge name',
-                              border: OutlineInputBorder(),
-                            ),
+              ..._controllers.asMap().entries.map((entry) {
+                final index = entry.key;
+                final controller = entry.value;
+                return Row(
+                  children: [
+                    Expanded(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 4),
+                        child: TextField(
+                          controller: controller,
+                          decoration: const InputDecoration(
+                            hintText: 'Badge name',
+                            border: OutlineInputBorder(),
                           ),
                         ),
                       ),
-                      IconButton(
-                        icon: const Icon(Icons.remove_circle_outline),
-                        onPressed: () {
-                          setState(() => _badgeNames.removeAt(index));
-                        },
-                      ),
-                    ],
-                  );
-                },
-              ).toList(),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.remove_circle_outline),
+                      onPressed: () {
+                        setState(() {
+                          controller.dispose();
+                          _controllers.removeAt(index);
+                        });
+                      },
+                    ),
+                  ],
+                );
+              }).toList(),
             if (_scanMode == BadgeScanMode.specific)
               TextButton.icon(
-                onPressed: () => setState(() => _badgeNames.add('')),
+                onPressed: () => setState(() {
+                  _controllers.add(TextEditingController());
+                }),
                 icon: const Icon(Icons.add),
                 label: const Text('Add More'),
               ),
             const SizedBox(height: 24),
             ElevatedButton.icon(
               onPressed: () {
-                // Save logic here or pass to Provider
-                print('Scan mode: $_scanMode');
-                print('Badge names: $_badgeNames');
+                final provider =
+                    Provider.of<BadgeScanProvider>(context, listen: false);
+                provider.setMode(_scanMode);
+                provider.setBadgeNames(
+                  _controllers.map((c) => c.text.trim()).toList(),
+                );
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(content: Text('Scan settings saved')),
+                );
               },
               icon: const Icon(Icons.save),
               label: const Text("Save Settings"),
