chore(flutter): update Flutter and dependencies to 3.24.2

TheContrappostoShop · Sep 7, 2024 · 0b6aff7 · 0b6aff7
1 parent d3eac97
commit 0b6aff7
Show file tree

Hide file tree

Showing 13 changed files with 122 additions and 169 deletions.
diff --git a/lib/home/home_screen.dart b/lib/home/home_screen.dart
@@ -44,15 +44,15 @@ class HomeScreenState extends State<HomeScreen> {
     final theme = Theme.of(context).copyWith(
       elevatedButtonTheme: ElevatedButtonThemeData(
         style: ButtonStyle(
-          shape: MaterialStateProperty.resolveWith<OutlinedBorder?>(
-            (Set<MaterialState> states) {
+          shape: WidgetStateProperty.resolveWith<OutlinedBorder?>(
+            (Set<WidgetState> states) {
               return RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(15),
               );
             },
           ),
-          minimumSize: MaterialStateProperty.resolveWith<Size?>(
-            (Set<MaterialState> states) {
+          minimumSize: WidgetStateProperty.resolveWith<Size?>(
+            (Set<WidgetState> states) {
               return homeBtnSize;
             },
           ),

diff --git a/lib/settings/update_screen.dart b/lib/settings/update_screen.dart
@@ -622,7 +622,7 @@ sudo systemctl restart orion.service
             child: Container(
               width: MediaQuery.of(context).size.width,
               height: MediaQuery.of(context).size.height,
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/status/error_print_failure.dart b/lib/status/error_print_failure.dart
@@ -182,13 +182,13 @@ class PrintErrorScreenState extends State<PrintErrorScreen> {
                 Navigator.pop(context);
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.all(
+                backgroundColor: WidgetStateProperty.all(
                     const Color.fromARGB(255, 207, 124, 0)),
-                overlayColor: MaterialStateProperty.all(
+                overlayColor: WidgetStateProperty.all(
                     Theme.of(context).primaryColor.withOpacity(0.2)),
-                minimumSize: MaterialStateProperty.all(
+                minimumSize: WidgetStateProperty.all(
                     const Size(double.infinity, kToolbarHeight * 1.2)),
-                shape: MaterialStateProperty.all(const RoundedRectangleBorder(
+                shape: WidgetStateProperty.all(const RoundedRectangleBorder(
                     borderRadius: BorderRadius.zero)),
               ),
               child: Text('Resume Print',
@@ -205,13 +205,13 @@ class PrintErrorScreenState extends State<PrintErrorScreen> {
                 Navigator.pop(context);
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.all(
+                backgroundColor: WidgetStateProperty.all(
                     const Color.fromARGB(255, 207, 124, 0)),
-                overlayColor: MaterialStateProperty.all(
+                overlayColor: WidgetStateProperty.all(
                     Theme.of(context).primaryColor.withOpacity(0.2)),
-                minimumSize: MaterialStateProperty.all(
+                minimumSize: WidgetStateProperty.all(
                     const Size(double.infinity, kToolbarHeight * 1.2)),
-                shape: MaterialStateProperty.all(const RoundedRectangleBorder(
+                shape: WidgetStateProperty.all(const RoundedRectangleBorder(
                     borderRadius: BorderRadius.zero)),
               ),
               child: Text('Cancel Print',

diff --git a/lib/status/normal_error_screen.dart b/lib/status/normal_error_screen.dart
@@ -182,13 +182,13 @@ class ErrorScreenState extends State<ErrorScreen> {
                 Navigator.pop(context);
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.all(
+                backgroundColor: WidgetStateProperty.all(
                     const Color.fromARGB(255, 207, 124, 0)),
-                overlayColor: MaterialStateProperty.all(
+                overlayColor: WidgetStateProperty.all(
                     Theme.of(context).primaryColor.withOpacity(0.2)),
-                minimumSize: MaterialStateProperty.all(
+                minimumSize: WidgetStateProperty.all(
                     const Size(double.infinity, kToolbarHeight * 1.2)),
-                shape: MaterialStateProperty.all(const RoundedRectangleBorder(
+                shape: WidgetStateProperty.all(const RoundedRectangleBorder(
                     borderRadius: BorderRadius.zero)),
               ),
               child: Text('Restart Printer',
@@ -205,13 +205,13 @@ class ErrorScreenState extends State<ErrorScreen> {
                 Navigator.pop(context);
               },
               style: ButtonStyle(
-                backgroundColor: MaterialStateProperty.all(
+                backgroundColor: WidgetStateProperty.all(
                     const Color.fromARGB(255, 207, 124, 0)),
-                overlayColor: MaterialStateProperty.all(
+                overlayColor: WidgetStateProperty.all(
                     Theme.of(context).primaryColor.withOpacity(0.2)),
-                minimumSize: MaterialStateProperty.all(
+                minimumSize: WidgetStateProperty.all(
                     const Size(double.infinity, kToolbarHeight * 1.2)),
-                shape: MaterialStateProperty.all(const RoundedRectangleBorder(
+                shape: WidgetStateProperty.all(const RoundedRectangleBorder(
                     borderRadius: BorderRadius.zero)),
               ),
               child: Text('Advanced Information',

diff --git a/lib/themes/themes.dart b/lib/themes/themes.dart
@@ -50,7 +50,7 @@ final ThemeData themeLight = ThemeData(
   ),
   elevatedButtonTheme: ElevatedButtonThemeData(
     style: ButtonStyle(
-      minimumSize: MaterialStateProperty.all<Size>(
+      minimumSize: WidgetStateProperty.all<Size>(
           const Size(88, 50)), // Set the width and height
     ),
   ),
@@ -88,7 +88,7 @@ final ThemeData themeDark = ThemeData(
   ),
   elevatedButtonTheme: ElevatedButtonThemeData(
     style: ButtonStyle(
-      minimumSize: MaterialStateProperty.all<Size>(
+      minimumSize: WidgetStateProperty.all<Size>(
           const Size(88, 50)), // Set the width and height
     ),
   ),

diff --git a/lib/tools/exposure_screen.dart b/lib/tools/exposure_screen.dart
@@ -210,15 +210,15 @@ class ExposureScreenState extends State<ExposureScreen> {
     final theme = Theme.of(context).copyWith(
       elevatedButtonTheme: ElevatedButtonThemeData(
         style: ButtonStyle(
-          shape: MaterialStateProperty.resolveWith<OutlinedBorder?>(
-            (Set<MaterialState> states) {
+          shape: WidgetStateProperty.resolveWith<OutlinedBorder?>(
+            (Set<WidgetState> states) {
               return RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(15),
                   side: const BorderSide(color: Colors.transparent));
             },
           ),
-          minimumSize: MaterialStateProperty.resolveWith<Size?>(
-            (Set<MaterialState> states) {
+          minimumSize: WidgetStateProperty.resolveWith<Size?>(
+            (Set<WidgetState> states) {
               return const Size(double.infinity, double.infinity);
             },
           ),
@@ -263,9 +263,9 @@ class ExposureScreenState extends State<ExposureScreen> {
                                         : () => exposeScreen('Grid'),
                                     style: theme.elevatedButtonTheme.style
                                         ?.copyWith(
-                                      shape: MaterialStateProperty.resolveWith<
+                                      shape: WidgetStateProperty.resolveWith<
                                           OutlinedBorder?>(
-                                        (Set<MaterialState> states) {
+                                        (Set<WidgetState> states) {
                                           return const RoundedRectangleBorder(
                                             borderRadius: BorderRadius.only(
                                               bottomLeft: Radius.circular(15),
@@ -289,9 +289,9 @@ class ExposureScreenState extends State<ExposureScreen> {
                                         : () => exposeScreen('Dimensions'),
                                     style: theme.elevatedButtonTheme.style
                                         ?.copyWith(
-                                      shape: MaterialStateProperty.resolveWith<
+                                      shape: WidgetStateProperty.resolveWith<
                                           OutlinedBorder?>(
-                                        (Set<MaterialState> states) {
+                                        (Set<WidgetState> states) {
                                           return RoundedRectangleBorder(
                                               borderRadius:
                                                   BorderRadius.circular(0));
@@ -313,9 +313,9 @@ class ExposureScreenState extends State<ExposureScreen> {
                                         : () => exposeScreen('Blank'),
                                     style: theme.elevatedButtonTheme.style
                                         ?.copyWith(
-                                      shape: MaterialStateProperty.resolveWith<
+                                      shape: WidgetStateProperty.resolveWith<
                                           OutlinedBorder?>(
-                                        (Set<MaterialState> states) {
+                                        (Set<WidgetState> states) {
                                           return const RoundedRectangleBorder(
                                             borderRadius: BorderRadius.only(
                                               bottomRight: Radius.circular(15),

diff --git a/lib/tools/move_z_screen.dart b/lib/tools/move_z_screen.dart
@@ -80,15 +80,15 @@ class MoveZScreenState extends State<MoveZScreen> {
     final theme = Theme.of(context).copyWith(
       elevatedButtonTheme: ElevatedButtonThemeData(
         style: ButtonStyle(
-          shape: MaterialStateProperty.resolveWith<OutlinedBorder?>(
-            (Set<MaterialState> states) {
+          shape: WidgetStateProperty.resolveWith<OutlinedBorder?>(
+            (Set<WidgetState> states) {
               return RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(15),
               );
             },
           ),
-          minimumSize: MaterialStateProperty.resolveWith<Size?>(
-            (Set<MaterialState> states) {
+          minimumSize: WidgetStateProperty.resolveWith<Size?>(
+            (Set<WidgetState> states) {
               return const Size(double.infinity, double.infinity);
             },
           ),

diff --git a/lib/util/orion_config.dart b/lib/util/orion_config.dart
@@ -91,7 +91,7 @@ class OrionConfig {
                   shape: const RoundedRectangleBorder(
                       borderRadius: BorderRadius.zero),
                   insetPadding: EdgeInsets.zero,
-                  backgroundColor: Theme.of(context).colorScheme.background,
+                  backgroundColor: Theme.of(context).colorScheme.surface,
                   child: const Center(
                     child: SizedBox(
                       height: 75,

diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,13 +5,11 @@
 import FlutterMacOS
 import Foundation
 
-import package_info
 import path_provider_foundation
 import url_launcher_macos
 import window_size
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   WindowSizePlugin.register(with: registry.registrar(forPlugin: "WindowSizePlugin"))

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -1,7 +1,5 @@
 PODS:
   - FlutterMacOS (1.0.0)
-  - package_info (0.0.1):
-    - FlutterMacOS
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -12,16 +10,13 @@ PODS:
 
 DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
-  - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
   - window_size (from `Flutter/ephemeral/.symlinks/plugins/window_size/macos`)
 
 EXTERNAL SOURCES:
   FlutterMacOS:
     :path: Flutter/ephemeral
-  package_info:
-    :path: Flutter/ephemeral/.symlinks/plugins/package_info/macos
   path_provider_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
   url_launcher_macos:
@@ -31,7 +26,6 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
   window_size: 339dafa0b27a95a62a843042038fa6c3c48de195

diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
@@ -2,7 +2,7 @@ import Cocoa
 import FlutterMacOS
 import CoreWLAN
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true