chore: update to flutter 3.24

ubuntu-flutter-community · Aug 7, 2024 · bbfa49b · bbfa49b
1 parent 3cc16a4
commit bbfa49b
Show file tree

Hide file tree

Showing 18 changed files with 1,631 additions and 65 deletions.
diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
@@ -76,6 +76,7 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
           Expanded(
             child: BackGesture(
               child: Navigator(
+                // ignore: deprecated_member_use
                 onPopPage: (route, result) => route.didPop(result),
                 key: masterNavigator,
                 onGenerateRoute: (settings) {

diff --git a/lib/common/view/audio_autocomplete.dart b/lib/common/view/audio_autocomplete.dart
@@ -90,7 +90,7 @@ class AudioAutoComplete extends StatelessWidget {
                     child: Material(
                       color: theme.isLight
                           ? theme.colorScheme.surface
-                          : theme.colorScheme.surfaceVariant,
+                          : theme.colorScheme.surfaceContainerHighest,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(6),
                         side: BorderSide(

diff --git a/lib/common/view/country_auto_complete.dart b/lib/common/view/country_auto_complete.dart
@@ -129,7 +129,7 @@ class CountryAutoComplete extends StatelessWidget {
                     child: Material(
                       color: theme.isLight
                           ? theme.colorScheme.surface
-                          : theme.colorScheme.surfaceVariant,
+                          : theme.colorScheme.surfaceContainerHighest,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(6),
                         side: BorderSide(

diff --git a/lib/common/view/language_autocomplete.dart b/lib/common/view/language_autocomplete.dart
@@ -125,7 +125,7 @@ class LanguageAutoComplete extends StatelessWidget {
                     child: Material(
                       color: theme.isLight
                           ? theme.colorScheme.surface
-                          : theme.colorScheme.surfaceVariant,
+                          : theme.colorScheme.surfaceContainerHighest,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(6),
                         side: BorderSide(

diff --git a/lib/extensions/theme_data_x.dart b/lib/extensions/theme_data_x.dart
@@ -22,7 +22,7 @@ extension ThemeDataX on ThemeData {
   TextStyle? get pageHeaderSubtitleStyle =>
       textTheme.labelLarge?.copyWith(fontWeight: FontWeight.w500);
 
-  Color get containerBg => colorScheme.background.scale(
+  Color get containerBg => colorScheme.surface.scale(
         lightness:
             isLight ? (yaruStyled ? -0.03 : -0.02) : (yaruStyled ? 0.01 : 0.02),
         saturation: -0.5,

diff --git a/lib/player/view/volume_popup.dart b/lib/player/view/volume_popup.dart
@@ -35,7 +35,7 @@ class VolumeSliderPopup extends StatelessWidget with WatchItMixin {
     }
     return PopupMenuButton(
       color: theme.isLight
-          ? theme.colorScheme.background.scale(lightness: -0.04)
+          ? theme.colorScheme.surface.scale(lightness: -0.04)
           : null,
       iconColor: color ?? theme.colorScheme.onSurface,
       padding: EdgeInsets.zero,

diff --git a/lib/playlists/view/add_to_playlist_dialog.dart b/lib/playlists/view/add_to_playlist_dialog.dart
@@ -25,6 +25,7 @@ class AddToPlaylistDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final nav = Navigator(
+      // ignore: deprecated_member_use
       onPopPage: (route, result) => route.didPop(result),
       key: playlistNavigatorKey,
       initialRoute: '/',

diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
@@ -31,6 +31,7 @@ class ManualAddDialog extends StatelessWidget {
         height: 200,
         width: 400,
         child: Navigator(
+          // ignore: deprecated_member_use
           onPopPage: (route, result) => route.didPop(result),
           key: manualAddNavigatorKey,
           initialRoute: '/chose',

diff --git a/lib/podcasts/view/podcast_genre_autocomplete.dart b/lib/podcasts/view/podcast_genre_autocomplete.dart
@@ -117,7 +117,7 @@ class PodcastGenreAutoComplete extends StatelessWidget {
                     child: Material(
                       color: theme.isLight
                           ? theme.colorScheme.surface
-                          : theme.colorScheme.surfaceVariant,
+                          : theme.colorScheme.surfaceContainerHighest,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(6),
                         side: BorderSide(

diff --git a/lib/radio/view/tag_auto_complete.dart b/lib/radio/view/tag_auto_complete.dart
@@ -102,7 +102,7 @@ class TagAutoComplete extends StatelessWidget {
                     child: Material(
                       color: theme.isLight
                           ? theme.colorScheme.surface
-                          : theme.colorScheme.surfaceVariant,
+                          : theme.colorScheme.surfaceContainerHighest,
                       shape: RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(6),
                         side: BorderSide(

diff --git a/lib/settings/view/about_page.dart b/lib/settings/view/about_page.dart
@@ -39,7 +39,7 @@ class _AboutPageState extends State<AboutPage> {
 
     return Container(
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         borderRadius: BorderRadius.circular(10),
       ),
       child: Column(

diff --git a/lib/settings/view/licenses_page.dart b/lib/settings/view/licenses_page.dart
@@ -8,7 +8,7 @@ class LicensesPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.background,
+        color: Theme.of(context).colorScheme.surface,
         borderRadius: BorderRadius.circular(kYaruContainerRadius),
       ),
       child: ClipRRect(

diff --git a/lib/settings/view/settings_dialog.dart b/lib/settings/view/settings_dialog.dart
@@ -11,6 +11,7 @@ class SettingsDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final nav = Navigator(
+      // ignore: deprecated_member_use
       onPopPage: (route, result) => route.didPop(result),
       key: settingsNavigatorKey,
       initialRoute: '/settings',
@@ -29,7 +30,7 @@ class SettingsDialog extends StatelessWidget {
     );
 
     return AlertDialog(
-      backgroundColor: Theme.of(context).colorScheme.background,
+      backgroundColor: Theme.of(context).colorScheme.surface,
       titlePadding: EdgeInsets.zero,
       contentPadding: EdgeInsets.zero,
       content: SizedBox(height: 800, width: 600, child: nav),

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

diff --git a/macos/build/.last_build_id b/macos/build/.last_build_id
@@ -0,0 +1 @@
+af5208aaff90c1ef9277816f45cc32c9