Merge pull request #1687 from matthiasn/chore/dependency_upgrades

chore: upgrade Flutter to 3.19.3 & dependencies

.fvm/flutter_sdk

@@ -1 +1 @@
-/Users/mn/fvm/versions/3.19.1
+/Users/mn/fvm/versions/3.19.3

.fvm/fvm_config.json

@@ -1,3 +1,3 @@
 {
-  "flutterSdkVersion": "3.19.1"
+  "flutterSdkVersion": "3.19.3"
 }

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.19.1"
+  "flutter": "3.19.3"
 }

ios/Podfile.lock

@@ -280,7 +280,7 @@ SPEC CHECKSUMS:
   sqlite3: 73b7fc691fdc43277614250e04d183740cb15078
   sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80
   super_native_extensions: 4916b3c627a9c7fffdc48a23a9eca0b1ac228fa7
-  url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
+  url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
 
 PODFILE CHECKSUM: 5b3398e7604abf76fbba588f5b0fc85f420e288c

lib/blocs/journal/journal_page_cubit.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:flutter/services.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
 import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:lotti/blocs/journal/journal_page_state.dart';
@@ -46,8 +47,8 @@ class JournalPageCubit extends Cubit<JournalPageState> {
 
     hotKeyManager.register(
       HotKey(
-        KeyCode.keyR,
-        modifiers: [KeyModifier.meta],
+        key: LogicalKeyboardKey.keyR,
+        modifiers: [HotKeyModifier.meta],
         scope: HotKeyScope.inapp,
       ),
       keyDownHandler: (hotKey) => refreshQuery(),

lib/pages/create/complete_habit_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -42,8 +43,8 @@ class _HabitDialogState extends State<HabitDialog> {
   bool _startReset = false;
 
   final hotkeyCmdS = HotKey(
-    KeyCode.keyS,
-    modifiers: [KeyModifier.meta],
+    key: LogicalKeyboardKey.keyS,
+    modifiers: [HotKeyModifier.meta],
     scope: HotKeyScope.inapp,
   );
 

lib/pages/create/create_measurement_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
@@ -32,8 +33,8 @@ class _MeasurementDialogState extends State<MeasurementDialog> {
   DateTime measurementTime = DateTime.now();
 
   final hotkeyCmdS = HotKey(
-    KeyCode.keyS,
-    modifiers: [KeyModifier.meta],
+    key: LogicalKeyboardKey.keyS,
+    modifiers: [HotKeyModifier.meta],
     scope: HotKeyScope.inapp,
   );
 

linux/flutter/generated_plugin_registrant.cc

@@ -7,7 +7,7 @@
 #include "generated_plugin_registrant.h"
 
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
-#include <hotkey_manager/hotkey_manager_plugin.h>
+#include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
 #include <irondash_engine_context/irondash_engine_context_plugin.h>
 #include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
 #include <record_linux/record_linux_plugin.h>
@@ -21,9 +21,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
   flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
-  g_autoptr(FlPluginRegistrar) hotkey_manager_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "HotkeyManagerPlugin");
-  hotkey_manager_plugin_register_with_registrar(hotkey_manager_registrar);
+  g_autoptr(FlPluginRegistrar) hotkey_manager_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "HotkeyManagerLinuxPlugin");
+  hotkey_manager_linux_plugin_register_with_registrar(hotkey_manager_linux_registrar);
   g_autoptr(FlPluginRegistrar) irondash_engine_context_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "IrondashEngineContextPlugin");
   irondash_engine_context_plugin_register_with_registrar(irondash_engine_context_registrar);

linux/flutter/generated_plugins.cmake

@@ -4,7 +4,7 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   flutter_secure_storage_linux
-  hotkey_manager
+  hotkey_manager_linux
   irondash_engine_context
   media_kit_libs_linux
   record_linux

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -12,7 +12,7 @@ import flutter_image_compress_macos
 import flutter_local_notifications
 import flutter_native_timezone
 import flutter_secure_storage_macos
-import hotkey_manager
+import hotkey_manager_macos
 import irondash_engine_context
 import location
 import media_kit_libs_macos_audio
@@ -38,7 +38,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FlutterNativeTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterNativeTimezonePlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
-  HotkeyManagerPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerPlugin"))
+  HotkeyManagerMacosPlugin.register(with: registry.registrar(forPlugin: "HotkeyManagerMacosPlugin"))
   IrondashEngineContextPlugin.register(with: registry.registrar(forPlugin: "IrondashEngineContextPlugin"))
   LocationPlugin.register(with: registry.registrar(forPlugin: "LocationPlugin"))
   MediaKitLibsMacosAudioPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosAudioPlugin"))

macos/Podfile.lock

@@ -21,7 +21,7 @@ PODS:
     - FlutterMacOS
   - FlutterMacOS (1.0.0)
   - HotKey (0.2.0)
-  - hotkey_manager (0.0.1):
+  - hotkey_manager_macos (0.0.1):
     - FlutterMacOS
     - HotKey
   - irondash_engine_context (0.0.1):
@@ -88,7 +88,7 @@ DEPENDENCIES:
   - flutter_native_timezone (from `Flutter/ephemeral/.symlinks/plugins/flutter_native_timezone/macos`)
   - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
-  - hotkey_manager (from `Flutter/ephemeral/.symlinks/plugins/hotkey_manager/macos`)
+  - hotkey_manager_macos (from `Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos`)
   - irondash_engine_context (from `Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos`)
   - location (from `Flutter/ephemeral/.symlinks/plugins/location/macos`)
   - media_kit_libs_macos_audio (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_audio/macos`)
@@ -133,8 +133,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
-  hotkey_manager:
-    :path: Flutter/ephemeral/.symlinks/plugins/hotkey_manager/macos
+  hotkey_manager_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/hotkey_manager_macos/macos
   irondash_engine_context:
     :path: Flutter/ephemeral/.symlinks/plugins/irondash_engine_context/macos
   location:
@@ -181,7 +181,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   HotKey: e96d8a2ddbf4591131e2bb3f54e69554d90cdca6
-  hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023c
+  hotkey_manager_macos: 1e2edb0c7ae4fe67108af44a9d3445de41404160
   irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
   location: 7cdb0665bd6577d382b0a343acdadbcb7f964775
   media_kit_libs_macos_audio: 3871782a4f3f84c77f04d7666c87800a781c24da