Move knowndevices away from riverpod

Author: Codel1417

lib/Backend/Bluetooth/bluetooth_manager.dart

@@ -1,22 +1,24 @@
 import 'dart:async';
 
 import 'package:built_collection/built_collection.dart';
+import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart' as log;
-import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../../constants.dart';
 import '../Definitions/Device/device_definition.dart';
 import '../device_registry.dart';
 import '../logging_wrappers.dart';
 
-part 'bluetooth_manager.g.dart';
-
 final log.Logger bluetoothLog = log.Logger('Bluetooth');
 
-@Riverpod(keepAlive: true)
-class KnownDevices extends _$KnownDevices {
-  @override
-  BuiltMap<String, BaseStatefulDevice> build() {
+class KnownDevices with ChangeNotifier {
+  late BuiltMap<String, BaseStatefulDevice> _state;
+  BuiltMap<String, BaseStatefulDevice> get state => _state;
+
+  //https://stackoverflow.com/questions/12649573/how-do-you-build-a-singleton-in-dart
+    static final KnownDevices instance = KnownDevices._internal();
+
+  KnownDevices._internal() {
     BuiltList<BaseStoredDevice> storedDevices = HiveProxy.getAll<BaseStoredDevice>(devicesBox).toBuiltList();
     Map<String, BaseStatefulDevice> results = {};
     try {
@@ -33,32 +35,27 @@ class KnownDevices extends _$KnownDevices {
     } catch (e, s) {
       bluetoothLog.severe("Unable to load stored devices due to $e", e, s);
     }
-    return BuiltMap(results);
+    _state = BuiltMap(results);
   }
 
   Future<void> add(BaseStatefulDevice baseStatefulDevice) async {
-    state = state.rebuild((p0) => p0[baseStatefulDevice.baseStoredDevice.btMACAddress] = baseStatefulDevice);
+    _state = _state.rebuild((p0) => p0[baseStatefulDevice.baseStoredDevice.btMACAddress] = baseStatefulDevice);
     await store();
   }
 
   Future<void> remove(String id) async {
-    state = state.rebuild(
-      (p0) => p0.remove(id),
-    );
+    _state = _state.rebuild((p0) => p0.remove(id));
     await store();
   }
 
   Future<void> store() async {
     await HiveProxy.clear<BaseStoredDevice>(devicesBox);
     await HiveProxy.addAll<BaseStoredDevice>(devicesBox, state.values.map((e) => e.baseStoredDevice));
+    notifyListeners();
   }
 
   Future<void> removeDevGear() async {
-    state = state.rebuild(
-      (p0) => p0.removeWhere(
-        (p0, p1) => p0.contains("DEV"),
-      ),
-    );
+    _state = _state.rebuild((p0) => p0.removeWhere((p0, p1) => p0.contains("DEV")));
     await store();
   }
 }

lib/Backend/Bluetooth/bluetooth_manager_plus.dart

@@ -96,7 +96,7 @@ class InitFlutterBluePlus extends _$InitFlutterBluePlus {
       ref.invalidate(_rSSIChangedProvider);
       ref.invalidate(_onScanResultsProvider);
       // Mark all gear disconnected;
-      ref.read(knownDevicesProvider).forEach((key, value) => value.deviceConnectionState.value = ConnectivityState.disconnected);
+      KnownDevices.instance.state.forEach((key, value) => value.deviceConnectionState.value = ConnectivityState.disconnected);
       isBluetoothEnabled.value = false;
       _didInitFlutterBluePlus = false; // Allow restarting ble stack
     });
@@ -116,7 +116,7 @@ class _MTUChanged extends _$MTUChanged {
 
   void listener(OnMtuChangedEvent event) {
     _bluetoothPlusLogger.info('${event.device.advName} MTU:${event.mtu}');
-    BaseStatefulDevice? statefulDevice = ref.read(knownDevicesProvider)[event.device.remoteId.str];
+    BaseStatefulDevice? statefulDevice = KnownDevices.instance.state[event.device.remoteId.str];
     statefulDevice?.mtu.value = event.mtu;
   }
 }
@@ -137,7 +137,7 @@ class _OnDiscoveredServices extends _$OnDiscoveredServices {
     for (BluetoothService service in event.services) {
       BluetoothUartService? bluetoothUartService = uartServices.firstWhereOrNull((element) => element.bleDeviceService.toLowerCase() == service.serviceUuid.str128.toLowerCase());
       if (bluetoothUartService != null) {
-        BaseStatefulDevice? statefulDevice = ref.read(knownDevicesProvider)[event.device.remoteId.str];
+        BaseStatefulDevice? statefulDevice = KnownDevices.instance.state[event.device.remoteId.str];
         statefulDevice?.bluetoothUartService.value = bluetoothUartService;
       }
       for (BluetoothCharacteristic characteristic in service.characteristics) {
@@ -163,7 +163,7 @@ class _RSSIChanged extends _$RSSIChanged {
 
   void listener(OnReadRssiEvent event) {
     _bluetoothPlusLogger.info('${event.device.advName} RSSI:${event.rssi}');
-    BaseStatefulDevice? statefulDevice = ref.read(knownDevicesProvider)[event.device.remoteId.str];
+    BaseStatefulDevice? statefulDevice = KnownDevices.instance.state[event.device.remoteId.str];
     statefulDevice?.rssi.value = event.rssi;
   }
 }
@@ -180,7 +180,7 @@ class _OnConnectionStateChanged extends _$OnConnectionStateChanged {
 
   Future<void> listener(OnConnectionStateChangedEvent event) async {
     _bluetoothPlusLogger.info('${event.device.advName} ${event.connectionState}');
-    BuiltMap<String, BaseStatefulDevice> knownDevices = ref.read(knownDevicesProvider);
+    BuiltMap<String, BaseStatefulDevice> knownDevices = KnownDevices.instance.state;
     BluetoothDevice bluetoothDevice = event.device;
     BluetoothConnectionState bluetoothConnectionState = event.connectionState;
     String deviceID = bluetoothDevice.remoteId.str;
@@ -200,14 +200,14 @@ class _OnConnectionStateChanged extends _$OnConnectionStateChanged {
       if (statefulDevice.baseStoredDevice.conModePin.isEmpty) {
         int code = Random().nextInt(899999) + 100000;
         baseStoredDevice.conModePin = code.toString();
-        Future(() => ref.read(knownDevicesProvider.notifier).add(statefulDevice));
+        Future(() => KnownDevices.instance.add(statefulDevice));
       }
     } else {
-      baseStoredDevice = BaseStoredDevice(deviceDefinition.uuid, deviceID, deviceDefinition.deviceType.color(ref: ref).toARGB32())..name = getNameFromBTName(deviceDefinition.btName);
+      baseStoredDevice = BaseStoredDevice(deviceDefinition.uuid, deviceID, deviceDefinition.deviceType.color().toARGB32())..name = getNameFromBTName(deviceDefinition.btName);
       int code = Random().nextInt(899999) + 100000;
       baseStoredDevice.conModePin = code.toString();
       statefulDevice = BaseStatefulDevice(deviceDefinition, baseStoredDevice);
-      Future(() => ref.read(knownDevicesProvider.notifier).add(statefulDevice));
+      Future(() => KnownDevices.instance.add(statefulDevice));
     }
     statefulDevice.deviceConnectionState.value = event.connectionState == BluetoothConnectionState.connected ? ConnectivityState.connected : ConnectivityState.disconnected;
     if (bluetoothConnectionState == BluetoothConnectionState.connected) {
@@ -277,7 +277,7 @@ class _OnConnectionStateChanged extends _$OnConnectionStateChanged {
       // if the forget button was used, remove the device
       if (knownDevices[bluetoothDevice.remoteId.str] != null && knownDevices[bluetoothDevice.remoteId.str]!.forgetOnDisconnect) {
         _bluetoothPlusLogger.finer('forgetting about gear');
-        ref.read(knownDevicesProvider.notifier).remove(bluetoothDevice.remoteId.str);
+        KnownDevices.instance.remove(bluetoothDevice.remoteId.str);
         analyticsEvent(name: "Forgetting Gear", props: {"Gear Type": deviceDefinition.btName});
       } else {
         analyticsEvent(name: "Disconnect Gear", props: {"Gear Type": deviceDefinition.btName});
@@ -302,7 +302,7 @@ class _OnCharacteristicReceived extends _$OnCharacteristicReceived {
     BluetoothDevice bluetoothDevice = event.device;
     BluetoothCharacteristic bluetoothCharacteristic = event.characteristic;
     List<int> values = event.value;
-    BaseStatefulDevice? statefulDevice = ref.read(knownDevicesProvider)[bluetoothDevice.remoteId.str];
+    BaseStatefulDevice? statefulDevice = KnownDevices.instance.state[bluetoothDevice.remoteId.str];
     // get Device object
     // set value
     if (statefulDevice == null) {
@@ -400,7 +400,7 @@ class _KeepGearAwake extends _$KeepGearAwake {
   }
 
   void listener(dynamic event) {
-    BuiltMap<String, BaseStatefulDevice> knownDevices = ref.read(knownDevicesProvider);
+    BuiltMap<String, BaseStatefulDevice> knownDevices = KnownDevices.instance.state;
     for (var element in FlutterBluePlus.connectedDevices) {
       BaseStatefulDevice? device = knownDevices[element.remoteId.str];
       if (device != null) {
@@ -437,7 +437,7 @@ class _OnScanResults extends _$OnScanResults {
     if (results.isNotEmpty) {
       ScanResult r = results.last; // the most recently found device
       _bluetoothPlusLogger.info('${r.device.remoteId}: "${r.advertisementData.advName}" found!');
-      BuiltMap<String, BaseStatefulDevice> knownDevices = ref.read(knownDevicesProvider);
+      BuiltMap<String, BaseStatefulDevice> knownDevices = KnownDevices.instance.state;
       if (knownDevices.containsKey(r.device.remoteId.str) &&
           knownDevices[r.device.remoteId.str]?.deviceConnectionState.value == ConnectivityState.disconnected &&
           !knownDevices[r.device.remoteId.str]!.disableAutoConnect) {

lib/Backend/Definitions/Device/device_definition.dart

@@ -85,18 +85,13 @@ extension DeviceTypeExtension on DeviceType {
     }
   }
 
-  Color color({Object? ref}) {
-    if (ref != null && (ref is WidgetRef || ref is Ref)) {
-      Iterable<BaseStatefulDevice> knownDevices = [];
-      if (ref is WidgetRef) {
-        knownDevices = ref.read(knownDevicesProvider).values;
-      } else if (ref is Ref) {
-        knownDevices = ref.read(knownDevicesProvider).values;
-      }
-      int? color = knownDevices.where((element) => element.baseDeviceDefinition.deviceType == this).map((e) => e.baseStoredDevice.color).firstOrNull;
-      if (color != null) {
-        return Color(color);
-      }
+  Color color() {
+    Iterable<BaseStatefulDevice> knownDevices = [];
+    knownDevices = KnownDevices.instance.state.values;
+
+    int? color = knownDevices.where((element) => element.baseDeviceDefinition.deviceType == this).map((e) => e.baseStoredDevice.color).firstOrNull;
+    if (color != null) {
+      return Color(color);
     }
     switch (this) {
       case DeviceType.tail:

lib/Backend/action_registry.dart

@@ -175,20 +175,17 @@ class ActionRegistry {
     CommandAction(name: "Rustles 3", command: "TAILT2", deviceCategory: [DeviceType.wings], response: "TAILT2 END", uuid: "5f7e16e4-04f6-46ab-bbc9-e6f908fc559c"),
     CommandAction(name: "Rustles 4", command: "TAILET", deviceCategory: [DeviceType.wings], response: "TAILET END", uuid: "0dfeb464-572b-452b-be4a-5a36affd2da9"),
   }.build();
-  static final BuiltSet<BaseAction> allCommands = BuiltSet<BaseAction>()
-      .union(glowtipCommands)
-      .union(earMoves)
-      .union(flutterWingsMoves)
-      .union(miniTailMoves)
-      .union(tailMoves)
-      .union(rgbCommands);
+  static final BuiltSet<BaseAction> allCommands = BuiltSet<BaseAction>().union(glowtipCommands).union(earMoves).union(flutterWingsMoves).union(miniTailMoves).union(tailMoves).union(rgbCommands);
 }
 
 @Riverpod(keepAlive: true)
 class GetAvailableActions extends _$GetAvailableActions {
   @override
   BuiltMap<String, BuiltSet<BaseAction>> build() {
-    for (BaseStatefulDevice baseStatefulDevice in ref.watch(knownDevicesProvider).values) {
+    KnownDevices.instance
+      ..removeListener(onDeviceConnected)
+      ..addListener(onDeviceConnected);
+    for (BaseStatefulDevice baseStatefulDevice in KnownDevices.instance.state.values) {
       baseStatefulDevice.hasGlowtip
         ..removeListener(_listener)
         ..addListener(_listener);
@@ -202,6 +199,10 @@ class GetAvailableActions extends _$GetAvailableActions {
     return getState();
   }
 
+  void onDeviceConnected() {
+    ref.invalidateSelf();
+  }
+
   BuiltMap<String, BuiltSet<BaseAction>> getState() {
     Map<String, Set<BaseAction>> sortedActions = {};
     final BuiltMap<String, BuiltSet<BaseAction>> allActions = ref.watch(getAllActionsProvider);