Clear all hardcoded flutter ble stuff

1 files changed, 7 insertions, 11 deletions

diff --git a/lib/device_scan_select.dart b/lib/device_scan_select.dart
index 7dafe2b..9ed0583 100644
--- a/lib/device_scan_select.dart
+++ b/lib/device_scan_select.dart
@@ -1,5 +1,5 @@
+import 'package:badge/model/device.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 abstract class NotifyingListWidget<T> extends StatefulWidget {
   final List<T> items;
@@ -12,7 +12,7 @@ abstract class NotifyingListWidget<T> extends StatefulWidget {
   });
 }
 
-class DeviceScanSelection extends NotifyingListWidget<ScanResult> {
+class DeviceScanSelection extends NotifyingListWidget<Device> {
   const DeviceScanSelection({
     super.key,
     required super.items,
@@ -33,16 +33,12 @@ class _DeviceScanSelectionState extends State<DeviceScanSelection> {
         itemCount: widget.items.length,
         itemBuilder: (context, index) {
           if (index >= widget.items.length) return null;
-          final ScanResult result = widget.items[index];
-          final String name = firstGiven([
-            result.device.advName,
-            result.device.platformName,
-            "<Unknown>",
-          ]);
+          final Device result = widget.items[index];
+          final String name = result.name ?? "???";
 
           return ListTile(
             title: Text(name),
-            subtitle: Text(result.device.remoteId.str),
+            subtitle: Text(result.address ?? "???"),
             trailing: Text('RSSI: ${result.rssi}'),
             selectedTileColor: Colors.amber,
             selectedColor: Colors.black,
@@ -73,10 +69,10 @@ class _DeviceScanSelectionState extends State<DeviceScanSelection> {
     }
   }
 
-  bool _deviceListEqual(List<ScanResult> oldList, List<ScanResult> newList) {
+  bool _deviceListEqual(List<Device> oldList, List<Device> newList) {
     if (oldList.length != newList.length) return false;
     for (int i = 0; i < oldList.length; i++) {
-      if (oldList[i].device.remoteId != newList[i].device.remoteId) {
+      if (oldList[i].address != newList[i].address) {
         return false;
       }
     }