From 5f4e2c24a82a32aa0794880a21dc971d902584be Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Mon, 26 Feb 2024 11:13:50 +0100 Subject: [PATCH] fix: Resolve linter issues --- .../screens/display/bout/bout_display.dart | 2 +- .../screens/display/bout/bout_shortcuts.dart | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart index b6e35e64..9c27e1f9 100644 --- a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart +++ b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_display.dart @@ -432,7 +432,7 @@ class BoutState extends ConsumerState { canPop: false, onPopInvoked: (didPop) async { await save(); - if (mounted) { + if (context.mounted) { Navigator.pop(context); } }, diff --git a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_shortcuts.dart b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_shortcuts.dart index a5548193..03fc7215 100644 --- a/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_shortcuts.dart +++ b/wrestling_scoreboard_client/lib/view/screens/display/bout/bout_shortcuts.dart @@ -293,9 +293,9 @@ class BoutActionHandler extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - Future handleIntent(BoutScreenActionIntent intent, {BuildContext? context}) async { + Future handleIntent(BoutScreenActionIntent intent, {required BuildContext context}) async { final dataManager = await ref.read(dataManagerNotifierProvider); - if (context != null && context.mounted) { + if (context.mounted) { try { await intent.handle(dataManager, stopwatch, bouts, getActions, boutIndex, doAction, context: context, navigateToBoutByIndex: navigateToBoutByIndex); @@ -340,31 +340,31 @@ class BoutActionHandler extends ConsumerWidget { onInvoke: (BoutScreenActionIntent intent) => handleIntent(intent, context: context), ) }, - child: RawKeyboardListener( + child: KeyboardListener( focusNode: FocusNode(), child: Focus(autofocus: true, child: child), - onKey: (RawKeyEvent event) { - if (event.runtimeType.toString() == 'RawKeyDownEvent') { + onKeyEvent: (KeyEvent event) { + if (event is KeyDownEvent) { if (event.physicalKey == PhysicalKeyboardKey.keyF) { - handleIntent(redOneIntent); + handleIntent(redOneIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyD) { - handleIntent(redTwoIntent); + handleIntent(redTwoIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyS) { - handleIntent(redThreeIntent); + handleIntent(redThreeIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyA) { - handleIntent(redFourIntent); + handleIntent(redFourIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyJ || - (event.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit1)) { - handleIntent(blueOneIntent); + (HardwareKeyboard.instance.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit1)) { + handleIntent(blueOneIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyK || - (event.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit2)) { - handleIntent(blueTwoIntent); + (HardwareKeyboard.instance.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit2)) { + handleIntent(blueTwoIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.keyL || - (event.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit3)) { - handleIntent(blueThreeIntent); + (HardwareKeyboard.instance.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit3)) { + handleIntent(blueThreeIntent, context: context); } else if (event.physicalKey == PhysicalKeyboardKey.semicolon || - (event.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit4)) { - handleIntent(blueFourIntent); + (HardwareKeyboard.instance.isShiftPressed && event.physicalKey == PhysicalKeyboardKey.digit4)) { + handleIntent(blueFourIntent, context: context); } } },