update android build tools

Codel1417 · Codel1417 · commit 6316aa5a04d7 · 2025-03-11T19:14:03.000-04:00
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -21,7 +21,7 @@ plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "io.sentry.android.gradle" version "5.2.0" apply false
     id "org.jetbrains.kotlin.android" version "2.1.10" apply false
-    id "com.android.application" version '8.7.3' apply false
+    id "com.android.application" version '8.8.1' apply false
     id 'com.google.gms.google-services' version '4.4.2' apply false
 
 }
diff --git a/lib/Backend/sensors.dart b/lib/Backend/sensors.dart
@@ -32,6 +32,7 @@ import 'logging_wrappers.dart';
 import 'move_lists.dart';
 
 part 'sensors.freezed.dart';
+
 part 'sensors.g.dart';
 
 final sensorsLogger = log.Logger('Sensors');
@@ -201,16 +202,24 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
   }
 
   Future<void> sendCommands(String name, Ref ref) async {
-    if (ref.read(getAvailableGearProvider).isEmpty) {
+    if (ref
+        .read(getAvailableGearProvider)
+        .isEmpty) {
       return;
     }
-    actions.values.flattened.where((e) => actionTypes.firstWhere((element) => element.name == name).uuid == e.uuid).forEach(
-      (TriggerAction triggerAction) async {
+    actions.values.flattened.where((e) =>
+    actionTypes
+        .firstWhere((element) => element.name == name)
+        .uuid == e.uuid).forEach(
+          (TriggerAction triggerAction) async {
         if (triggerAction.isActive.value || triggerAction.actions.isEmpty) {
           // 15 second cool-down between moves
           return;
         }
-        final List<BaseAction> allActionsMapped = triggerAction.actions.map((element) => ref.read(getActionFromUUIDProvider(element))).nonNulls.toList();
+        final List<BaseAction> allActionsMapped = triggerAction.actions
+            .map((element) => ref.read(getActionFromUUIDProvider(element)))
+            .nonNulls
+            .toList();
 
         // no moves exist
         if (allActionsMapped.isEmpty) {
@@ -222,20 +231,20 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
             .read(getAvailableIdleGearForTypeProvider([DeviceType.ears].toBuiltSet()))
             .where(
               (p0) => p0.isTailCoNTROL.value == TailControlStatus.legacy,
-            )
+        )
             .isNotEmpty;
         bool hasGlowtipGear = ref
             .read(getAvailableIdleGearProvider)
             .where(
               (p0) => p0.hasGlowtip.value == GlowtipStatus.glowtip,
-            )
+        )
             .isNotEmpty;
         final List<BaseAction> moveActions = allActionsMapped
             .where((element) => !const [ActionCategory.glowtip, ActionCategory.audio].contains(element.actionCategory))
             .whereNot(
-              // filter out legacy moves if legacy ears are not connected
+          // filter out legacy moves if legacy ears are not connected
               (element) => (element is EarsMoveList && !hasLegacyEars),
-            )
+        )
             .toList();
 
         final List<BaseAction> glowActions = hasGlowtipGear ? allActionsMapped.where((element) => const [ActionCategory.glowtip].contains(element.actionCategory)).toList() : [];
@@ -266,7 +275,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
           // The goal here is if a user selects multiple moves, send a move to all gear
           final Set<DeviceType> baseActionDeviceCategories = baseAction.deviceCategory.where(
             // filtering out the first actions ears entry if its a unified move but legacy gear is connected
-            (element) {
+                (element) {
               if (element == DeviceType.ears) {
                 if (baseAction is CommandAction) {
                   return hasLegacyEars;
@@ -278,7 +287,7 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
           final Set<DeviceType> missingGearAction = flattenedDeviceTypes.difference(baseActionDeviceCategories);
           final List<BaseAction> remainingActions = moveActions.where(
             // Check if any actions contain the device type of the gear the first action is missing
-            (element) {
+                (element) {
               // filters out remaining CommandActions if legacy ears are connected. Assumes Custom Actions send to ears too
               if (baseAction is CommandAction && hasLegacyEars) {
                 if (element is EarsMoveList) {
@@ -287,7 +296,10 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
                   return false;
                 }
               }
-              return element.deviceCategory.toSet().intersection(missingGearAction).isNotEmpty;
+              return element.deviceCategory
+                  .toSet()
+                  .intersection(missingGearAction)
+                  .isNotEmpty;
             },
           ).toList();
           if (remainingActions.isNotEmpty) {
@@ -303,11 +315,11 @@ abstract class TriggerDefinition extends ChangeNotifier implements Comparable<Tr
           for (BaseStatefulDevice baseStatefulDevice in ref
               .read(getAvailableIdleGearForTypeProvider(baseAction.deviceCategory.toBuiltSet()))
               .where(
-                // support sending to next device type if 2 actions+ actions are set
+            // support sending to next device type if 2 actions+ actions are set
                 (element) => !sentDeviceTypes.contains(element.baseDeviceDefinition.deviceType),
-              )
+          )
               .where(
-            (element) {
+                (element) {
               // filter out devices without a glowtip if its a glowtip action
               if ([ActionCategory.glowtip].contains(baseAction.actionCategory)) {
                 return element.hasGlowtip.value == GlowtipStatus.glowtip;
@@ -389,7 +401,7 @@ class WalkingTriggerDefinition extends TriggerDefinition {
       return;
     }
     pedestrianStatusStream = Pedometer.pedestrianStatusStream.listen(
-      (PedestrianStatus event) {
+          (PedestrianStatus event) {
         sensorsLogger.info("PedestrianStatus:: ${event.status}");
         if (event.status == "walking") {
           sendCommands("Walking", ref);
@@ -399,7 +411,7 @@ class WalkingTriggerDefinition extends TriggerDefinition {
       },
     );
     stepCountStream = Pedometer.stepCountStream.listen(
-      (StepCount event) {
+          (StepCount event) {
         sensorsLogger.fine("StepCount:: ${event.steps}");
         sendCommands("Step", ref);
       },
@@ -464,7 +476,9 @@ class EarMicTriggerDefinition extends TriggerDefinition {
 
   @override
   Future<bool> isSupported() {
-    return Future.value(ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.ears]))).isNotEmpty);
+    return Future.value(ref
+        .read(getKnownGearForTypeProvider(BuiltSet([DeviceType.ears])))
+        .isNotEmpty);
   }
 
   @override
@@ -478,7 +492,12 @@ class EarMicTriggerDefinition extends TriggerDefinition {
     }
     rxSubscriptions = [];
     ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).forEach((element) {
-      element.commandQueue.addCommand(BluetoothMessage(message: "ENDLISTEN", device: element, priority: Priority.low, responseMSG: "LISTEN OFF", type: CommandType.system, timestamp: DateTime.now()));
+      element.commandQueue.addCommand(BluetoothMessage(message: "ENDLISTEN",
+          device: element,
+          priority: Priority.low,
+          responseMSG: "LISTEN OFF",
+          type: CommandType.system,
+          timestamp: DateTime.now()));
     });
   }
 
@@ -488,7 +507,11 @@ class EarMicTriggerDefinition extends TriggerDefinition {
       return;
     }
     ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).forEach((element) {
-      element.commandQueue.addCommand(BluetoothMessage(message: "LISTEN FULL", device: element, priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+      element.commandQueue.addCommand(BluetoothMessage(message: "LISTEN FULL",
+          device: element,
+          priority: Priority.low,
+          type: CommandType.system,
+          timestamp: DateTime.now()));
     });
     //add listeners on new device paired
     deviceRefSubscription = ref.listen(knownDevicesProvider, (previous, next) {
@@ -513,10 +536,14 @@ class EarMicTriggerDefinition extends TriggerDefinition {
     }
     //Store the current streams to keep them open
     rxSubscriptions = ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).map(
-      (element) {
-        element.commandQueue.addCommand(BluetoothMessage(message: "LISTEN FULL", device: element, priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+          (element) {
+        element.commandQueue.addCommand(BluetoothMessage(message: "LISTEN FULL",
+            device: element,
+            priority: Priority.low,
+            type: CommandType.system,
+            timestamp: DateTime.now()));
         return element.rxCharacteristicStream.listen(
-          (msg) {
+              (msg) {
             if (msg.contains("LISTEN_FULL BANG")) {
               // 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("Sound", ref);
@@ -548,7 +575,9 @@ class EarTiltTriggerDefinition extends TriggerDefinition {
 
   @override
   Future<bool> isSupported() {
-    return Future.value(ref.read(getKnownGearForTypeProvider(BuiltSet([DeviceType.ears]))).isNotEmpty);
+    return Future.value(ref
+        .read(getKnownGearForTypeProvider(BuiltSet([DeviceType.ears])))
+        .isNotEmpty);
   }
 
   @override
@@ -562,7 +591,11 @@ class EarTiltTriggerDefinition extends TriggerDefinition {
     }
     rxSubscriptions = [];
     ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).forEach((element) {
-      element.commandQueue.addCommand(BluetoothMessage(message: "ENDTILTMODE", device: element, priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+      element.commandQueue.addCommand(BluetoothMessage(message: "ENDTILTMODE",
+          device: element,
+          priority: Priority.low,
+          type: CommandType.system,
+          timestamp: DateTime.now()));
     });
   }
 
@@ -572,7 +605,11 @@ class EarTiltTriggerDefinition extends TriggerDefinition {
       return;
     }
     ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).forEach((element) {
-      element.commandQueue.addCommand(BluetoothMessage(message: "TILTMODE START", device: element, priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+      element.commandQueue.addCommand(BluetoothMessage(message: "TILTMODE START",
+          device: element,
+          priority: Priority.low,
+          type: CommandType.system,
+          timestamp: DateTime.now()));
     });
     //add listeners on new device paired
     deviceRefSubscription = ref.listen(knownDevicesProvider, (previous, next) {
@@ -597,10 +634,14 @@ class EarTiltTriggerDefinition extends TriggerDefinition {
     }
     //Store the current streams to keep them open
     rxSubscriptions = ref.read(getAvailableGearForTypeProvider(BuiltSet([DeviceType.ears]))).map(
-      (element) {
-        element.commandQueue.addCommand(BluetoothMessage(message: "TILTMODE START", device: element, priority: Priority.low, type: CommandType.system, timestamp: DateTime.now()));
+          (element) {
+        element.commandQueue.addCommand(BluetoothMessage(message: "TILTMODE START",
+            device: element,
+            priority: Priority.low,
+            type: CommandType.system,
+            timestamp: DateTime.now()));
         return element.rxCharacteristicStream.listen(
-          (msg) {
+              (msg) {
             if (msg.contains("TILT LEFT")) {
               // 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("Left", ref);
@@ -740,7 +781,10 @@ class TailProximityTriggerDefinition extends TriggerDefinition {
 
   @override
   Future<void> onDisable() async {
-    if (ref.read(triggerListProvider).where((element) => element.triggerDefinition == this && element.enabled).isEmpty) {
+    if (ref
+        .read(triggerListProvider)
+        .where((element) => element.triggerDefinition == this && element.enabled)
+        .isEmpty) {
       btConnectStream?.cancel();
       btConnectStream = null;
     }
@@ -752,8 +796,14 @@ class TailProximityTriggerDefinition extends TriggerDefinition {
       return;
     }
     btConnectStream = flutterBluePlus.onScanResults.listen(
-      (event) {
-        if (event.where((element) => !ref.read(knownDevicesProvider).keys.contains(element.device.remoteId.str)).isNotEmpty && btnearbyCooldown != null && btnearbyCooldown!.isActive) {
+          (event) {
+        if (event
+            .where((element) =>
+        !ref
+            .read(knownDevicesProvider)
+            .keys
+            .contains(element.device.remoteId.str))
+            .isNotEmpty && btnearbyCooldown != null && btnearbyCooldown!.isActive) {
           sendCommands("Nearby Gear", ref);
 
           btnearbyCooldown = Timer(const Duration(seconds: 30), () {});
@@ -787,12 +837,12 @@ class TriggerAction {
 
   TriggerAction(this.uuid) {
     isActive.addListener(
-      () {
+          () {
         if (isActive.value) {
           isActiveProgress.value = 0.01;
           _timer = Timer(
             Duration(seconds: HiveProxy.getOrDefault(settings, triggerActionCooldown, defaultValue: triggerActionCooldownDefault)),
-            () {
+                () {
               isActive.value = false;
               _periodicTimer?.cancel();
               _timer?.cancel();
@@ -803,7 +853,7 @@ class TriggerAction {
           );
           _periodicTimer = Timer.periodic(
             const Duration(milliseconds: 500),
-            (Timer timer) {
+                (Timer timer) {
               timer.tick;
               double change = (timer.tick + 1) / 30;
               if (change > 1) {
@@ -833,7 +883,7 @@ class TriggerList extends _$TriggerList {
     List<Trigger> results = [];
     ref.listen(
       getAvailableGearProvider,
-      (previous, next) {
+          (previous, next) {
         for (Trigger trigger in state) {
           if (trigger.storedEnable) {
             trigger.enabled = next.isNotEmpty;
@@ -852,21 +902,47 @@ class TriggerList extends _$TriggerList {
       sensorsLogger.severe("Unable to load stored triggers: $e", e, s);
     }
     if (results.isEmpty) {
-      TriggerDefinition triggerDefinition = ref.read(triggerDefinitionListProvider).where((element) => element.uuid == 'ee9379e2-ec4f-40bb-8674-fd223a6edfda').first;
+      TriggerDefinition triggerDefinition = ref
+          .read(triggerDefinitionListProvider)
+          .where((element) => element.uuid == 'ee9379e2-ec4f-40bb-8674-fd223a6edfda')
+          .first;
       Trigger trigger = Trigger.trigDef(triggerDefinition, '91e3d421-6a52-45ab-a23e-f38e4987a8f5');
-      trigger.actions.firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == 'c53e980e-899e-4148-a13e-f57a8f9707f4').uuid);
-      trigger.actions.firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6').actions.addAll(
-            ActionRegistry.allCommands
-                .where(
-                  (element) => element.actionCategory == ActionCategory.glowtip,
-                )
-                .map(
-                  (e) => e.uuid,
-                ),
-          );
-      trigger.actions.firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == 'fdaff205-0a51-46a0-a5fc-4ea283dce079').uuid);
-      trigger.actions.firstWhere((element) => element.uuid == '7424097d-ba24-4d85-b963-bf58e85e289d').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == '86b13d13-b09c-46ba-a887-b40d8118b00a').uuid);
-      trigger.actions.firstWhere((element) => element.uuid == '7424097d-ba24-4d85-b963-bf58e85e289d').actions.add(ActionRegistry.allCommands.firstWhere((element) => element.uuid == 'd8384bcf-31ed-4b5d-a25a-da3a2f96e406').uuid);
+      trigger.actions
+          .firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6')
+          .actions
+          .add(ActionRegistry.allCommands
+          .firstWhere((element) => element.uuid == 'c53e980e-899e-4148-a13e-f57a8f9707f4')
+          .uuid);
+      trigger.actions
+          .firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6')
+          .actions
+          .addAll(
+        ActionRegistry.allCommands
+            .where(
+              (element) => element.actionCategory == ActionCategory.glowtip,
+        )
+            .map(
+              (e) => e.uuid,
+        ),
+      );
+      trigger.actions
+          .firstWhere((element) => element.uuid == '77d22961-5a69-465a-bd27-5cf5508d10a6')
+          .actions
+          .add(ActionRegistry.allCommands
+          .firstWhere((element) => element.uuid == 'fdaff205-0a51-46a0-a5fc-4ea283dce079')
+          .uuid);
+      trigger.actions
+          .firstWhere((element) => element.uuid == '7424097d-ba24-4d85-b963-bf58e85e289d')
+          .actions
+          .add(ActionRegistry.allCommands
+          .firstWhere((element) => element.uuid == '86b13d13-b09c-46ba-a887-b40d8118b00a')
+          .uuid);
+      trigger.actions
+          .firstWhere((element) => element.uuid == '7424097d-ba24-4d85-b963-bf58e85e289d')
+          .actions
+          .add(ActionRegistry.allCommands
+          .firstWhere((element) => element.uuid == 'd8384bcf-31ed-4b5d-a25a-da3a2f96e406')
+          .uuid);
 
       unawaited(store());
       return [trigger].build();
@@ -876,15 +952,15 @@ class TriggerList extends _$TriggerList {
 
   Future<void> add(Trigger trigger) async {
     state = state.rebuild(
-      (p0) => p0.add(trigger),
+          (p0) => p0.add(trigger),
     );
     await store();
   }
 
   Future<void> remove(Trigger trigger) async {
     trigger.enabled = false;
     state = state.rebuild(
-      (p0) => p0.remove(trigger),
+          (p0) => p0.remove(trigger),
     );
     await store();
   }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ plugins {`
`21`	`21`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`22`	`22`	`id "io.sentry.android.gradle" version "5.2.0" apply false`
`23`	`23`	`id "org.jetbrains.kotlin.android" version "2.1.10" apply false`
`24`		`- id "com.android.application" version '8.7.3' apply false`
	`24`	`+ id "com.android.application" version '8.8.1' apply false`
`25`	`25`	`id 'com.google.gms.google-services' version '4.4.2' apply false`
`26`	`26`
`27`	`27`	`}`