gitea-mirror/swiftcontrol
1
0
Fork 0
mirror of https://github.com/jonasbark/swiftcontrol.git synced 2026-02-18 00:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

create duplicate keymap if needed

Browse Source
This commit is contained in:
Jonas Bark
2025-12-05 21:35:40 +01:00
parent 7e488b3cb1
commit fb65616cee
6 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/bluetooth/devices/base_device.dart
View File

@@ -6,6 +6,7 @@ import 'package:swift_control/bluetooth/devices/zwift/constants.dart';
import 'package:swift_control/utils/actions/desktop.dart';
import 'package:swift_control/utils/core.dart';
import 'package:swift_control/utils/keymap/apps/custom_app.dart';
import 'package:swift_control/utils/keymap/manager.dart';
import '../../utils/keymap/buttons.dart';
import '../messages/notification.dart';
@@ -148,17 +149,18 @@ abstract class BaseDevice {
Widget showInformation(BuildContext context);
ControllerButton? getOrAddButton(String key, ControllerButton Function() creator) {
if (core.actionHandler.supportedApp is CustomApp) {
final button = core.actionHandler.supportedApp?.keymap.getOrAddButton(key, creator);
if (button != null && availableButtons.none((e) => e.name == button.name)) {
availableButtons.add(button);
core.settings.setKeyMap(core.actionHandler.supportedApp!);
}
return button;
} else {
return null;
Future<ControllerButton> getOrAddButton(String key, ControllerButton Function() creator) async {
if (core.actionHandler.supportedApp is! CustomApp) {
final currentProfile = core.actionHandler.supportedApp!.name;
// should we display this to the user?
await KeymapManager().duplicate(null, currentProfile, skipName: '$currentProfile (Copy)');
}
final button = core.actionHandler.supportedApp!.keymap.getOrAddButton(key, creator);
if (availableButtons.none((e) => e.name == button.name)) {
availableButtons.add(button);
core.settings.setKeyMap(core.actionHandler.supportedApp!);
}
return button;
}
}

13
lib/bluetooth/devices/gamepad/gamepad_device.dart
View File

@@ -2,7 +2,6 @@ import 'package:dartx/dartx.dart';
import 'package:flutter/material.dart';
import 'package:gamepads/gamepads.dart';
import 'package:swift_control/bluetooth/devices/base_device.dart';
import 'package:swift_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
import 'package:swift_control/bluetooth/messages/notification.dart';
import 'package:swift_control/pages/device.dart';
import 'package:swift_control/utils/core.dart';
@@ -21,21 +20,15 @@ class GamepadDevice extends BaseDevice {
@override
Future<void> connect() async {
Gamepads.eventsByGamepad(id).listen((event) {
Gamepads.eventsByGamepad(id).listen((event) async {
actionStreamInternal.add(LogNotification('Gamepad event: $event'));
ControllerButton? button = getOrAddButton(
ControllerButton button = await getOrAddButton(
event.key,
() => ControllerButton(event.key),
);
if (button == null && event.value == 0) {
actionStreamInternal.add(
AlertNotification(LogLevel.LOGLEVEL_WARNING, 'Use a custom keymap to use the buttons on $name.'),
);
}
final buttonsClicked = event.value == 0.0 && button != null ? [button] : <ControllerButton>[];
final buttonsClicked = event.value == 0.0 ? [button] : <ControllerButton>[];
if (_lastButtonsClicked.contentEquals(buttonsClicked) == false) {
handleButtonsClicked(buttonsClicked);
}

6
lib/bluetooth/devices/shimano/shimano_di2.dart
View File

@@ -51,17 +51,17 @@ class ShimanoDi2 extends BluetoothDevice {
final clickedButtons = <ControllerButton>[];
channels.forEachIndexed((int value, int index) {
channels.forEachIndexed((int value, int index) async {
final didChange = _lastButtons[index] != value;
_lastButtons[index] = value;
final readableIndex = index + 1;
final button = getOrAddButton(
final button = await getOrAddButton(
'D-Fly Channel $readableIndex',
() => ControllerButton('D-Fly Channel $readableIndex'),
);
if (didChange && button != null) {
if (didChange) {
clickedButtons.add(button);
}
});

4
lib/utils/actions/android.dart
View File

@@ -27,9 +27,9 @@ class AndroidActions extends BaseActions {
}
});
hidKeyPressed().listen((keyPressed) {
hidKeyPressed().listen((keyPressed) async {
final hidDevice = HidDevice(keyPressed.source);
final button = hidDevice.getOrAddButton(keyPressed.hidKey, () => ControllerButton(keyPressed.hidKey))!;
final button = await hidDevice.getOrAddButton(keyPressed.hidKey, () => ControllerButton(keyPressed.hidKey))!;
var availableDevice = core.connection.controllerDevices.firstOrNullWhere((e) => e.name == hidDevice.name);
if (availableDevice == null) {

6
lib/utils/core.dart
View File

@@ -350,14 +350,14 @@ class MediaKeyHandler {
});
}
void _onMediaKeyPressedListener(PressedButton mediaKey) {
Future<void> _onMediaKeyPressedListener(PressedButton mediaKey) async {
final hidDevice = HidDevice('HID Device');
final keyPressed = mediaKey.name;
final button = hidDevice.getOrAddButton(
final button = await hidDevice.getOrAddButton(
keyPressed,
() => ControllerButton(keyPressed),
)!;
);
var availableDevice = core.connection.controllerDevices.firstOrNullWhere((e) => e.name == hidDevice.name);
if (availableDevice == null) {

4
lib/utils/keymap/manager.dart
View File

@@ -231,8 +231,8 @@ class KeymapManager {
);
}
Future<String?> duplicate(BuildContext context, String currentProfile, {String? skipName}) async {
final newName = skipName ?? await _showDuplicateProfileDialog(context, currentProfile);
Future<String?> duplicate(BuildContext? context, String currentProfile, {String? skipName}) async {
final newName = skipName ?? await _showDuplicateProfileDialog(context!, currentProfile);
if (newName != null && newName.isNotEmpty) {
if (core.actionHandler.supportedApp is CustomApp) {
await core.settings.duplicateCustomAppProfile(currentProfile, newName);