Merge pull request #789 from pangeachat/remove-keyboard-shortcuts

comment out references to buggy package keyboard_shortcuts

lib/pages/chat_list/client_chooser_button.dart

@@ -7,7 +7,7 @@ import 'package:flutter/material.dart';
 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:keyboard_shortcuts/keyboard_shortcuts.dart';
 import 'package:matrix/matrix.dart';
 
 import 'chat_list.dart';
@@ -221,38 +221,40 @@ class ClientChooserButton extends StatelessWidget {
       builder: (context, snapshot) => Stack(
         alignment: Alignment.center,
         children: [
-          ...List.generate(
-            clientCount,
-            (index) => KeyBoardShortcuts(
-              keysToPress: _buildKeyboardShortcut(index + 1),
-              helpLabel: L10n.of(context)!.switchToAccount(index + 1),
-              onKeysPressed: () => _handleKeyboardShortcut(
-                matrix,
-                index,
-                context,
-              ),
-              child: const SizedBox.shrink(),
-            ),
-          ),
-          KeyBoardShortcuts(
-            keysToPress: {
-              LogicalKeyboardKey.controlLeft,
-              LogicalKeyboardKey.tab,
-            },
-            helpLabel: L10n.of(context)!.nextAccount,
-            onKeysPressed: () => _nextAccount(matrix, context),
-            child: const SizedBox.shrink(),
-          ),
-          KeyBoardShortcuts(
-            keysToPress: {
-              LogicalKeyboardKey.controlLeft,
-              LogicalKeyboardKey.shiftLeft,
-              LogicalKeyboardKey.tab,
-            },
-            helpLabel: L10n.of(context)!.previousAccount,
-            onKeysPressed: () => _previousAccount(matrix, context),
-            child: const SizedBox.shrink(),
-          ),
+          // #Pangea
+          // ...List.generate(
+          //   clientCount,
+          //   (index) => KeyBoardShortcuts(
+          //     keysToPress: _buildKeyboardShortcut(index + 1),
+          //     helpLabel: L10n.of(context)!.switchToAccount(index + 1),
+          //     onKeysPressed: () => _handleKeyboardShortcut(
+          //       matrix,
+          //       index,
+          //       context,
+          //     ),
+          //     child: const SizedBox.shrink(),
+          //   ),
+          // ),
+          // KeyBoardShortcuts(
+          //   keysToPress: {
+          //     LogicalKeyboardKey.controlLeft,
+          //     LogicalKeyboardKey.tab,
+          //   },
+          //   helpLabel: L10n.of(context)!.nextAccount,
+          //   onKeysPressed: () => _nextAccount(matrix, context),
+          //   child: const SizedBox.shrink(),
+          // ),
+          // KeyBoardShortcuts(
+          //   keysToPress: {
+          //     LogicalKeyboardKey.controlLeft,
+          //     LogicalKeyboardKey.shiftLeft,
+          //     LogicalKeyboardKey.tab,
+          //   },
+          //   helpLabel: L10n.of(context)!.previousAccount,
+          //   onKeysPressed: () => _previousAccount(matrix, context),
+          //   child: const SizedBox.shrink(),
+          // ),
+          // Pangea#
           PopupMenuButton<Object>(
             onSelected: (o) => _clientSelected(o, context),
             itemBuilder: _bundleMenuItems,

pubspec.lock

@@ -1324,15 +1324,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
-  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"
   language_tool:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -68,7 +68,9 @@ dependencies:
   image_picker: ^1.1.0
   intl: any
   just_audio: ^0.9.39
-  keyboard_shortcuts: ^0.1.4
+  # #Pangea
+  # keyboard_shortcuts: ^0.1.4
+  # Pangea#
   latlong2: ^0.9.1
   linkify: ^5.0.0
   # #Pangea
@@ -216,8 +218,10 @@ dependency_overrides:
     version: ^1.0.1
   # 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
+  # #Pangea
+  # keyboard_shortcuts:
+  #   git:
+  #     url: https://github.com/TheOneWithTheBraid/keyboard_shortcuts.git
+  #     ref: null-safety
+  # win32: 5.5.3
+  # Pangea#