Upgrade to Flutter 3

lib/components/select_train_suggestions/select_train_suggestions.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/select_train_suggestions/select_train_suggestions_cupertino.dart';
@@ -6,7 +5,6 @@ import 'package:info_tren/components/select_train_suggestions/select_train_sugge
 import 'package:info_tren/components/select_train_suggestions/select_train_suggestions_material.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/providers.dart';
-import 'package:info_tren/utils/default_ui_design.dart';
 
 class SelectTrainSuggestions extends ConsumerWidget {
   final List<TrainsResult> choices;

lib/components/slim_app_bar.dart

@@ -44,7 +44,7 @@ class SlimAppBar extends StatelessWidget {
                       title,
                       textAlign: TextAlign.center,
                       style: 
-                        Theme.of(context).appBarTheme.textTheme?.bodySmall?.copyWith(color: Theme.of(context).appBarTheme.textTheme?.bodyMedium?.color) ??
+                        Theme.of(context).textTheme.titleSmall?.copyWith(color: Theme.of(context).textTheme.titleLarge?.color) ??
                         Theme.of(context).textTheme.bodySmall?.copyWith(color: Theme.of(context).textTheme.bodyMedium?.color),
                     ),
                   ),

lib/main.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:fluent_ui/fluent_ui.dart' as f;
 import 'package:flutter/cupertino.dart' as c;
 import 'package:flutter/gestures.dart';
@@ -20,6 +21,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:timezone/data/latest.dart';
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
   initializeTimeZones();
   final sharedPreferences = await SharedPreferences.getInstance();
   runApp(
@@ -107,6 +109,8 @@ class StartPoint extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final uiDesign = ref.watch(uiDesignProvider);
     if (uiDesign == UiDesign.CUPERTINO) {
+      return DynamicColorBuilder(
+        builder: (lightScheme, darkScheme) {
           return AnnotatedRegion(
             value: const SystemUiOverlayStyle(
               statusBarBrightness: c.Brightness.dark,
@@ -114,7 +118,7 @@ class StartPoint extends ConsumerWidget {
             child: c.CupertinoApp(
               title: appTitle,
               theme: c.CupertinoThemeData(
-            primaryColor: m.Colors.blue.shade600,
+                primaryColor: darkScheme?.primary ?? m.Colors.blue.shade600,
                 brightness: c.Brightness.dark,
                 // textTheme: CupertinoTextThemeData(
                 //   textStyle: TextStyle(
@@ -127,27 +131,53 @@ class StartPoint extends ConsumerWidget {
             ),
           );
         }
+      );
+    }
     else if (uiDesign == UiDesign.FLUENT) {
+      return DynamicColorBuilder(
+        builder: (lightScheme, darkScheme) {
           return f.FluentApp(
             title: appTitle,
-        theme: f.ThemeData(
+            theme: f.FluentThemeData(
+              brightness: f.Brightness.light,
+              accentColor: lightScheme != null ? f.AccentColor.swatch({
+                'normal': lightScheme.primary,
+              }) : f.Colors.blue,
+            ),
+            darkTheme: f.FluentThemeData(
               brightness: f.Brightness.dark,
-          accentColor: f.Colors.blue,
+              accentColor: darkScheme != null ? f.AccentColor.swatch({
+                'normal': darkScheme.primary,
+              }) : f.Colors.blue,
             ),
             routes: routes,
             scrollBehavior: Platform.isLinux ? const DragFluentScrollBevahior() : const f.FluentScrollBehavior(),
           );
         }
+      );
+    }
     else {
+      return DynamicColorBuilder(
+        builder: (lightScheme, darkScheme) {
+          lightScheme ??= m.ColorScheme.fromSwatch(
+            brightness: m.Brightness.light,
+            primarySwatch: m.Colors.blue,
+          );
+          darkScheme ??= m.ColorScheme.fromSwatch(
+            brightness: m.Brightness.dark,
+            primarySwatch: m.Colors.blue,
+          );
+            
+
           return m.MaterialApp(
             title: appTitle,
             theme: m.ThemeData(
-          primarySwatch: m.Colors.blue,
+              colorScheme: lightScheme,
-          colorScheme: m.ColorScheme.fromSwatch(
+              useMaterial3: true,
-            brightness: m.Brightness.dark,
+              // fontFamily: 'Atkinson Hyperlegible',
-            primarySwatch: m.Colors.blue,
-            accentColor: m.Colors.blue.shade700,
             ),
+            darkTheme: m.ThemeData(
+              colorScheme: darkScheme,
               useMaterial3: true,
               // fontFamily: 'Atkinson Hyperlegible',
             ),
@@ -155,5 +185,7 @@ class StartPoint extends ConsumerWidget {
             routes: routes,
           );
         }
+      );
+    }
   }
 }

lib/pages/settings/settings_page_cupertino.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:info_tren/components/cupertino_listtile.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/settings/setings_page.dart';
 import 'package:info_tren/providers.dart';

lib/pages/station_arrdep_page/view_station/view_station_material.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 import 'dart:ui';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Badge;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
 import 'package:info_tren/components/loading/loading.dart';

lib/utils/state_to_string.dart

@@ -1,12 +1,7 @@
 import 'package:info_tren/models.dart';
 
-String stateToString(TrainDataState state) {
+String stateToString(TrainDataState state) => switch (state) {
-  switch(state) {
+      TrainDataState.passing => 'trecere fără oprire',
-    case TrainDataState.PASSING:
+      TrainDataState.arrival => 'sosire',
-      return 'trecere fără oprire';
+      TrainDataState.departure => 'plecare',
-    case TrainDataState.ARRIVAL:
+    };
-      return 'sosire';
-    case TrainDataState.DEPARTURE:
-      return 'plecare';
-  }
-}

pubspec.yaml

@@ -14,7 +14,7 @@ description: O aplicație de vizualizare a datelor puse la dispoziție de Inform
 version: 2.7.10
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -30,19 +30,23 @@ dependencies:
   url_launcher: ^6.1.5
   flutter_hooks: ^0.18.5+1
   hooks_riverpod: ^2.0.2
-  freezed_annotation: ^2.2.0
+  freezed_annotation: ^2.4.1
-  json_annotation: ^4.7.0
+  json_annotation: ^4.8.1
   shared_preferences: ^2.0.15
   fluent_ui: ^4.0.3+1
   timezone: ^0.9.0
+  dynamic_color: ^1.6.6
+  riverpod_annotation: ^2.1.1
 
 dev_dependencies:
   # flutter_test:
   #   sdk: flutter
   build_runner: ^2.1.0
   json_serializable: ^6.5.4
-  freezed: 2.2.0
+  freezed: ^2.4.1
   flutter_lints: ^2.0.1
+  riverpod_lint: ^1.3.2
+  riverpod_generator: ^2.2.3
 
 
 # For information on the generic Dart part of this file, see the