gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-09 07:28:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Shortcuts improvements (#446)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-08-09 16:17:14 +02:00 • committed by GitHub
parent d0d6a2ffa6
commit 70e346b8a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 481 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

71
lib/models/settings/key_combinations.dart
View file

@ -4,31 +4,65 @@ import 'package:flutter/services.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:fladder/screens/settings/widgets/key_listener.dart';
part 'key_combinations.freezed.dart';
part 'key_combinations.g.dart';
@Freezed(toJson: true, fromJson: true)
@Freezed(toJson: true, fromJson: true, copyWith: true)
class KeyCombination with _$KeyCombination {
const KeyCombination._();
factory KeyCombination({
@LogicalKeyboardSerializer() LogicalKeyboardKey? key,
@LogicalKeyboardSerializer() LogicalKeyboardKey? modifier,
@LogicalKeyboardSerializer() required LogicalKeyboardKey key,
@LogicalKeyboardSerializer() LogicalKeyboardKey? altKey,
@LogicalKeyboardSerializer() LogicalKeyboardKey? altModifier,
}) = _KeyCombination;
factory KeyCombination.fromJson(Map<String, dynamic> json) => _$KeyCombinationFromJson(json);
@override
bool operator ==(covariant other) {
return other is KeyCombination && other.key.keyId == key.keyId && other.modifier?.keyId == modifier?.keyId;
return other is KeyCombination &&
other.key?.keyId == key?.keyId &&
other.modifier?.keyId == modifier?.keyId &&
other.altKey?.keyId == altKey?.keyId &&
other.altModifier?.keyId == altModifier?.keyId;
}
bool containsSameSet(KeyCombination other) {
return (key == other.key && modifier == other.modifier) || (altKey == other.key && altModifier == other.modifier);
}
@override
int get hashCode => key.hashCode ^ modifier.hashCode;
int get hashCode => key.hashCode ^ modifier.hashCode ^ altKey.hashCode ^ altModifier.hashCode;
String get label => [modifier?.label, key.label].nonNulls.join(" + ");
String get label => [modifier?.label, key?.label].nonNulls.join(" + ");
String get altLabel => [altModifier?.label, altKey?.label].nonNulls.join(" + ");
KeyCombination? get altSet => altKey != null
? copyWith(
key: altKey!,
modifier: altModifier,
)
: null;
KeyCombination setKeys(
LogicalKeyboardKey? key, {
LogicalKeyboardKey? modifier,
bool alt = false,
}) {
return alt
? copyWith(
altKey: key,
altModifier: modifier,
)
: copyWith(
key: key ?? altKey,
modifier: key == null ? altModifier : modifier,
altKey: key == null ? null : altKey,
altModifier: key == null ? null : altModifier,
);
}
static final Set<LogicalKeyboardKey> shiftKeys = {
LogicalKeyboardKey.shift,
@ -68,3 +102,26 @@ class LogicalKeyboardSerializer extends JsonConverter<LogicalKeyboardKey, String
return jsonEncode(object.keyId.toString());
}
}
extension LogicalKeyExtension on LogicalKeyboardKey {
String get label {
return switch (this) { LogicalKeyboardKey.space => "Space", _ => keyLabel };
}
}
extension KeyMapExtension<T> on Map<T, KeyCombination> {
Map<T, KeyCombination> setOrRemove(MapEntry<T, KeyCombination> newEntry, Map<T, KeyCombination> defaultShortCuts) {
if (newEntry.value == defaultShortCuts[newEntry.key]) {
final currentShortcuts = Map.fromEntries(entries);
return (currentShortcuts..remove(newEntry.key));
} else {
final currentShortcuts = Map.fromEntries(entries);
currentShortcuts.update(
newEntry.key,
(value) => newEntry.value,
ifAbsent: () => newEntry.value,
);
return currentShortcuts;
}
}
}