update flutter and fix some bugs left from removing a provider

Codel1417 · Codel1417 · commit 9733e460cb23 · 2025-11-09T02:38:50.000-05:00
diff --git a/.github/actions/setup_build/action.yml b/.github/actions/setup_build/action.yml
@@ -9,7 +9,7 @@ inputs:
     default: "zulu"
   flutter-version:
     description: "Flutter Version"
-    default: "3.35.3"
+    default: "3.35.7"
   ruby-version:
     description: "Ruby Version"
     default: "3.4"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.3.1
+1.4.0
diff --git a/lib/Backend/Bluetooth/bluetooth_manager.dart b/lib/Backend/Bluetooth/bluetooth_manager.dart
@@ -16,7 +16,7 @@ class KnownDevices with ChangeNotifier {
   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();
+  static final KnownDevices instance = KnownDevices._internal();
 
   KnownDevices._internal() {
     BuiltList<BaseStoredDevice> storedDevices = HiveProxy.getAll<BaseStoredDevice>(devicesBox).toBuiltList();
diff --git a/lib/Backend/Definitions/Device/device_definition.dart b/lib/Backend/Definitions/Device/device_definition.dart
@@ -6,7 +6,6 @@ import 'package:collection/collection.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hive_ce/hive.dart';
 import 'package:tail_app/Backend/dynamic_config.dart';
@@ -22,6 +21,8 @@ part 'device_definition.freezed.dart';
 
 part 'device_definition.g.dart';
 
+/// When adding new gear make sure to update `getNameFromBTName()`
+
 @HiveType(typeId: 6)
 enum DeviceType {
   @HiveField(1)
@@ -32,6 +33,8 @@ enum DeviceType {
   wings,
   @HiveField(4)
   miniTail,
+  @HiveField(5)
+  claws,
 } //TODO extend with icon
 
 @HiveType(typeId: 14)
@@ -82,6 +85,8 @@ extension DeviceTypeExtension on DeviceType {
         return deviceTypeWings();
       case DeviceType.miniTail:
         return deviceTypeMiniTail();
+      case DeviceType.claws:
+        return deviceTypeClawGear();
     }
   }
 
@@ -102,6 +107,18 @@ extension DeviceTypeExtension on DeviceType {
         return Colors.blueAccent;
       case DeviceType.wings:
         return Colors.greenAccent;
+      case DeviceType.claws:
+        return Colors.deepPurpleAccent;
+    }
+  }
+
+  //mainly used to hide claws from the custom moves pages, since usermove/dssp isnt relevent there.
+  bool isHidden() {
+    switch (this) {
+      case DeviceType.claws:
+        return true;
+      default:
+        return false;
     }
   }
 }
@@ -382,6 +399,8 @@ String getNameFromBTName(String bluetoothDeviceName) {
       return 'FlutterWings';
     case '(!)Tail1':
       return 'DigiTail';
+    case 'clawgear':
+      return 'ClawGear';
   }
   return bluetoothDeviceName;
 }
diff --git a/lib/Backend/action_registry.dart b/lib/Backend/action_registry.dart
@@ -16,10 +16,15 @@ part 'action_registry.g.dart';
 
 @immutable
 class ActionRegistry {
-  /// TODO: Changes needed for TAILCoNTROL
-  /// Add DeviceType.ears to CommandAction actions
-  /// Remove legacy EarMoveList and CommandAction.hiddenEars
-  /// Add Ear action aliases
+  static final BuiltSet<BaseAction> clawMoves = {
+    CommandAction(name: "Extend Slow", command: "MOVE1", deviceCategory: [DeviceType.claws], response: "MOVE1 END", uuid: "a373f116-4c0a-4ab7-894d-caedc4e76d1d"),
+    CommandAction(name: "Extend Fast", command: "MOVE2", deviceCategory: [DeviceType.claws], response: "MOVE2 END", uuid: "9446d5a2-7178-4177-ad61-29f7e8980791"),
+    CommandAction(name: "1/2 Extend Slow", command: "MOVE3", deviceCategory: [DeviceType.claws], response: "MOVE3 END", uuid: "2eb1278a-d366-4406-99cd-26710dbd6417"),
+    CommandAction(name: "1/2 Extend Fast", command: "MOVE4", deviceCategory: [DeviceType.claws], response: "MOVE4 END", uuid: "f17a781a-670e-4365-ba4b-18c8f503da56"),
+    CommandAction(name: "Retract Slow", command: "MOVE5", deviceCategory: [DeviceType.claws], response: "MOVE5 END", uuid: "9074fb1f-1526-467e-8a84-a4752d9160f1"),
+    CommandAction(name: "Retract Fast", command: "MOVE6", deviceCategory: [DeviceType.claws], response: "MOVE6 END", uuid: "08d19e6c-fed7-46b5-8c49-e019d74b5ac9"),
+    CommandAction(name: "Rawr", command: "RAWR", deviceCategory: [DeviceType.claws], response: "RAWR END", uuid: "58b5465f-2f1b-492d-9390-ea0d43d2ee90"),
+  }.build();
 
   static final BuiltSet<BaseAction> earMoves = {
     //TailControl only
@@ -175,7 +180,14 @@ 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)
+      .union(clawMoves);
 }
 
 @Riverpod(keepAlive: true)
diff --git a/lib/Backend/app_shortcuts.dart b/lib/Backend/app_shortcuts.dart
@@ -1,6 +1,4 @@
 import 'package:built_collection/built_collection.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quick_actions/quick_actions.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:tail_app/Backend/analytics.dart';
diff --git a/lib/Backend/device_registry.dart b/lib/Backend/device_registry.dart
@@ -21,6 +21,7 @@ class DeviceRegistry {
     BaseDeviceDefinition(uuid: "5fb21175-fef4-448a-a38b-c472d935abab", btName: "minitail", deviceType: DeviceType.miniTail, minVersion: Version(major: 5, minor: 0, patch: 0)),
     BaseDeviceDefinition(uuid: "e790f509-f95b-4eb4-b649-5b43ee1eee9c", btName: "flutter", deviceType: DeviceType.wings, minVersion: Version(major: 5, minor: 0, patch: 0)),
     BaseDeviceDefinition(uuid: "927dee04-ddd4-4582-8e42-69dc9fbfae66", btName: "EG2", deviceType: DeviceType.ears),
+    BaseDeviceDefinition(uuid: "2a5d91c2-16cc-482d-acf0-5b623904f7ae", btName: "clawgear", deviceType: DeviceType.claws),
     BaseDeviceDefinition(uuid: "ba2f2b00-8f65-4cc3-afad-58ba1fccd62d", btName: "EarGear", deviceType: DeviceType.ears, unsupported: true),
   ];
 
@@ -104,9 +105,19 @@ BuiltList<BaseStatefulDevice> getAvailableGearForType(Ref ref, BuiltSet<DeviceTy
 }
 
 @Riverpod()
-BuiltList<BaseStatefulDevice> getKnownGearForType(Ref ref, BuiltSet<DeviceType> deviceTypes) {
-  final BuiltMap<String, BaseStatefulDevice> watch = KnownDevices.instance.state;
-  return watch.values.where((element) => deviceTypes.contains(element.baseDeviceDefinition.deviceType)).toBuiltList();
+class GetKnownGearForType extends _$GetKnownGearForType {
+  @override
+  BuiltList<BaseStatefulDevice> build(BuiltSet<DeviceType> deviceTypes) {
+    KnownDevices.instance
+      ..removeListener(_listener)
+      ..addListener(_listener);
+    final BuiltMap<String, BaseStatefulDevice> watch = KnownDevices.instance.state;
+    return watch.values.where((element) => deviceTypes.contains(element.baseDeviceDefinition.deviceType)).toBuiltList();
+  }
+
+  void _listener() {
+    ref.invalidateSelf();
+  }
 }
 
 @Riverpod(keepAlive: true)
diff --git a/lib/Backend/sensors.dart b/lib/Backend/sensors.dart
@@ -10,7 +10,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_android_volume_keydown/flutter_android_volume_keydown.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart' hide CharacteristicProperties;
-import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:hive_ce/hive.dart';
 import 'package:intl/intl.dart';
@@ -422,6 +421,174 @@ class CoverTriggerDefinition extends TriggerDefinition {
   }
 }
 
+class ClawTiltTriggerDefinition extends TriggerDefinition {
+  List<StreamSubscription<String>?> rxSubscriptions = [];
+
+  ClawTiltTriggerDefinition(super.ref) {
+    super.name = triggerClawTiltModeTitle;
+    super.description = triggerClawTiltModeDescription;
+    super.icon = const Icon(Icons.threed_rotation);
+    super.requiredPermission = null;
+    super.uuid = "664bd073-34cd-4c78-a7da-2b8b44fd9661";
+    super.actionTypes = [
+      TriggerActionDef(name: "Extend", translated: triggerClawTiltModeExtend, uuid: "74728806-c72d-4b52-94c7-f475e80b826b"),
+      TriggerActionDef(name: "Retract", translated: triggerClawTiltModeRetract, uuid: "ca2149c2-86d2-46d7-89b9-508bfab7a29cb"),
+    ];
+  }
+
+  @override
+  Future<bool> isSupported() async {
+    return ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).isNotEmpty;
+  }
+
+  @override
+  Future<void> onDisable() async {
+    KnownDevices.instance.removeListener(onDeviceConnected);
+    ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      element.deviceConnectionState.removeListener(onDeviceConnected);
+    });
+    for (var element in rxSubscriptions) {
+      element?.cancel();
+    }
+    rxSubscriptions = [];
+    ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "STOPTILT", priority: Priority.low, responseMSG: "OK", type: CommandType.system, timestamp: DateTime.now()));
+    });
+  }
+
+  @override
+  Future<void> onEnable() async {
+    if (rxSubscriptions.isNotEmpty) {
+      return;
+    }
+    ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "TILTMODE", responseMSG: "OK", priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+    });
+    // Disable clap trigger when this one enables
+    ref.read(triggerListProvider).where((element) => element.triggerDefUUID == "50d65674-ed4f-4bf5-abd1-e5161faf2a5e").forEach((element) => element.enabled = false);
+    //add listeners on new device paired
+    KnownDevices.instance.addListener(onDeviceConnected);
+  }
+
+  Future<void> onDeviceConnected() async {
+    ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).map((e) {
+      e.deviceConnectionState.removeListener(onDeviceConnected);
+      e.deviceConnectionState.addListener(onDeviceConnected);
+    });
+    listen();
+  }
+
+  Future<void> listen() async {
+    //cancel old subscriptions
+    if (rxSubscriptions.isNotEmpty) {
+      for (var element in rxSubscriptions) {
+        element?.cancel();
+      }
+    }
+    //Store the current streams to keep them open
+    rxSubscriptions = ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).map((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "TILTMODE", responseMSG: "OK", priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+      //TODO: Wire up with the real commands
+      return element.rxCharacteristicStream.listen((msg) {
+        if (msg.contains("TILT UP")) {
+          sendCommands("Extend", ref);
+        }
+        if (msg.contains("TILT DOWN")) {
+          sendCommands("Retract", ref);
+        }
+      });
+    }).toList();
+  }
+}
+
+class ClawClapTriggerDefinition extends TriggerDefinition {
+  List<StreamSubscription<String>?> rxSubscriptions = [];
+
+  ClawClapTriggerDefinition(super.ref) {
+    super.name = triggerClawClapModeTitle;
+    super.description = triggerClawClapModeDescription;
+    super.icon = const Icon(Icons.waving_hand_sharp);
+    super.requiredPermission = null;
+    super.uuid = "50d65674-ed4f-4bf5-abd1-e5161faf2a5e";
+    super.actionTypes = [TriggerActionDef(name: "Clap", translated: triggerClawClapMode, uuid: "6b88bc2a-dea2-435c-88be-7c16df687225")];
+  }
+
+  @override
+  Future<bool> isSupported() async {
+    return ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).isNotEmpty;
+  }
+
+  @override
+  Future<void> onDisable() async {
+    KnownDevices.instance.removeListener(onDeviceConnected);
+    ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      element.deviceConnectionState.removeListener(onDeviceConnected);
+    });
+    for (var element in rxSubscriptions) {
+      element?.cancel();
+    }
+    rxSubscriptions = [];
+    ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "STOPCLAP", priority: Priority.low, responseMSG: "OK", type: CommandType.system, timestamp: DateTime.now()));
+    });
+  }
+
+  @override
+  Future<void> onEnable() async {
+    if (rxSubscriptions.isNotEmpty) {
+      return;
+    }
+    ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).forEach((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "CLAPMODE", responseMSG: "OK", priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+    });
+
+    // Disable claw tilt trigger when this one enables
+    ref.read(triggerListProvider).where((element) => element.triggerDefUUID == "664bd073-34cd-4c78-a7da-2b8b44fd9661").forEach((element) => element.enabled = false);
+
+    //add listeners on new device paired
+    KnownDevices.instance.addListener(onDeviceConnected);
+  }
+
+  Future<void> onDeviceConnected() async {
+    ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.claws]))).map((e) {
+      e.deviceConnectionState.removeListener(onDeviceConnected);
+      e.deviceConnectionState.addListener(onDeviceConnected);
+    });
+    listen();
+  }
+
+  Future<void> listen() async {
+    //cancel old subscriptions
+    if (rxSubscriptions.isNotEmpty) {
+      for (var element in rxSubscriptions) {
+        element?.cancel();
+      }
+    }
+    //Store the current streams to keep them open
+    rxSubscriptions = ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.claws]))).map((element) {
+      ref
+          .read(commandQueueProvider(element).notifier)
+          .addCommand(BluetoothMessage(message: "CLAPMODE", responseMSG: "OK", priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+      return element.rxCharacteristicStream.listen((msg) {
+        if (msg.contains("DOUBLE CLAP")) {
+          // we don't store the actions in class as multiple Triggers can exist, so go get them. This is only necessary when the action is dependent on gear being available
+          sendCommands("Clap", ref);
+        }
+      });
+    }).toList();
+  }
+}
+
 class EarMicTriggerDefinition extends TriggerDefinition {
   List<StreamSubscription<String>?> rxSubscriptions = [];
 
@@ -888,6 +1055,8 @@ class TriggerDefinitionList extends _$TriggerDefinitionList {
       EarTiltTriggerDefinition(ref),
       RandomTriggerDefinition(ref),
       VolumeButtonTriggerDefinition(ref),
+      ClawClapTriggerDefinition(ref),
+      ClawTiltTriggerDefinition(ref),
     ];
 
     triggerDefinitions.sort();
diff --git a/lib/Frontend/Widgets/device_type_widget.dart b/lib/Frontend/Widgets/device_type_widget.dart
@@ -30,9 +30,9 @@ class DeviceTypeWidget extends ConsumerWidget {
             clearable: false,
             value: selected,
             onChanged: onSelectionChanged,
-            itemCount: DeviceType.values.length,
+            itemCount: DeviceType.values.where((element) => !element.isHidden()).length,
             itemBuilder: (state, i) {
-              DeviceType deviceType = DeviceType.values[i];
+              DeviceType deviceType = DeviceType.values.where((element) => !element.isHidden()).toList()[i];
               return ChoiceChip(
                 selectedColor: deviceType.color(),
                 selected: state.selected(deviceType),
diff --git a/lib/Frontend/Widgets/scan_for_new_device.dart b/lib/Frontend/Widgets/scan_for_new_device.dart
@@ -73,7 +73,7 @@ class _ScanForNewDevice extends ConsumerState<ScanForNewDevice> {
                                   }
                                   int code = Random().nextInt(899999) + 100000;
                                   baseStoredDevice.conModePin = code.toString();
-                                  if (KnownDevices.instance.state.containsKey(baseStoredDevice.btMACAddress)) {
+                                  if (!KnownDevices.instance.state.containsKey(baseStoredDevice.btMACAddress)) {
                                     KnownDevices.instance.add(statefulDevice);
                                   }
                                   context.pop();
diff --git a/lib/Frontend/Widgets/tail_blog.dart b/lib/Frontend/Widgets/tail_blog.dart
@@ -12,7 +12,6 @@ import 'package:tail_app/Frontend/Widgets/uwu_text.dart';
 import 'package:wordpress_client/src/responses/properties/media_details.dart';
 import 'package:wordpress_client/wordpress_client.dart' hide Widget;
 
-import '../../constants.dart';
 import '../utils.dart';
 
 part 'tail_blog.freezed.dart';
diff --git a/lib/Frontend/pages/action_selector.dart b/lib/Frontend/pages/action_selector.dart
@@ -12,7 +12,6 @@ import '../../Backend/Definitions/Device/device_definition.dart';
 import '../../Backend/action_registry.dart';
 import '../../constants.dart';
 import '../Widgets/tutorial_card.dart';
-import '../go_router_config.dart';
 import '../translation_string_definitions.dart';
 import '../utils.dart';
 
@@ -26,8 +25,6 @@ abstract class ActionSelectorInfo with _$ActionSelectorInfo {
 class ActionSelector extends ConsumerStatefulWidget {
   const ActionSelector({required this.actionSelectorInfo, super.key});
 
-  static final GlobalKey<NavigatorState> $navigatorKey = rootNavigatorKey;
-
   final ActionSelectorInfo actionSelectorInfo;
 
   @override
diff --git a/lib/Frontend/pages/intro.dart b/lib/Frontend/pages/intro.dart
diff --git a/lib/Frontend/translation_string_definitions.dart b/lib/Frontend/translation_string_definitions.dart
diff --git a/lib/main.dart b/lib/main.dart
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class _ScanForNewDevice extends ConsumerState<ScanForNewDevice> {`
`73`	`73`	`}`
`74`	`74`	`int code = Random().nextInt(899999) + 100000;`
`75`	`75`	`baseStoredDevice.conModePin = code.toString();`
`76`		`- if (KnownDevices.instance.state.containsKey(baseStoredDevice.btMACAddress)) {`
	`76`	`+ if (!KnownDevices.instance.state.containsKey(baseStoredDevice.btMACAddress)) {`
`77`	`77`	`KnownDevices.instance.add(statefulDevice);`
`78`	`78`	`}`
`79`	`79`	`context.pop();`