Merge PR #1753

.github/workflows/env

@@ -1,2 +1,2 @@
-FLUTTER=3.24.5
-PYVER=3.12.8
+FLUTTER=3.27.1
+PYVER=3.13.1

.github/workflows/macos.yml

@@ -42,6 +42,7 @@ jobs:
       run: |
         brew update
         brew install swig
+        python -m pip install --upgrade pip
         pipx install poetry
         pipx inject poetry poetry-plugin-export
 
@@ -60,7 +61,6 @@ jobs:
       env:
         SKIP: ${{ steps.cache-helper.outputs.cache-hit == 'true' && 'mypy,flake8,black,bandit' || ''}}
       run: |
-        python -m pip install --upgrade pip
         pip install pre-commit
         pre-commit run --all-files
         flutter test

.gitignore

@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related

build-helper.sh

@@ -47,7 +47,7 @@ if [ "$OS" = "macos" ]; then
 		poetry run pip download -r $HELPER/cryptography.txt --platform macosx_10_12_universal2 --only-binary :all: --no-deps --dest $HELPER
 		poetry run pip install -r $HELPER/cryptography.txt --no-cache-dir --no-index --find-links $HELPER
 		# Combine wheels of pillow to get universal build
-		poetry run pip download -r $HELPER/pillow.txt --platform macosx_10_10_x86_64 --only-binary :all: --no-deps --dest $HELPER
+		poetry run pip download -r $HELPER/pillow.txt --platform macosx_10_13_x86_64 --only-binary :all: --no-deps --dest $HELPER
 		poetry run pip download -r $HELPER/pillow.txt --platform macosx_11_0_arm64 --only-binary :all: --no-deps --dest $HELPER
 		poetry run pip install delocate
 		poetry run delocate-merge $HELPER/pillow*.whl

helper/pyproject.toml

@@ -18,7 +18,7 @@ packages = [{ include = "helper" }]
 
 
 [tool.poetry.group.dev.dependencies]
-pyinstaller = { version = "^6.0", python = "<3.13" }
+pyinstaller = { version = "^6.10", python = "<3.14" }
 pytest = "^8.0.0"
 mypy = "^1.7.1"
 types-Pillow = "^10.2.0.0"

lib/app/color_extension.dart

@@ -0,0 +1,24 @@
+import 'dart:ui';
+
+/// This extension is to supplement deprecated_member_use for `value`
+/// to convert RGBA into a 32 bit integer.
+extension ColorExtension on Color {
+  static int floatToInt8(double x) {
+    return (x * 255.0).round() & 0xff;
+  }
+
+  /// A 32 bit value representing this color.
+  ///
+  /// The bits are assigned as follows:
+  ///
+  /// * Bits 24-31 are the alpha value.
+  /// * Bits 16-23 are the red value.
+  /// * Bits 8-15 are the green value.
+  /// * Bits 0-7 are the blue value.
+  int get toInt32 {
+    return floatToInt8(a) << 24 |
+        floatToInt8(r) << 16 |
+        floatToInt8(g) << 8 |
+        floatToInt8(b) << 0;
+  }
+}

lib/app/models.dart

@@ -22,9 +22,9 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import '../../management/models.dart';
 import '../core/models.dart';
 import '../core/state.dart';
+import 'color_extension.dart';
 
 part 'models.freezed.dart';
-
 part 'models.g.dart';
 
 const _listEquality = ListEquality();
@@ -168,5 +168,5 @@ class _ColorConverter implements JsonConverter<Color?, int?> {
   Color? fromJson(int? json) => json != null ? Color(json) : null;
 
   @override
-  int? toJson(Color? object) => object?.value;
+  int? toJson(Color? object) => object?.toInt32;
 }

lib/app/state.dart

@@ -27,6 +27,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import '../core/state.dart';
 import '../theme.dart';
+import 'color_extension.dart';
 import 'features.dart' as features;
 import 'logging.dart';
 import 'models.dart';
@@ -159,7 +160,7 @@ final primaryColorProvider = Provider<Color>((ref) {
       final customization = ref.watch(keyCustomizationManagerProvider)[serial];
       final deviceColor = customization?.color;
       if (deviceColor != null) {
-        prefs.setInt(prefLastUsedColor, deviceColor.value);
+        prefs.setInt(prefLastUsedColor, deviceColor.toInt32);
         return deviceColor;
       } else {
         prefs.remove(prefLastUsedColor);

lib/app/views/app_page.dart

@@ -279,11 +279,11 @@ class _AppPageState extends ConsumerState<AppPage> {
                           ? Theme.of(context)
                               .colorScheme
                               .onSurfaceVariant
-                              .withOpacity(0.4)
+                              .withValues(alpha: 0.4)
                           : Theme.of(context)
                               .colorScheme
                               .primary
-                              .withOpacity(0.9),
+                              .withValues(alpha: 0.9),
                     ),
                 overflow: TextOverflow.ellipsis,
               ),

lib/app/views/fs_dialog.dart

@@ -28,7 +28,8 @@ class FsDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     return Dialog.fullscreen(
-      backgroundColor: Theme.of(context).colorScheme.surface.withOpacity(0.7),
+      backgroundColor:
+          Theme.of(context).colorScheme.surface.withValues(alpha: 0.7),
       child: SafeArea(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,

lib/home/views/home_screen.dart

@@ -22,6 +22,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
 import '../../android/state.dart';
+import '../../app/color_extension.dart';
 import '../../app/message.dart';
 import '../../app/models.dart';
 import '../../app/state.dart';
@@ -264,7 +265,7 @@ class _DeviceContent extends ConsumerWidget {
                                     ].map((e) => _ColorButton(
                                           color: e,
                                           isSelected:
-                                              customColor?.value == e.value,
+                                              customColor?.toInt32 == e.toInt32,
                                           onPressed: () {
                                             _updateColor(e, ref, serial);
                                             Navigator.of(context).pop();
@@ -315,7 +316,7 @@ class _DeviceContent extends ConsumerWidget {
                             color: Theme.of(context)
                                 .colorScheme
                                 .primary
-                                .withOpacity(0.9)),
+                                .withValues(alpha: 0.9)),
                       )
                     ],
                   ),
@@ -438,11 +439,11 @@ class _HeroAvatar extends StatelessWidget {
         shape: BoxShape.circle,
         gradient: RadialGradient(
           colors: [
-            color.withOpacity(0.6),
-            color.withOpacity(0.25),
+            color.withValues(alpha: 0.6),
+            color.withValues(alpha: 0.25),
             (DialogTheme.of(context).backgroundColor ??
                     theme.dialogBackgroundColor)
-                .withOpacity(0),
+                .withValues(alpha: 0),
           ],
         ),
       ),

lib/oath/views/account_view.dart

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -42,7 +41,7 @@ class AccountView extends ConsumerStatefulWidget {
 }
 
 String _a11yCredentialLabel(String? issuer, String name, String? code) {
-  return [issuer, name, code].whereNotNull().join(' ');
+  return [issuer, name, code].nonNulls.join(' ');
 }
 
 class _AccountViewState extends ConsumerState<AccountView> {

lib/widgets/file_drop_overlay.dart

@@ -15,7 +15,7 @@ class FileDropOverlay extends StatelessWidget {
           color: Theme.of(context)
               .colorScheme
               .secondaryContainer
-              .withOpacity(0.95),
+              .withValues(alpha: 0.95),
           border: Border.all(color: Theme.of(context).colorScheme.primary),
           borderRadius: const BorderRadius.all(Radius.circular(20.0))),
       child: Column(

lib/widgets/toast.dart

@@ -109,7 +109,8 @@ void Function() showToast(
   final Color backgroundColor = isThemeDark
       ? colorScheme.onSurface
       : Color.alphaBlend(
-          colorScheme.onSurface.withOpacity(0.80), colorScheme.surface);
+          colorScheme.onSurface.withValues(alpha: 0.80), colorScheme.surface);
+
   final textStyle =
       ThemeData(brightness: isThemeDark ? Brightness.light : Brightness.dark)
           .textTheme

macos/Runner/AppDelegate.swift

@@ -7,4 +7,8 @@ class AppDelegate: FlutterAppDelegate {
     // Keep app running if window closes
     return false
   }
+
+  override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
+    return true
+  }
 }