From 9d2d29253e1401a6ef3cdf416616e83f65282f60 Mon Sep 17 00:00:00 2001 From: Codel1417 Date: Fri, 7 Jun 2024 15:23:34 -0400 Subject: [PATCH] Rename move & update signing config --- android/app/build.gradle | 5 +++++ lib/Backend/action_registry.dart | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bcdae63a..26f2d4b4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -62,6 +62,11 @@ android { keyPassword keystoreProperties['keyPassword'] storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null storePassword keystoreProperties['storePassword'] + // Optional, specify signing versions used + enableV1Signing true + enableV2Signing true + enableV3Signing true + enableV4Signing true } } buildTypes { diff --git a/lib/Backend/action_registry.dart b/lib/Backend/action_registry.dart index 4a9607b3..77328037 100644 --- a/lib/Backend/action_registry.dart +++ b/lib/Backend/action_registry.dart @@ -81,7 +81,7 @@ class ActionRegistry { }, ), CommandAction( - name: "Erect", + name: "Stand Up", command: "TAILER", deviceCategory: [DeviceType.tail, DeviceType.wings], actionCategory: ActionCategory.fast, @@ -277,8 +277,7 @@ Map> getAvailableActions(GetAvailableActionsRef Map knownDevices = ref.watch(knownDevicesProvider); Map> sortedActions = {}; for (BaseAction baseAction in List.from(ActionRegistry.allCommands) - ..addAll(ref.read(moveListsProvider)) - ..addAll(ref.read(userAudioActionsProvider))) { + ..addAll(ref.read(moveListsProvider))..addAll(ref.read(userAudioActionsProvider))) { Set? baseActions = {}; for (BaseStatefulDevice baseStatefulDevice in knownDevices.values.where((element) => element.deviceConnectionState.value == ConnectivityState.connected)) { // check if command matches device type @@ -303,11 +302,13 @@ Map> getAvailableActions(GetAvailableActionsRef Map> getAllActions(GetAllActionsRef ref, Set deviceType) { Map> sortedActions = {}; for (BaseAction baseAction in List.from(ActionRegistry.allCommands) - ..addAll(ref.read(moveListsProvider)) - ..addAll(ref.read(userAudioActionsProvider))) { + ..addAll(ref.read(moveListsProvider))..addAll(ref.read(userAudioActionsProvider))) { Set? baseActions = {}; // check if command matches device type - if (baseAction.deviceCategory.toSet().intersection(deviceType).isNotEmpty) { + if (baseAction.deviceCategory + .toSet() + .intersection(deviceType) + .isNotEmpty) { // get category if it exists if (sortedActions.containsKey(baseAction.actionCategory)) { baseActions = sortedActions[baseAction.actionCategory];