From f5c21481e68d39d8df87b00fa04eea3c0a0d233a Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Mon, 11 Nov 2024 11:38:48 +0100
Subject: [PATCH] refactor: Migrate to newer keyboard shortcuts package

---
 lib/pages/chat/chat_input_row.dart            |  2 +-
 lib/pages/chat_list/chat_list_view.dart       |  2 +-
 .../chat_list/client_chooser_button.dart      |  2 +-
 lib/widgets/chat_settings_popup_menu.dart     |  2 +-
 pubspec.lock                                  | 21 +++++++++----------
 pubspec.yaml                                  |  8 +------
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index b22d905af..cd41989d2 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -3,8 +3,8 @@ import 'package:flutter/services.dart';
 
 import 'package:animations/animations.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
 import 'package:matrix/matrix.dart';
+import 'package:new_keyboard_shortcuts/keyboard_shortcuts.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart
index 674aa9406..7a928c10f 100644
--- a/lib/pages/chat_list/chat_list_view.dart
+++ b/lib/pages/chat_list/chat_list_view.dart
@@ -3,8 +3,8 @@ import 'package:flutter/services.dart';
 
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
 import 'package:matrix/matrix.dart';
+import 'package:new_keyboard_shortcuts/keyboard_shortcuts.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index 041b83826..16de23732 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -4,8 +4,8 @@ import 'package:flutter/services.dart';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
 import 'package:matrix/matrix.dart';
+import 'package:new_keyboard_shortcuts/keyboard_shortcuts.dart';
 
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';
diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart
index e7d6142ea..7fc251a10 100644
--- a/lib/widgets/chat_settings_popup_menu.dart
+++ b/lib/widgets/chat_settings_popup_menu.dart
@@ -6,8 +6,8 @@ import 'package:flutter/services.dart';
 import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:go_router/go_router.dart';
-import 'package:keyboard_shortcuts/keyboard_shortcuts.dart';
 import 'package:matrix/matrix.dart';
+import 'package:new_keyboard_shortcuts/keyboard_shortcuts.dart';
 
 import 'package:fluffychat/widgets/future_loading_dialog.dart';
 import 'matrix.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 421a88055..09bc64138 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1098,15 +1098,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.13"
-  keyboard_shortcuts:
-    dependency: "direct main"
-    description:
-      path: "."
-      ref: null-safety
-      resolved-ref: a3d4020911860ff091d90638ab708604b71d2c5a
-      url: "https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git"
-    source: git
-    version: "0.1.4"
   latlong2:
     dependency: "direct main"
     description:
@@ -1299,6 +1290,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  new_keyboard_shortcuts:
+    dependency: "direct main"
+    description:
+      name: new_keyboard_shortcuts
+      sha256: af1389c7450c29746addfb6da5fcc5e85a83340db02a987d2012ed26c73147e3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4"
   node_preamble:
     dependency: transitive
     description:
@@ -2324,10 +2323,10 @@ packages:
     dependency: transitive
     description:
       name: visibility_detector
-      sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d"
+      sha256: ec932527913f32f65aa01d3a393504240b9e9021ecc77123f017755605e48832
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3"
+    version: "0.2.2"
   vm_service:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index fb3e3ca40..77c0bab6e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,12 +62,12 @@ dependencies:
   image_picker: ^1.1.0
   intl: any
   just_audio: ^0.9.39
-  keyboard_shortcuts: ^0.1.4
   latlong2: ^0.9.1
   linkify: ^5.0.0
   matrix: ^0.34.0
   mime: ^1.0.6
   native_imaging: ^0.1.1
+  new_keyboard_shortcuts: ^0.1.4
   opus_caf_converter_dart: ^1.0.1
   package_info_plus: ^8.0.2
   pasteboard: ^0.2.0
@@ -153,10 +153,4 @@ msix_config:
   install_certificate: false
 
 dependency_overrides:
-  # waiting for null safety
-  # Upstream pull request: https://github.com/AntoineMarcel/keyboard_shortcuts/pull/13
-  keyboard_shortcuts:
-    git:
-      url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git
-      ref: null-safety
   win32: 5.5.3