Choose ideal group until selection is implemented

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -51,7 +51,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "ro.dcdev.infotren"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -0,0 +1,34 @@
+PODS:
+  - Flutter (1.0.0)
+  - package_info_plus (0.4.5):
+    - Flutter
+  - shared_preferences_ios (0.0.1):
+    - Flutter
+  - url_launcher_ios (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  shared_preferences_ios:
+    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+
+SPEC CHECKSUMS:
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		AF5528149967EA996B5AA109 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E6EB5FA5AA2228D5622CD62 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,7 +32,11 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2088AE25E07C211FFB9CE536 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		2F80AD107B0E1CC9E1C01A5A /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		5DA42B3CD8940DB121C028E8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		6E6EB5FA5AA2228D5622CD62 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -49,6 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				AF5528149967EA996B5AA109 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -72,6 +78,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				B55F9B76DFEAB456725329A0 /* Pods */,
+				E56598AA51C5533E6B51BD5A /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -98,6 +106,25 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		B55F9B76DFEAB456725329A0 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				2F80AD107B0E1CC9E1C01A5A /* Pods-Runner.debug.xcconfig */,
+				2088AE25E07C211FFB9CE536 /* Pods-Runner.release.xcconfig */,
+				5DA42B3CD8940DB121C028E8 /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+		E56598AA51C5533E6B51BD5A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				6E6EB5FA5AA2228D5622CD62 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -105,12 +132,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				2B2F3198BD0D2214C77EC99E /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				D71FC49A789443CEBF7C5C70 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -127,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -169,6 +198,28 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		2B2F3198BD0D2214C77EC99E /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -197,6 +248,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		D71FC49A789443CEBF7C5C70 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -272,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -351,7 +419,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -400,7 +468,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

ios/Runner/Info.plist

@@ -43,5 +43,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

lib/api/station_data.dart

@@ -4,7 +4,11 @@ import 'package:http/http.dart' as http;
 import 'package:info_tren/api/common.dart';
 import 'package:info_tren/models.dart';
 
-Future<StationData> getStationData(String stationName) async {
+Future<StationData> getStationData(String stationName, [DateTime? date]) async {
-  final response = await http.get(Uri.https(authority, 'v3/stations/$stationName'));
+  final uri = Uri.https(authority, 'v3/stations/$stationName');
+  if (date != null) {
+    uri.queryParameters['date'] = date.toIso8601String();
+  }
+  final response = await http.get(uri);
   return StationData.fromJson(jsonDecode(response.body));
 }

lib/api/train_data.dart

@@ -4,7 +4,7 @@ import 'package:info_tren/models.dart';
 
 Future<TrainData> getTrain(String trainNumber, {DateTime? date}) async {
   date ??= DateTime.now();
-  final response = await http.get(Uri.https(authority, 'v2/train/$trainNumber', {
+  final response = await http.get(Uri.https(authority, 'v3/trains/$trainNumber', {
     'date': date.toUtc().toIso8601String(),
   }),);
   return trainDataFromJson(response.body);

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,52 +109,82 @@ class StartPoint extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final uiDesign = ref.watch(uiDesignProvider);
     if (uiDesign == UiDesign.CUPERTINO) {
-      return AnnotatedRegion(
+      return DynamicColorBuilder(
-        value: const SystemUiOverlayStyle(
+        builder: (lightScheme, darkScheme) {
-          statusBarBrightness: c.Brightness.dark,
+          return AnnotatedRegion(
-        ),
+            value: const SystemUiOverlayStyle(
-        child: c.CupertinoApp(
+              statusBarBrightness: c.Brightness.dark,
-          title: appTitle,
+            ),
-          theme: c.CupertinoThemeData(
+            child: c.CupertinoApp(
-            primaryColor: m.Colors.blue.shade600,
+              title: appTitle,
-            brightness: c.Brightness.dark,
+              theme: c.CupertinoThemeData(
-            // textTheme: CupertinoTextThemeData(
+                primaryColor: darkScheme?.primary ?? m.Colors.blue.shade600,
-            //   textStyle: TextStyle(
+                brightness: c.Brightness.dark,
-            //     fontFamily: 'Atkinson Hyperlegible',
+                // textTheme: CupertinoTextThemeData(
-            //   ),
+                //   textStyle: TextStyle(
-            // ),
+                //     fontFamily: 'Atkinson Hyperlegible',
-          ),
+                //   ),
-          scrollBehavior: Platform.isLinux ? const DragCupertinoScrollBevahior() : null,
+                // ),
-          routes: routes,
+              ),
-        ),
+              scrollBehavior: Platform.isLinux ? const DragCupertinoScrollBevahior() : null,
+              routes: routes,
+            ),
+          );
+        }
       );
     }
     else if (uiDesign == UiDesign.FLUENT) {
-      return f.FluentApp(
+      return DynamicColorBuilder(
-        title: appTitle,
+        builder: (lightScheme, darkScheme) {
-        theme: f.ThemeData(
+          return f.FluentApp(
-          brightness: f.Brightness.dark,
+            title: appTitle,
-          accentColor: f.Colors.blue,
+            theme: f.FluentThemeData(
-        ),
+              brightness: f.Brightness.light,
-        routes: routes,
+              accentColor: lightScheme != null ? f.AccentColor.swatch({
-        scrollBehavior: Platform.isLinux ? const DragFluentScrollBevahior() : const f.FluentScrollBehavior(),
+                'normal': lightScheme.primary,
+              }) : f.Colors.blue,
+            ),
+            darkTheme: f.FluentThemeData(
+              brightness: f.Brightness.dark,
+              accentColor: darkScheme != null ? f.AccentColor.swatch({
+                'normal': darkScheme.primary,
+              }) : f.Colors.blue,
+            ),
+            routes: routes,
+            scrollBehavior: Platform.isLinux ? const DragFluentScrollBevahior() : const f.FluentScrollBehavior(),
+          );
+        }
       );
     }
     else {
-      return m.MaterialApp(
+      return DynamicColorBuilder(
-        title: appTitle,
+        builder: (lightScheme, darkScheme) {
-        theme: m.ThemeData(
+          lightScheme ??= m.ColorScheme.fromSwatch(
-          primarySwatch: m.Colors.blue,
+            brightness: m.Brightness.light,
-          colorScheme: m.ColorScheme.fromSwatch(
+            primarySwatch: m.Colors.blue,
+          );
+          darkScheme ??= m.ColorScheme.fromSwatch(
             brightness: m.Brightness.dark,
             primarySwatch: m.Colors.blue,
-            accentColor: m.Colors.blue.shade700,
+          );
-          ),
+            
-          useMaterial3: true,
+
-          // fontFamily: 'Atkinson Hyperlegible',
+          return m.MaterialApp(
-        ),
+            title: appTitle,
-        scrollBehavior: Platform.isLinux ? const DragMaterialScrollBevahior() : null,
+            theme: m.ThemeData(
-        routes: routes,
+              colorScheme: lightScheme,
+              useMaterial3: true,
+              // fontFamily: 'Atkinson Hyperlegible',
+            ),
+            darkTheme: m.ThemeData(
+              colorScheme: darkScheme,
+              useMaterial3: true,
+              // fontFamily: 'Atkinson Hyperlegible',
+            ),
+            scrollBehavior: Platform.isLinux ? const DragMaterialScrollBevahior() : null,
+            routes: routes,
+          );
+        }
       );
     }
   }

lib/models.dart

@@ -4,11 +4,11 @@ export 'package:info_tren/models/station_data.dart';
 export 'package:info_tren/models/station_status.dart';
 export 'package:info_tren/models/station_train.dart';
 export 'package:info_tren/models/stations_result.dart';
-export 'package:info_tren/models/train_data.dart' hide State;
+export 'package:info_tren/models/train_data.dart';
 export 'package:info_tren/models/trains_result.dart';
 export 'package:info_tren/models/ui_design.dart';
 export 'package:info_tren/models/ui_timezone.dart';
 
-import 'package:info_tren/models/train_data.dart' show State;
+import 'package:info_tren/models/train_data.dart' show TrainDataStatusState;
 
-typedef TrainDataState = State;
+typedef TrainDataState = TrainDataStatusState;

lib/models/station_arrdep.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'station_arrdep.dart';
 

lib/models/station_data.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'station_data.dart';
 
@@ -158,6 +158,7 @@ class _$_StationData implements _StationData {
   List<StationArrDep>? get arrivals {
     final value = _arrivals;
     if (value == null) return null;
+    if (_arrivals is EqualUnmodifiableListView) return _arrivals;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(value);
   }
@@ -167,6 +168,7 @@ class _$_StationData implements _StationData {
   List<StationArrDep>? get departures {
     final value = _departures;
     if (value == null) return null;
+    if (_departures is EqualUnmodifiableListView) return _departures;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(value);
   }

lib/models/station_status.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'station_status.dart';
 

lib/models/station_train.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'station_train.dart';
 
@@ -189,6 +189,7 @@ class _$_StationTrain implements _StationTrain {
   List<String>? get route {
     final value = _route;
     if (value == null) return null;
+    if (_route is EqualUnmodifiableListView) return _route;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(value);
   }

lib/models/stations_result.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'stations_result.dart';
 
@@ -121,6 +121,7 @@ class _$_StationsResult implements _StationsResult {
   List<String>? get stoppedAtBy {
     final value = _stoppedAtBy;
     if (value == null) return null;
+    if (_stoppedAtBy is EqualUnmodifiableListView) return _stoppedAtBy;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(value);
   }

lib/models/train_data.dart

@@ -4,181 +4,118 @@
 
 import 'dart:convert';
 
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'train_data.freezed.dart';
+part 'train_data.g.dart';
+
 TrainData trainDataFromJson(String str) => TrainData.fromJson(json.decode(str));
 
 String trainDataToJson(TrainData data) => json.encode(data.toJson());
 
 /// Results of scrapping InfoFer website for train info
-class TrainData {
+@freezed
-  TrainData({
+class TrainData with _$TrainData {
-    required this.date,
+  const TrainData._();
-    required this.number,
+  
-    required this.operator,
+  const factory TrainData({
-    required this.rank,
+    required String rank,
-    required this.route,
+    required String number,
-    required this.stations,
+    required String date,
-    this.status,
+    required String operator,
-  });
+    required List<TrainDataGroup> groups,
+  }) = _TrainData;
 
-  final String date;
+  factory TrainData.fromJson(Map<String, dynamic> json) => _$TrainDataFromJson(json);
-  final String number;
+  
-  final String operator;
+  TrainDataGroup get idealGroup {
-  final String rank;
+    var result = groups.first;
-  final Route route;
+    
-  final List<Station> stations;
+    for (final group in groups) {
-  final TrainDataStatus? status;
+      if (result.stations.map((s) => s.linkName).toSet().difference(group.stations.map((s) => s.linkName).toSet()).isEmpty) {
+        result = group;
+      }
+    }
 
-  factory TrainData.fromJson(Map<String, dynamic> json) => TrainData(
+    return result;
-        date: json["date"],
+  }
-        number: json["number"],
+  
-        operator: json["operator"],
+  List<TrainDataStation> get stations => idealGroup.stations;
-        rank: json["rank"],
+  TrainDataRoute get route => idealGroup.route;
-        route: Route.fromJson(json["route"]),
+  TrainDataStatus? get status => idealGroup.status;
-        stations: List<Station>.from(
+}
-            json["stations"].map((x) => Station.fromJson(x))),
-        status: json["status"] == null
-            ? null
-            : TrainDataStatus.fromJson(json["status"]),
-      );
 
-  Map<String, dynamic> toJson() => {
+@freezed
-        "date": date,
+class TrainDataGroup with _$TrainDataGroup {
-        "number": number,
+  const factory TrainDataGroup({
-        "operator": operator,
+    required TrainDataRoute route,
-        "rank": rank,
+    required List<TrainDataStation> stations,
-        "route": route.toJson(),
+    TrainDataStatus? status,
-        "stations": List<dynamic>.from(stations.map((x) => x.toJson())),
+  }) = _TrainDataGroup;
-        "status": status?.toJson(),
+  
-      };
+  factory TrainDataGroup.fromJson(Map<String, dynamic> json) => _$TrainDataGroupFromJson(json);
 }
 
 /// Route of the train
-class Route {
+@freezed
-  Route({
+class TrainDataRoute with _$TrainDataRoute {
-    required this.from,
+  const factory TrainDataRoute({
-    required this.to,
+    required String from,
-  });
+    required String to,
+  }) = _TrainDataRoute;
 
-  final String from;
+  factory TrainDataRoute.fromJson(Map<String, dynamic> json) => _$TrainDataRouteFromJson(json);
-  final String to;
-
-  factory Route.fromJson(Map<String, dynamic> json) => Route(
-        from: json["from"],
-        to: json["to"],
-      );
-
-  Map<String, dynamic> toJson() => {
-        "from": from,
-        "to": to,
-      };
 }
 
-class Station {
+@freezed
-  Station({
+class TrainDataStation with _$TrainDataStation {
-    this.arrival,
+  const factory TrainDataStation({
-    this.departure,
+    required String name,
-    required this.km,
+    required String linkName,
-    required this.name,
+    required int km,
-    this.platform,
+    int? stoppingTime,
-    this.stoppingTime,
+    String? platform,
-  });
+    StationArrDepTime? arrival,
+    StationArrDepTime? departure,
+    @TrainDataNoteConverter()
+    required List<TrainDataNote> notes,
+  }) = _TrainDataStation;
 
-  final StationArrDepTime? arrival;
+  factory TrainDataStation.fromJson(Map<String, dynamic> json) => _$TrainDataStationFromJson(json);
-  final StationArrDepTime? departure;
-  final int km;
-  final String name;
-  final String? platform;
-  final int? stoppingTime;
-
-  factory Station.fromJson(Map<String, dynamic> json) => Station(
-        arrival: json["arrival"] == null
-            ? null
-            : StationArrDepTime.fromJson(json["arrival"]),
-        departure: json["departure"] == null
-            ? null
-            : StationArrDepTime.fromJson(json["departure"]),
-        km: json["km"],
-        name: json["name"],
-        platform: json["platform"],
-        stoppingTime:
-            json["stoppingTime"],
-      );
-
-  Map<String, dynamic> toJson() => {
-        "arrival": arrival?.toJson(),
-        "departure": departure?.toJson(),
-        "km": km,
-        "name": name,
-        "platform": platform,
-        "stoppingTime": stoppingTime,
-      };
 }
 
-class StationArrDepTime {
+@freezed
-  StationArrDepTime({
+class StationArrDepTime with _$StationArrDepTime {
-    required this.scheduleTime,
+  const factory StationArrDepTime({
-    this.status,
+    required DateTime scheduleTime,
-  });
+    StationArrDepTimeStatus? status,
+  }) = _StationArrDepTime;
 
-  final DateTime scheduleTime;
+  factory StationArrDepTime.fromJson(Map<String, dynamic> json) => _$StationArrDepTimeFromJson(json);
-  final StationArrDepTimeStatus? status;
-
-  factory StationArrDepTime.fromJson(Map<String, dynamic> json) =>
-      StationArrDepTime(
-        scheduleTime: DateTime.parse(json["scheduleTime"] as String),
-        status: json["status"] == null ? null : StationArrDepTimeStatus.fromJson(json["status"]),
-      );
-
-  Map<String, dynamic> toJson() => {
-        "scheduleTime": scheduleTime.toIso8601String(),
-        "status": status?.toJson(),
-      };
 }
 
-class StationArrDepTimeStatus {
+@freezed
-  StationArrDepTimeStatus({
+class StationArrDepTimeStatus with _$StationArrDepTimeStatus {
-    required this.delay,
+  const factory StationArrDepTimeStatus({
-    required this.real,
+    required int delay,
-  });
+    required bool real,
+    required bool cancelled,
+  }) = _StationArrDepTimeStatus;
 
-  final int delay;
+  factory StationArrDepTimeStatus.fromJson(Map<String, dynamic> json) => _$StationArrDepTimeStatusFromJson(json);
-  final bool real;
-
-  factory StationArrDepTimeStatus.fromJson(Map<String, dynamic> json) =>
-      StationArrDepTimeStatus(
-        delay: json["delay"],
-        real: json["real"],
-      );
-
-  Map<String, dynamic> toJson() => {
-        "delay": delay,
-        "real": real,
-      };
 }
 
-class TrainDataStatus {
+@freezed
-  TrainDataStatus({
+class TrainDataStatus with _$TrainDataStatus {
-    required this.delay,
+  const TrainDataStatus._();
-    required this.state,
-    required this.station,
-  });
 
-  final int delay;
+  const factory TrainDataStatus({
-  final State state;
+    required int delay,
-  final String station;
+    required String station,
+    required TrainDataStatusState state,
+  }) = _TrainDataStatus;
 
-  factory TrainDataStatus.fromJson(Map<String, dynamic> json) =>
+  factory TrainDataStatus.fromJson(Map<String, dynamic> json) => _$TrainDataStatusFromJson(json);
-      TrainDataStatus(
-        delay: json["delay"],
-        state: stateValues.map[json["state"]]!,
-        station: json["station"],
-      );
-
-  Map<String, dynamic> toJson() => {
-        "delay": delay,
-        "state": stateValues.reverse[state],
-        "station": station,
-      };
 
   @override
   String toString() {
@@ -190,38 +127,118 @@ class TrainDataStatus {
       result += '${delay.abs()} min';
     }
     result += ' la ';
-    switch (state) {
+    result += switch (state) {
-      case State.PASSING:
+      TrainDataStatusState.passing => 'trecerea fără oprire prin',
-        result += 'trecerea fără oprire prin';
+      TrainDataStatusState.arrival => 'sosirea în',
-        break;
+      TrainDataStatusState.departure => 'plecarea din',
-      case State.ARRIVAL:
+    };
-        result += 'sosirea în';
-        break;
-      case State.DEPARTURE:
-        result += 'plecarea din';
-        break;
-    }
     result += station;
     return result;
   }
 }
 
-enum State { PASSING, ARRIVAL, DEPARTURE }
+enum TrainDataStatusState { passing, arrival, departure }
 
-final stateValues = EnumValues({
+abstract class TrainDataNote {
-  "arrival": State.ARRIVAL,
+  final String kind;
-  "departure": State.DEPARTURE,
-  "passing": State.PASSING
-});
 
-class EnumValues<T> {
+  const TrainDataNote({required this.kind});
-  Map<String, T> map;
-  Map<T, String>? reverseMap;
 
-  EnumValues(this.map);
+  Map<String, dynamic> toJson() => {
+    "kind": kind,
+  };
+}
 
-  Map<T, String> get reverse {
+class TrainDataNoteConverter implements JsonConverter<TrainDataNote, Map<String, dynamic>> {
-    reverseMap ??= map.map((k, v) => MapEntry(v, k));
+  const TrainDataNoteConverter();
-    return reverseMap!;
+
+  @override
+  TrainDataNote fromJson(Map<String, dynamic> json) {
+    return switch(json['kind']) {
+      'trainNumberChange' => TrainDataNoteTrainNumberChange.fromJson(json),
+      'departsAs' => TrainDataNoteDepartsAs.fromJson(json),
+      'detachingWagons' => TrainDataNoteDetachingWagons.fromJson(json),
+      'receivingWagons' => TrainDataNoteReceivingWagons.fromJson(json),
+      _ => TrainDataNoteUnknown.fromJson(json),
+    };
+  }
+
+  @override
+  Map<String, dynamic> toJson(TrainDataNote object) {
+    return object.toJson();
   }
 }
+
+@freezed
+class TrainDataNoteTrainNumberChange with _$TrainDataNoteTrainNumberChange implements TrainDataNote {
+  @Implements<TrainDataNote>()
+  const factory TrainDataNoteTrainNumberChange({
+    // base
+    @Default("trainNumberChange")
+    String kind,
+    // impl
+    required String rank,
+    required String number,
+  }) = _TrainDataNoteTrainNumberChange;  
+  
+  factory TrainDataNoteTrainNumberChange.fromJson(Map<String, dynamic> json) => _$TrainDataNoteTrainNumberChangeFromJson(json);
+}
+
+@freezed
+class TrainDataNoteDepartsAs with _$TrainDataNoteDepartsAs implements TrainDataNote {
+  @Implements<TrainDataNote>()
+  const factory TrainDataNoteDepartsAs({
+    // base
+    @Default("departsAs")
+    String kind,
+    // impl
+    required String rank,
+    required String number,
+    required DateTime departureDate,
+  }) = _TrainDataNoteDepartsAs;  
+  
+  factory TrainDataNoteDepartsAs.fromJson(Map<String, dynamic> json) => _$TrainDataNoteDepartsAsFromJson(json);
+}
+
+@freezed
+class TrainDataNoteDetachingWagons with _$TrainDataNoteDetachingWagons implements TrainDataNote {
+  @Implements<TrainDataNote>()
+  const factory TrainDataNoteDetachingWagons({
+    // base
+    @Default("detachingWagons")
+    String kind,
+    // impl
+    required String station,
+  }) = _TrainDataNoteDetachingWagons;  
+  
+  factory TrainDataNoteDetachingWagons.fromJson(Map<String, dynamic> json) => _$TrainDataNoteDetachingWagonsFromJson(json);
+}
+@freezed
+class TrainDataNoteReceivingWagons with _$TrainDataNoteReceivingWagons implements TrainDataNote {
+  @Implements<TrainDataNote>()
+  const factory TrainDataNoteReceivingWagons({
+    // base
+    @Default("receivingWagons")
+    String kind,
+    // impl
+    required String station,
+  }) = _TrainDataNoteReceivingWagons;  
+  
+  factory TrainDataNoteReceivingWagons.fromJson(Map<String, dynamic> json) => _$TrainDataNoteReceivingWagonsFromJson(json);
+}
+  
+@freezed
+class TrainDataNoteUnknown with _$TrainDataNoteUnknown implements TrainDataNote {
+  @Implements<TrainDataNote>()
+  const factory TrainDataNoteUnknown({
+    // base
+    required String kind,
+    // impl
+    required Map<String, dynamic> extra,
+  }) = _TrainDataNoteUnknown;
+  
+  factory TrainDataNoteUnknown.fromJson(Map<String, dynamic> json) => TrainDataNoteUnknown(
+    kind: json['kind'], 
+    extra: Map.from(json)..remove('kind'),
+  );
+}

lib/models/train_data.g.dart

@@ -0,0 +1,217 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'train_data.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$_TrainData _$$_TrainDataFromJson(Map<String, dynamic> json) => _$_TrainData(
+      rank: json['rank'] as String,
+      number: json['number'] as String,
+      date: json['date'] as String,
+      operator: json['operator'] as String,
+      groups: (json['groups'] as List<dynamic>)
+          .map((e) => TrainDataGroup.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$$_TrainDataToJson(_$_TrainData instance) =>
+    <String, dynamic>{
+      'rank': instance.rank,
+      'number': instance.number,
+      'date': instance.date,
+      'operator': instance.operator,
+      'groups': instance.groups,
+    };
+
+_$_TrainDataGroup _$$_TrainDataGroupFromJson(Map<String, dynamic> json) =>
+    _$_TrainDataGroup(
+      route: TrainDataRoute.fromJson(json['route'] as Map<String, dynamic>),
+      stations: (json['stations'] as List<dynamic>)
+          .map((e) => TrainDataStation.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      status: json['status'] == null
+          ? null
+          : TrainDataStatus.fromJson(json['status'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$$_TrainDataGroupToJson(_$_TrainDataGroup instance) =>
+    <String, dynamic>{
+      'route': instance.route,
+      'stations': instance.stations,
+      'status': instance.status,
+    };
+
+_$_TrainDataRoute _$$_TrainDataRouteFromJson(Map<String, dynamic> json) =>
+    _$_TrainDataRoute(
+      from: json['from'] as String,
+      to: json['to'] as String,
+    );
+
+Map<String, dynamic> _$$_TrainDataRouteToJson(_$_TrainDataRoute instance) =>
+    <String, dynamic>{
+      'from': instance.from,
+      'to': instance.to,
+    };
+
+_$_TrainDataStation _$$_TrainDataStationFromJson(Map<String, dynamic> json) =>
+    _$_TrainDataStation(
+      name: json['name'] as String,
+      linkName: json['linkName'] as String,
+      km: json['km'] as int,
+      stoppingTime: json['stoppingTime'] as int?,
+      platform: json['platform'] as String?,
+      arrival: json['arrival'] == null
+          ? null
+          : StationArrDepTime.fromJson(json['arrival'] as Map<String, dynamic>),
+      departure: json['departure'] == null
+          ? null
+          : StationArrDepTime.fromJson(
+              json['departure'] as Map<String, dynamic>),
+      notes: (json['notes'] as List<dynamic>)
+          .map((e) => const TrainDataNoteConverter()
+              .fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$$_TrainDataStationToJson(_$_TrainDataStation instance) =>
+    <String, dynamic>{
+      'name': instance.name,
+      'linkName': instance.linkName,
+      'km': instance.km,
+      'stoppingTime': instance.stoppingTime,
+      'platform': instance.platform,
+      'arrival': instance.arrival,
+      'departure': instance.departure,
+      'notes':
+          instance.notes.map(const TrainDataNoteConverter().toJson).toList(),
+    };
+
+_$_StationArrDepTime _$$_StationArrDepTimeFromJson(Map<String, dynamic> json) =>
+    _$_StationArrDepTime(
+      scheduleTime: DateTime.parse(json['scheduleTime'] as String),
+      status: json['status'] == null
+          ? null
+          : StationArrDepTimeStatus.fromJson(
+              json['status'] as Map<String, dynamic>),
+    );
+
+Map<String, dynamic> _$$_StationArrDepTimeToJson(
+        _$_StationArrDepTime instance) =>
+    <String, dynamic>{
+      'scheduleTime': instance.scheduleTime.toIso8601String(),
+      'status': instance.status,
+    };
+
+_$_StationArrDepTimeStatus _$$_StationArrDepTimeStatusFromJson(
+        Map<String, dynamic> json) =>
+    _$_StationArrDepTimeStatus(
+      delay: json['delay'] as int,
+      real: json['real'] as bool,
+      cancelled: json['cancelled'] as bool,
+    );
+
+Map<String, dynamic> _$$_StationArrDepTimeStatusToJson(
+        _$_StationArrDepTimeStatus instance) =>
+    <String, dynamic>{
+      'delay': instance.delay,
+      'real': instance.real,
+      'cancelled': instance.cancelled,
+    };
+
+_$_TrainDataStatus _$$_TrainDataStatusFromJson(Map<String, dynamic> json) =>
+    _$_TrainDataStatus(
+      delay: json['delay'] as int,
+      station: json['station'] as String,
+      state: $enumDecode(_$TrainDataStatusStateEnumMap, json['state']),
+    );
+
+Map<String, dynamic> _$$_TrainDataStatusToJson(_$_TrainDataStatus instance) =>
+    <String, dynamic>{
+      'delay': instance.delay,
+      'station': instance.station,
+      'state': _$TrainDataStatusStateEnumMap[instance.state]!,
+    };
+
+const _$TrainDataStatusStateEnumMap = {
+  TrainDataStatusState.passing: 'passing',
+  TrainDataStatusState.arrival: 'arrival',
+  TrainDataStatusState.departure: 'departure',
+};
+
+_$_TrainDataNoteTrainNumberChange _$$_TrainDataNoteTrainNumberChangeFromJson(
+        Map<String, dynamic> json) =>
+    _$_TrainDataNoteTrainNumberChange(
+      kind: json['kind'] as String? ?? "trainNumberChange",
+      rank: json['rank'] as String,
+      number: json['number'] as String,
+    );
+
+Map<String, dynamic> _$$_TrainDataNoteTrainNumberChangeToJson(
+        _$_TrainDataNoteTrainNumberChange instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'rank': instance.rank,
+      'number': instance.number,
+    };
+
+_$_TrainDataNoteDepartsAs _$$_TrainDataNoteDepartsAsFromJson(
+        Map<String, dynamic> json) =>
+    _$_TrainDataNoteDepartsAs(
+      kind: json['kind'] as String? ?? "departsAs",
+      rank: json['rank'] as String,
+      number: json['number'] as String,
+      departureDate: DateTime.parse(json['departureDate'] as String),
+    );
+
+Map<String, dynamic> _$$_TrainDataNoteDepartsAsToJson(
+        _$_TrainDataNoteDepartsAs instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'rank': instance.rank,
+      'number': instance.number,
+      'departureDate': instance.departureDate.toIso8601String(),
+    };
+
+_$_TrainDataNoteDetachingWagons _$$_TrainDataNoteDetachingWagonsFromJson(
+        Map<String, dynamic> json) =>
+    _$_TrainDataNoteDetachingWagons(
+      kind: json['kind'] as String? ?? "detachingWagons",
+      station: json['station'] as String,
+    );
+
+Map<String, dynamic> _$$_TrainDataNoteDetachingWagonsToJson(
+        _$_TrainDataNoteDetachingWagons instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'station': instance.station,
+    };
+
+_$_TrainDataNoteReceivingWagons _$$_TrainDataNoteReceivingWagonsFromJson(
+        Map<String, dynamic> json) =>
+    _$_TrainDataNoteReceivingWagons(
+      kind: json['kind'] as String? ?? "receivingWagons",
+      station: json['station'] as String,
+    );
+
+Map<String, dynamic> _$$_TrainDataNoteReceivingWagonsToJson(
+        _$_TrainDataNoteReceivingWagons instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'station': instance.station,
+    };
+
+_$_TrainDataNoteUnknown _$$_TrainDataNoteUnknownFromJson(
+        Map<String, dynamic> json) =>
+    _$_TrainDataNoteUnknown(
+      kind: json['kind'] as String,
+      extra: json['extra'] as Map<String, dynamic>,
+    );
+
+Map<String, dynamic> _$$_TrainDataNoteUnknownToJson(
+        _$_TrainDataNoteUnknown instance) =>
+    <String, dynamic>{
+      'kind': instance.kind,
+      'extra': instance.extra,
+    };

lib/models/trains_result.freezed.dart

@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'trains_result.dart';
 

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.dart

@@ -43,8 +43,9 @@ class ViewStationPage extends HookConsumerWidget {
 
 class ViewStationArguments {
   final String stationName;
+  final DateTime? date;
 
-  const ViewStationArguments({required this.stationName});
+  const ViewStationArguments({required this.stationName, this.date});
 }
 
 abstract class ViewStationPageShared extends StatelessWidget {

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/pages/train_info_page/view_train/train_info.dart

@@ -1,4 +1,7 @@
+import 'dart:async';
+
 import 'package:flutter/widgets.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/api/train_data.dart';
 import 'package:info_tren/components/loading/loading.dart';
@@ -9,59 +12,93 @@ import 'package:info_tren/pages/train_info_page/view_train/train_info_fluent.dar
 import 'package:info_tren/pages/train_info_page/view_train/train_info_material.dart';
 import 'package:info_tren/providers.dart';
 
-
+class TrainInfo extends HookConsumerWidget {
-class TrainInfo extends ConsumerWidget {
   static String routeName = "/trainInfo/display";
 
-  const TrainInfo({super.key,});
+  const TrainInfo({
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final uiDesign = ref.watch(uiDesignProvider);
     final args = ref.watch(trainInfoArgumentsProvider);
     final trainNumber = args.trainNumber;
-    final date = args.date;
+    final viewYesterday = useState(false);
+    final date = args.date ??
+        DateTime.now().copyWith(
+          hour: 12,
+          minute: 0,
+          second: 0,
+          millisecond: 0,
+          microsecond: 0,
+        );
+    final requestDate =
+        viewYesterday.value ? date.subtract(const Duration(days: 1)) : date;
+    final trainDataAsync = ref
+        .watch(trainInfoProvider(trainNumber: trainNumber, date: requestDate));
 
-    return RefreshFutureBuilder<TrainData>(
+    Future refresh() async {
-      futureCreator: () => getTrain(trainNumber, date: date),
+      ref.invalidate(
-      builder: (context, refresh, replaceFutureBuilder, snapshot) {
+        trainInfoProvider(trainNumber: trainNumber, date: requestDate),
-        void onViewYesterdayTrain() {
+      );
-          replaceFutureBuilder(() => getTrain(trainNumber, date: DateTime.now().subtract(const Duration(days: 1))));
+      await Future.delayed(const Duration(seconds: 1));
-        }
+    }
 
-        if ([RefreshFutureBuilderState.none, RefreshFutureBuilderState.waiting].contains(snapshot.state)) {
+    void onViewYesterdayTrain() {
-          return TrainInfoLoading(title: trainNumber.toString(), loadingText: "Se încarcă...",);
+      viewYesterday.value = !viewYesterday.value;
-        }
+    }
-        else if (snapshot.state == RefreshFutureBuilderState.error) {
-          return TrainInfoError(title: '$trainNumber - Error', error: snapshot.error!, refresh: refresh,);
-        }
 
+    useEffect(() {
+      final handle = Timer.periodic(const Duration(minutes: 1), (timer) {
+        refresh();
+      });
+      return () {
+        handle.cancel();
+      };
+    });
+
+    return trainDataAsync.when(
+      data: (data) {
         switch (uiDesign) {
           case UiDesign.MATERIAL:
             return TrainInfoMaterial(
-              trainData: snapshot.data!, 
+              trainData: data,
               refresh: refresh,
-              isRefreshing: snapshot.state == RefreshFutureBuilderState.refreshing,
+              isRefreshing: trainDataAsync.isRefreshing,
               onViewYesterdayTrain: onViewYesterdayTrain,
             );
           case UiDesign.CUPERTINO:
             return TrainInfoCupertino(
-              trainData: snapshot.data!, 
+              trainData: data,
-              refresh: refresh, 
+              refresh: refresh,
-              isRefreshing: snapshot.state == RefreshFutureBuilderState.refreshing,
+              isRefreshing: trainDataAsync.isRefreshing,
               onViewYesterdayTrain: onViewYesterdayTrain,
             );
           case UiDesign.FLUENT:
             return TrainInfoFluent(
-              trainData: snapshot.data!,
+              trainData: data,
               refresh: refresh,
-              isRefreshing: snapshot.state == RefreshFutureBuilderState.refreshing,
+              isRefreshing: trainDataAsync.isRefreshing,
               onViewYesterdayTrain: onViewYesterdayTrain,
             );
           default:
             throw UnmatchedUiDesignException(uiDesign);
         }
       },
+      error: (e, st) {
+        return TrainInfoError(
+          title: '$trainNumber - Error',
+          error: e,
+          refresh: refresh,
+        );
+      },
+      loading: () {
+        return TrainInfoLoading(
+          title: trainNumber.toString(),
+          loadingText: "Se încarcă...",
+        );
+      },
     );
   }
 }
@@ -129,10 +166,12 @@ abstract class TrainInfoLoadingShared extends StatelessWidget {
   final Widget loadingWidget;
 
   TrainInfoLoadingShared({
-    required this.title, 
+    required this.title,
-    String? loadingText, 
+    String? loadingText,
     super.key,
-  }) : loadingWidget = Loading(text: loadingText,);
+  }) : loadingWidget = Loading(
+          text: loadingText,
+        );
 }
 
 class TrainInfoError extends ConsumerWidget {
@@ -181,7 +220,12 @@ abstract class TrainInfoErrorShared extends StatelessWidget {
   final Object error;
   final Future Function()? refresh;
 
-  const TrainInfoErrorShared({required this.title, required this.error, this.refresh, super.key,});
+  const TrainInfoErrorShared({
+    required this.title,
+    required this.error,
+    this.refresh,
+    super.key,
+  });
 }
 
 class TrainInfoBody extends ConsumerWidget {
@@ -246,10 +290,15 @@ abstract class TrainInfoBodyShared extends StatelessWidget {
 }
 
 abstract class DisplayTrainYesterdayWarningCommon extends StatelessWidget {
-  static const trainDidNotDepart = 'Acest tren nu a plecat încă din prima gară.';
+  static const trainDidNotDepart =
-  static const seeYesterdayTrain = 'Apasă aici pentru a vedea trenul care a plecat ieri.';
+      'Acest tren nu a plecat încă din prima gară.';
+  static const seeYesterdayTrain =
+      'Apasă aici pentru a vedea trenul care a plecat ieri.';
 
   final void Function() onViewYesterdayTrain;
 
-  const DisplayTrainYesterdayWarningCommon(this.onViewYesterdayTrain, {super.key,});
+  const DisplayTrainYesterdayWarningCommon(
+    this.onViewYesterdayTrain, {
+    super.key,
+  });
 }

lib/pages/train_info_page/view_train/train_info_cupertino.dart

@@ -1051,8 +1051,8 @@ class DisplayTrainYesterdayWarningCupertino extends DisplayTrainYesterdayWarning
                 const TextSpan(text: '\n'),
                 TextSpan(
                   text: DisplayTrainYesterdayWarningCommon.seeYesterdayTrain,
-                  style: const TextStyle(
+                  style: TextStyle(
-                    color: CupertinoColors.link,
+                    color: CupertinoTheme.of(context).primaryColor,
                   ),
                   recognizer: TapGestureRecognizer()
                     ..onTap = onViewYesterdayTrain,

lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart

@@ -1,13 +1,18 @@
 import 'package:flutter/cupertino.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
+import 'package:info_tren/components/cupertino_divider.dart';
+import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/providers.dart';
 
 class DisplayTrainStation extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
-  const DisplayTrainStation({required this.station, super.key,});
+  const DisplayTrainStation({
+    required this.station,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -15,6 +20,26 @@ class DisplayTrainStation extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.center,
       children: <Widget>[
+        if (station.notes.whereType<TrainDataNoteDepartsAs>().isNotEmpty) ...[
+          Builder(
+            builder: (context) {
+              final note =
+                  station.notes.whereType<TrainDataNoteDepartsAs>().first;
+              return Padding(
+                padding: const EdgeInsets.all(2.0),
+                child: Text.rich(
+                  TextSpan(
+                    children: [
+                      const TextSpan(text: 'Trenul pleacă cu numărul '),
+                      trainIdSpan(rank: note.rank, number: note.number),
+                    ],
+                  ),
+                ),
+              );
+            },
+          ),
+          const CupertinoDivider(),
+        ],
         Row(
           mainAxisSize: MainAxisSize.max,
           children: <Widget>[
@@ -22,42 +47,38 @@ class DisplayTrainStation extends StatelessWidget {
               flex: 1,
               child: Align(
                 alignment: Alignment.centerLeft,
-                child: Builder(
+                child: Builder(builder: (context) {
-                  builder: (context) {
+                  final departureStatus = station.departure?.status;
-                    final departureStatus = station.departure?.status;
+                  final arrivalStatus = station.arrival?.status;
-                    final arrivalStatus = station.arrival?.status;
+                  int delay;
-                    int delay;
+                  bool real;
-                    bool real;
+                  if (departureStatus == null) {
-                    if (departureStatus == null) {
+                    delay = arrivalStatus?.delay ?? 0;
-                      delay = arrivalStatus?.delay ?? 0;
+                    real = arrivalStatus?.real ?? false;
-                      real = arrivalStatus?.real ?? false;
+                  } else if (arrivalStatus == null) {
+                    delay = departureStatus.delay;
+                    real = departureStatus.real;
+                  } else {
+                    delay = departureStatus.delay;
+                    real = departureStatus.real;
+                    if (!real && arrivalStatus.real) {
+                      delay = arrivalStatus.delay;
+                      real = arrivalStatus.real;
                     }
-                    else if (arrivalStatus == null) {
-                      delay = departureStatus.delay;
-                      real = departureStatus.real;
-                    }
-                    else {
-                      delay = departureStatus.delay;
-                      real = departureStatus.real;
-                      if (!real && arrivalStatus.real) {
-                        delay = arrivalStatus.delay;
-                        real = arrivalStatus.real;
-                      }
-                    }
-                          
-                    final isDelayed = delay > 0 && real == true;
-                    final isOnTime = delay <= 0 && real == true;
-                    const isNotScheduled = false;
-                          
-                    return Badge(
-                      text: station.km.toString(),
-                      caption: 'km',
-                      isNotScheduled: isNotScheduled,
-                      isDelayed: isDelayed,
-                      isOnTime: isOnTime,
-                    );
                   }
-                ),
+
+                  final isDelayed = delay > 0 && real == true;
+                  final isOnTime = delay <= 0 && real == true;
+                  const isNotScheduled = false;
+
+                  return Badge(
+                    text: station.km.toString(),
+                    caption: 'km',
+                    isNotScheduled: isNotScheduled,
+                    isDelayed: isDelayed,
+                    isOnTime: isOnTime,
+                  );
+                }),
               ),
             ),
             Title(
@@ -67,7 +88,9 @@ class DisplayTrainStation extends StatelessWidget {
               flex: 1,
               child: Align(
                 alignment: Alignment.centerRight,
-                child: station.platform == null ? Container() : Badge(text: station.platform!, caption: 'linia'),
+                child: station.platform == null
+                    ? Container()
+                    : Badge(text: station.platform!, caption: 'linia'),
               ),
             ),
           ],
@@ -75,16 +98,61 @@ class DisplayTrainStation extends StatelessWidget {
         Time(
           station: station,
         ),
+        if (station.notes.whereType<TrainDataNoteDetachingWagons>().isNotEmpty)
+          Builder(
+            builder: (context) {
+              final note =
+                  station.notes.whereType<TrainDataNoteDetachingWagons>().first;
+              return Text(
+                'Trenul detașează vagoane către ${note.station}',
+                textAlign: TextAlign.center,
+              );
+            },
+          ),
+        if (station.notes.whereType<TrainDataNoteReceivingWagons>().isNotEmpty)
+          Builder(
+            builder: (context) {
+              final note =
+                  station.notes.whereType<TrainDataNoteReceivingWagons>().first;
+              return Text(
+                'Trenul primește vagoane de la ${note.station}',
+                textAlign: TextAlign.center,
+              );
+            },
+          ),
         Delay(
           station: station,
         ),
+        if (station.notes
+            .whereType<TrainDataNoteTrainNumberChange>()
+            .isNotEmpty) ...[
+          const CupertinoDivider(),
+          Builder(
+            builder: (context) {
+              final note = station.notes
+                  .whereType<TrainDataNoteTrainNumberChange>()
+                  .first;
+              return Padding(
+                padding: const EdgeInsets.all(2.0),
+                child: Text.rich(
+                  TextSpan(
+                    children: [
+                      const TextSpan(text: 'Trenul își schimbă numărul în '),
+                      trainIdSpan(rank: note.rank, number: note.number),
+                    ],
+                  ),
+                ),
+              );
+            },
+          ),
+        ],
       ],
     );
   }
 }
 
 class Title extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Title({
     required this.station,
@@ -96,17 +164,19 @@ class Title extends StatelessWidget {
     return Text(
       station.name,
       style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-        fontSize: 22,
+            fontSize: 22,
-        fontWeight: MediaQuery.of(context).boldText ? FontWeight.w500 : FontWeight.w300,
+            fontWeight: MediaQuery.of(context).boldText
-        // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+                ? FontWeight.w500
-      ),
+                : FontWeight.w300,
+            // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+          ),
       textAlign: TextAlign.center,
     );
   }
 }
 
 class Time extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Time({
     required this.station,
@@ -137,21 +207,35 @@ class Time extends StatelessWidget {
         Text(
           "→",
           style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-            fontSize: 22,
+                fontSize: 22,
-          ),
+              ),
+        ),
+        Container(
+          width: 2,
+        ),
+        ArrivalTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        StopTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        DepartureTime(
+          station: station,
+        ),
+        Container(
+          width: 2,
         ),
-        Container(width: 2,),
-        ArrivalTime(station: station,),
-        Expanded(child: Container(),),
-        StopTime(station: station,),
-        Expanded(child: Container(),),
-        DepartureTime(station: station,),
-        Container(width: 2,),
         Text(
           "→",
           style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-            fontSize: 22,
+                fontSize: 22,
-          ),
+              ),
         ),
       ],
     );
@@ -159,7 +243,7 @@ class Time extends StatelessWidget {
 }
 
 class ArrivalTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool finalStation;
 
   const ArrivalTime({
@@ -179,24 +263,29 @@ class ArrivalTime extends ConsumerWidget {
           Text(
             "→",
             style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-              fontSize: 22,
+                  fontSize: 22,
-            ),
+                ),
+          ),
+          Container(
+            width: 2,
           ),
-          Container(width: 2,),
           const Text("sosire la "),
-          ArrivalTime(station: station,),
+          ArrivalTime(
-          Expanded(child: Container(),),
+            station: station,
+          ),
+          Expanded(
+            child: Container(),
+          ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.arrival!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.arrival!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -206,19 +295,18 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                color: CupertinoColors.destructiveRed,
+                    color: CupertinoColors.destructiveRed,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -228,14 +316,14 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                color: CupertinoColors.systemGreen,
+                    color: CupertinoColors.systemGreen,
-              ),
+                  ),
             ),
           ],
         );
@@ -245,7 +333,7 @@ class ArrivalTime extends ConsumerWidget {
 }
 
 class StopTime extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const StopTime({
     required this.station,
@@ -275,14 +363,12 @@ class StopTime extends StatelessWidget {
                 minutes ? '1 minut' : '1 secundă',
                 textAlign: TextAlign.center,
               );
-            }
+            } else if (stopsForInt < 20) {
-            else if (stopsForInt < 20) {
               return Text(
-                '$stopsForInt ${minutes ?  'minute' : 'seconde'}',
+                '$stopsForInt ${minutes ? 'minute' : 'seconde'}',
                 textAlign: TextAlign.center,
               );
-            }
+            } else {
-            else {
               return Text(
                 '$stopsForInt de ${minutes ? 'minute' : 'secunde'}',
                 textAlign: TextAlign.center,
@@ -296,7 +382,7 @@ class StopTime extends StatelessWidget {
 }
 
 class DepartureTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool firstStation;
 
   const DepartureTime({
@@ -312,27 +398,32 @@ class DepartureTime extends ConsumerWidget {
       return Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: <Widget>[
-          Expanded(child: Container(),),
+          Expanded(
+            child: Container(),
+          ),
           const Text("plecare la "),
-          DepartureTime(station: station,),
+          DepartureTime(
-          Container(width: 2,),
+            station: station,
+          ),
+          Container(
+            width: 2,
+          ),
           Text(
             "→",
             style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-              fontSize: 22,
+                  fontSize: 22,
-            ),
+                ),
           ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.departure!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.departure!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -342,19 +433,18 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                color: CupertinoColors.destructiveRed,
+                    color: CupertinoColors.destructiveRed,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -364,14 +454,14 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-                color: CupertinoColors.systemGreen,
+                    color: CupertinoColors.systemGreen,
-              ),
+                  ),
             ),
           ],
         );
@@ -381,7 +471,7 @@ class DepartureTime extends ConsumerWidget {
 }
 
 class Delay extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Delay({
     required this.station,
@@ -404,20 +494,19 @@ class Delay extends StatelessWidget {
       return Text(
         "$delay ${delay == 1 ? 'minut' : 'minute'} întârziere",
         style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-          color: CupertinoColors.destructiveRed,
+              color: CupertinoColors.destructiveRed,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
-    }
+    } else if (delay < 0) {
-    else if (delay < 0) {
       return Text(
         "${-delay} ${delay == -1 ? 'minut' : 'minute'} mai devreme",
         style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(
-          color: CupertinoColors.systemGreen,
+              color: CupertinoColors.systemGreen,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
     }
 

lib/pages/train_info_page/view_train/train_info_fluent.dart

@@ -748,7 +748,7 @@ class DisplayTrainYesterdayWarningFluent
                 TextSpan(
                   text: DisplayTrainYesterdayWarningCommon.seeYesterdayTrain,
                   style: TextStyle(
-                    color: Colors.blue,
+                    color: FluentTheme.of(context).accentColor,// Colors.blue,
                   ),
                   recognizer: TapGestureRecognizer()
                     ..onTap = onViewYesterdayTrain,

lib/pages/train_info_page/view_train/train_info_fluent_DisplayTrainStation.dart

@@ -1,37 +1,62 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
+import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/providers.dart';
 
 class DisplayTrainStation extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
   final void Function()? onTap;
 
-  const DisplayTrainStation({required this.station, this.onTap, super.key,});
+  const DisplayTrainStation({
+    required this.station,
+    this.onTap,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
+    return Column(
-      padding: const EdgeInsets.all(2),
+      mainAxisSize: MainAxisSize.min,
-      child: HoverButton(
+      children: [
-        onPressed: onTap,
+        if (station.notes.whereType<TrainDataNoteDepartsAs>().isNotEmpty)
-        builder: (context, states) {
+          Builder(
-          return Card(
+            builder: (context) {
-            padding: const EdgeInsets.all(2),
+              final note =
-            child: Column(
+                  station.notes.whereType<TrainDataNoteDepartsAs>().first;
-              mainAxisSize: MainAxisSize.min,
+              return Padding(
-              crossAxisAlignment: CrossAxisAlignment.center,
+                padding: const EdgeInsets.all(2.0),
-              children: <Widget>[
+                child: Text.rich(
-                Row(
+                  TextSpan(
-                  mainAxisSize: MainAxisSize.max,
+                    children: [
+                      const TextSpan(text: 'Trenul pleacă cu numărul '),
+                      trainIdSpan(rank: note.rank, number: note.number),
+                    ],
+                  ),
+                ),
+              );
+            },
+          ),
+        Padding(
+          padding: const EdgeInsets.all(2),
+          child: HoverButton(
+            onPressed: onTap,
+            builder: (context, states) {
+              return Card(
+                padding: const EdgeInsets.all(2),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.center,
                   children: <Widget>[
-                    Expanded(
+                    Row(
-                      flex: 1,
+                      mainAxisSize: MainAxisSize.max,
-                      child: Align(
+                      children: <Widget>[
-                        alignment: Alignment.centerLeft,
+                        Expanded(
-                        child: Builder(
+                          flex: 1,
-                            builder: (context) {
+                          child: Align(
+                            alignment: Alignment.centerLeft,
+                            child: Builder(builder: (context) {
                               final departureStatus = station.departure?.status;
                               final arrivalStatus = station.arrival?.status;
                               int delay;
@@ -39,12 +64,10 @@ class DisplayTrainStation extends StatelessWidget {
                               if (departureStatus == null) {
                                 delay = arrivalStatus?.delay ?? 0;
                                 real = arrivalStatus?.real ?? false;
-                              }
+                              } else if (arrivalStatus == null) {
-                              else if (arrivalStatus == null) {
                                 delay = departureStatus.delay;
                                 real = departureStatus.real;
-                              }
+                              } else {
-                              else {
                                 delay = departureStatus.delay;
                                 real = departureStatus.real;
                                 if (!real && arrivalStatus.real) {
@@ -64,41 +87,94 @@ class DisplayTrainStation extends StatelessWidget {
                                 isDelayed: isDelayed,
                                 isOnTime: isOnTime,
                               );
-                            }
+                            }),
+                          ),
                         ),
-                      ),
+                        Title(
+                          station: station,
+                        ),
+                        Expanded(
+                          flex: 1,
+                          child: (station.platform == null)
+                              ? Container()
+                              : Align(
+                                  alignment: Alignment.centerRight,
+                                  child: Badge(
+                                    text: station.platform!,
+                                    caption: 'linia',
+                                  ),
+                                ),
+                        ),
+                      ],
                     ),
-                    Title(
+                    Time(
                       station: station,
                     ),
-                    Expanded(
+                    if (station.notes
-                      flex: 1,
+                        .whereType<TrainDataNoteDetachingWagons>()
-                      child: (station.platform == null)
+                        .isNotEmpty)
-                          ? Container()
+                      Builder(
-                          : Align(
+                        builder: (context) {
-                        alignment: Alignment.centerRight,
+                          final note = station.notes
-                        child: Badge(text: station.platform!, caption: 'linia',),
+                              .whereType<TrainDataNoteDetachingWagons>()
+                              .first;
+                          return Text(
+                            'Trenul detașează vagoane către ${note.station}',
+                            textAlign: TextAlign.center,
+                          );
+                        },
                       ),
+                    if (station.notes
+                        .whereType<TrainDataNoteReceivingWagons>()
+                        .isNotEmpty)
+                      Builder(
+                        builder: (context) {
+                          final note = station.notes
+                              .whereType<TrainDataNoteReceivingWagons>()
+                              .first;
+                          return Text(
+                            'Trenul primește vagoane de la ${note.station}',
+                            textAlign: TextAlign.center,
+                          );
+                        },
+                      ),
+                    Delay(
+                      station: station,
                     ),
                   ],
                 ),
-                Time(
+              );
-                  station: station,
+            },
+          ),
+        ),
+        if (station.notes
+            .whereType<TrainDataNoteTrainNumberChange>()
+            .isNotEmpty)
+          Builder(
+            builder: (context) {
+              final note = station.notes
+                  .whereType<TrainDataNoteTrainNumberChange>()
+                  .first;
+              return Padding(
+                padding: const EdgeInsets.all(2.0),
+                child: Text.rich(
+                  TextSpan(
+                    children: [
+                      const TextSpan(text: 'Trenul își schimbă numărul în '),
+                      trainIdSpan(rank: note.rank, number: note.number),
+                    ],
+                  ),
                 ),
-                Delay(
+              );
-                  station: station,
+            },
-                ),
+          ),
-              ],
+      ],
-            ),
-          );
-        },
-      ),
     );
   }
 }
 
 class Title extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Title({
     required this.station,
@@ -107,20 +183,22 @@ class Title extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return  Text(
+    return Text(
       station.name,
       style: FluentTheme.of(context).typography.body?.copyWith(
-        fontSize: 22,
+            fontSize: 22,
-        fontWeight: MediaQuery.of(context).boldText ? FontWeight.w500 : FontWeight.w300,
+            fontWeight: MediaQuery.of(context).boldText
-        // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+                ? FontWeight.w500
-      ),
+                : FontWeight.w300,
+            // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+          ),
       textAlign: TextAlign.center,
     );
   }
 }
 
 class Time extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Time({
     required this.station,
@@ -151,21 +229,35 @@ class Time extends StatelessWidget {
         Text(
           "→",
           style: FluentTheme.of(context).typography.body?.copyWith(
-            fontSize: 22,
+                fontSize: 22,
-          ),
+              ),
+        ),
+        Container(
+          width: 2,
+        ),
+        ArrivalTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        StopTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        DepartureTime(
+          station: station,
+        ),
+        Container(
+          width: 2,
         ),
-        Container(width: 2,),
-        ArrivalTime(station: station,),
-        Expanded(child: Container(),),
-        StopTime(station: station,),
-        Expanded(child: Container(),),
-        DepartureTime(station: station,),
-        Container(width: 2,),
         Text(
           "→",
           style: FluentTheme.of(context).typography.body?.copyWith(
-            fontSize: 22,
+                fontSize: 22,
-          ),
+              ),
         ),
       ],
     );
@@ -173,7 +265,7 @@ class Time extends StatelessWidget {
 }
 
 class ArrivalTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool finalStation;
 
   const ArrivalTime({
@@ -195,24 +287,29 @@ class ArrivalTime extends ConsumerWidget {
           Text(
             "→",
             style: FluentTheme.of(context).typography.body?.copyWith(
-              fontSize: 22,
+                  fontSize: 22,
-            ),
+                ),
+          ),
+          Container(
+            width: 2,
           ),
-          Container(width: 2,),
           const Text("sosire la "),
-          ArrivalTime(station: station,),
+          ArrivalTime(
-          Expanded(child: Container(),),
+            station: station,
+          ),
+          Expanded(
+            child: Container(),
+          ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.arrival!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.arrival!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -222,20 +319,19 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                // color: Colors.red.shade300,
+                    // color: Colors.red.shade300,
-                color: Colors.red.lighter,
+                    color: Colors.red.lighter,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -245,15 +341,15 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                // color: Colors.green.shade300,
+                    // color: Colors.green.shade300,
-                color: Colors.green.lighter,
+                    color: Colors.green.lighter,
-              ),
+                  ),
             ),
           ],
         );
@@ -263,7 +359,7 @@ class ArrivalTime extends ConsumerWidget {
 }
 
 class StopTime extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const StopTime({
     required this.station,
@@ -292,14 +388,12 @@ class StopTime extends StatelessWidget {
                 "1 ${minutes ? 'minut' : 'secundă'}",
                 textAlign: TextAlign.center,
               );
-            }
+            } else if (stopsForInt < 20) {
-            else if (stopsForInt < 20) {
               return Text(
                 "$stopsForInt ${minutes ? 'minute' : 'secunde'}",
                 textAlign: TextAlign.center,
               );
-            }
+            } else {
-            else {
               return Text(
                 "$stopsForInt de ${minutes ? 'minute' : 'secunde'}",
                 textAlign: TextAlign.center,
@@ -313,7 +407,7 @@ class StopTime extends StatelessWidget {
 }
 
 class DepartureTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool firstStation;
 
   const DepartureTime({
@@ -332,27 +426,32 @@ class DepartureTime extends ConsumerWidget {
       return Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: <Widget>[
-          Expanded(child: Container(),),
+          Expanded(
+            child: Container(),
+          ),
           const Text("plecare la "),
-          DepartureTime(station: station,),
+          DepartureTime(
-          Container(width: 2,),
+            station: station,
+          ),
+          Container(
+            width: 2,
+          ),
           Text(
             "→",
             style: FluentTheme.of(context).typography.body?.copyWith(
-              fontSize: 22,
+                  fontSize: 22,
-            ),
+                ),
           ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.departure!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.departure!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -362,20 +461,19 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                // color: Colors.red.shade300,
+                    // color: Colors.red.shade300,
-                color: Colors.red.lighter,
+                    color: Colors.red.lighter,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -385,15 +483,15 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: FluentTheme.of(context).typography.body?.copyWith(
-                // color: Colors.green.shade300,
+                    // color: Colors.green.shade300,
-                color: Colors.green.lighter,
+                    color: Colors.green.lighter,
-              ),
+                  ),
             ),
           ],
         );
@@ -402,9 +500,8 @@ class DepartureTime extends ConsumerWidget {
   }
 }
 
-
 class Delay extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Delay({
     required this.station,
@@ -427,22 +524,21 @@ class Delay extends StatelessWidget {
       return Text(
         "$delay ${delay == 1 ? 'minut' : 'minute'} întârziere",
         style: FluentTheme.of(context).typography.body?.copyWith(
-          // color: Colors.red.shade300,
+              // color: Colors.red.shade300,
-          color: Colors.red.lighter,
+              color: Colors.red.lighter,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
-    }
+    } else if (delay < 0) {
-    else if (delay < 0) {
       return Text(
         "${-delay} ${delay == -1 ? 'minut' : 'minute'} mai devreme",
         style: FluentTheme.of(context).typography.body?.copyWith(
-          // color: Colors.green.shade300,
+              // color: Colors.green.shade300,
-          color: Colors.green.lighter,
+              color: Colors.green.lighter,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
     }
 

lib/pages/train_info_page/view_train/train_info_material.dart

@@ -9,7 +9,11 @@ import 'package:info_tren/pages/train_info_page/view_train/train_info_material_D
 import 'package:info_tren/utils/state_to_string.dart';
 
 class TrainInfoLoadingMaterial extends TrainInfoLoadingShared {
-  TrainInfoLoadingMaterial({required super.title, super.loadingText, super.key,});
+  TrainInfoLoadingMaterial({
+    required super.title,
+    super.loadingText,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -77,13 +81,34 @@ class TrainInfoMaterial extends TrainInfoShared {
       builder: (context) {
         return Scaffold(
           appBar: isSmallScreen(context)
-            ? null
+              ? null
-            : AppBar(
+              : AppBar(
-                centerTitle: true,
+                  centerTitle: true,
-                title: Text(
+                  title: Text(
-                  "Informații despre ${trainData.rank} ${trainData.number}",
+                    'Informații despre ${trainData.rank} ${trainData.number}',
+                  ),
+                  actions: [
+                    IconButton(
+                      tooltip: 'Reîncarcă',
+                      icon: (isRefreshing ?? false)
+                          ? const Center(
+                            child: SizedBox(
+                                height: 16,
+                                width: 16,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              ),
+                          )
+                          : const Icon(Icons.refresh),
+                      onPressed: (isRefreshing ?? false)
+                          ? null
+                          : () {
+                              refresh?.call();
+                            },
+                    ),
+                  ],
                 ),
-              ),
           body: Column(
             children: <Widget>[
               if (isSmallScreen(context))
@@ -172,16 +197,15 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
                 if (onViewYesterdayTrain != null &&
                     trainData.stations.first.departure!.scheduleTime
                             .compareTo(DateTime.now()) >
-                        0)
+                        0) ...[
-                  ...[
+                  DisplayTrainYesterdayWarningMaterial(
-                    DisplayTrainYesterdayWarningMaterial(
+                    onViewYesterdayTrain!,
-                      onViewYesterdayTrain!,
+                  ),
-                    ),
+                  Divider(
-                    Divider(
+                    color: Colors.white70,
-                      color: Colors.white70,
+                    height: isSmallScreen(context) ? 8 : 16,
-                      height: isSmallScreen(context) ? 8 : 16,
+                  ),
-                    ),
+                ],
-                  ],
               ],
             ),
           ),
@@ -193,10 +217,7 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
                 ),
                 SliverToBoxAdapter(
                   child: Container(
-                    height: MediaQuery
+                    height: MediaQuery.of(context).viewPadding.bottom,
-                        .of(context)
-                        .viewPadding
-                        .bottom,
                   ),
                 ),
               ],
@@ -204,8 +225,7 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
           ),
         ],
       );
-    }
+    } else {
-    else {
       return CustomScrollView(
         slivers: <Widget>[
           SliverToBoxAdapter(
@@ -281,11 +301,11 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
           ),
           if (onViewYesterdayTrain != null &&
               trainData.stations.first.departure!.scheduleTime
-                  .compareTo(DateTime.now()) >
+                      .compareTo(DateTime.now()) >
                   0) ...[
             SliverToBoxAdapter(
-              child: DisplayTrainYesterdayWarningMaterial(
+              child:
-                  onViewYesterdayTrain!),
+                  DisplayTrainYesterdayWarningMaterial(onViewYesterdayTrain!),
             ),
             SliverToBoxAdapter(
               child: Divider(
@@ -299,10 +319,7 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
           ),
           SliverToBoxAdapter(
             child: Container(
-              height: MediaQuery
+              height: MediaQuery.of(context).viewPadding.bottom,
-                  .of(context)
-                  .viewPadding
-                  .bottom,
             ),
           ),
         ],
@@ -314,7 +331,10 @@ class TrainInfoBodyMaterial extends TrainInfoBodyShared {
 class DisplayTrainID extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainID({required this.trainData, super.key,});
+  const DisplayTrainID({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -335,7 +355,10 @@ class DisplayTrainID extends StatelessWidget {
 class DisplayTrainOperator extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainOperator({required this.trainData, super.key,});
+  const DisplayTrainOperator({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -353,7 +376,10 @@ class DisplayTrainOperator extends StatelessWidget {
 class DisplayTrainRoute extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainRoute({required this.trainData, super.key,});
+  const DisplayTrainRoute({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -418,7 +444,10 @@ class DisplayTrainDeparture extends StatelessWidget {
 class DisplayTrainLastInfo extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainLastInfo({required this.trainData, super.key,});
+  const DisplayTrainLastInfo({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -610,7 +639,10 @@ class DisplayTrainLastInfo extends StatelessWidget {
 class DisplayTrainDestination extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainDestination({required this.trainData, super.key,});
+  const DisplayTrainDestination({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -714,7 +746,10 @@ class DisplayTrainDestination extends StatelessWidget {
 class DisplayTrainRouteDistance extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainRouteDistance({required this.trainData, super.key,});
+  const DisplayTrainRouteDistance({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -751,7 +786,10 @@ class DisplayTrainRouteDistance extends StatelessWidget {
 class DisplayTrainRouteDuration extends StatelessWidget {
   final TrainData trainData;
 
-  const DisplayTrainRouteDuration({required this.trainData, super.key,});
+  const DisplayTrainRouteDuration({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -834,7 +872,10 @@ class DisplayTrainRouteDuration extends StatelessWidget {
 
 class DisplayTrainYesterdayWarningMaterial
     extends DisplayTrainYesterdayWarningCommon {
-  const DisplayTrainYesterdayWarningMaterial(super.onViewYesterdayTrain, {super.key,});
+  const DisplayTrainYesterdayWarningMaterial(
+    super.onViewYesterdayTrain, {
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -870,7 +911,10 @@ class DisplayTrainYesterdayWarningMaterial
 
 class DisplayTrainStations extends StatelessWidget {
   final TrainData trainData;
-  const DisplayTrainStations({required this.trainData, super.key,});
+  const DisplayTrainStations({
+    required this.trainData,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -884,7 +928,8 @@ class DisplayTrainStations extends StatelessWidget {
               onTap: () {
                 Navigator.of(context).pushNamed(
                   ViewStationPage.routeName,
-                  arguments: ViewStationArguments(stationName: trainData.stations[index].name),
+                  arguments: ViewStationArguments(
+                      stationName: trainData.stations[index].name),
                 );
               },
             ),

lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart

@@ -1,102 +1,178 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide Badge;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/components/badge/badge.dart';
 import 'package:info_tren/pages/train_info_page/view_train/train_info_material.dart';
 import 'package:info_tren/providers.dart';
 
 class DisplayTrainStation extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
   final void Function()? onTap;
 
-  const DisplayTrainStation({required this.station, this.onTap, super.key,});
+  const DisplayTrainStation({
+    required this.station,
+    this.onTap,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return Card(
+    return Column(
-      child: InkWell(
+      mainAxisSize: MainAxisSize.min,
-        onTap: onTap,
+      children: [
-        child: Padding(
+        if (station.notes.whereType<TrainDataNoteDepartsAs>().isNotEmpty)
-          padding: const EdgeInsets.all(2),
+          Builder(
-          child: Column(
+            builder: (context) {
-            mainAxisSize: MainAxisSize.min,
+              final note =
-            crossAxisAlignment: CrossAxisAlignment.center,
+                  station.notes.whereType<TrainDataNoteDepartsAs>().first;
-            children: <Widget>[
+              return Padding(
-              Row(
+                padding: const EdgeInsets.all(2.0),
-                mainAxisSize: MainAxisSize.max,
+                child: Text.rich(
-                children: <Widget>[
+                  TextSpan(
-                  Expanded(
+                    children: [
-                    flex: 1,
+                      const TextSpan(text: 'Trenul pleacă cu numărul '),
-                    child: Align(
+                      trainIdSpan(rank: note.rank, number: note.number),
-                      alignment: Alignment.centerLeft,
+                    ],
-                      child: Builder(
-                        builder: (context) {
-                          final departureStatus = station.departure?.status;
-                          final arrivalStatus = station.arrival?.status;
-                          int delay;
-                          bool real;
-                          if (departureStatus == null) {
-                            delay = arrivalStatus?.delay ?? 0;
-                            real = arrivalStatus?.real ?? false;
-                          }
-                          else if (arrivalStatus == null) {
-                            delay = departureStatus.delay;
-                            real = departureStatus.real;
-                          }
-                          else {
-                            delay = departureStatus.delay;
-                            real = departureStatus.real;
-                            if (!real && arrivalStatus.real) {
-                              delay = arrivalStatus.delay;
-                              real = arrivalStatus.real;
-                            }
-                          }
-                                    
-                          final isDelayed = delay > 0 && real == true;
-                          final isOnTime = delay <= 0 && real == true;
-                          const isNotScheduled = false;
-                                    
-                          return Badge(
-                            text: station.km.toString(),
-                            caption: 'km',
-                            isNotScheduled: isNotScheduled,
-                            isDelayed: isDelayed,
-                            isOnTime: isOnTime,
-                          );
-                        }
-                      ),
-                    ),
                   ),
-                  Title(
+                ),
+              );
+            },
+          ),
+        Card(
+          child: InkWell(
+            onTap: onTap,
+            child: Padding(
+              padding: const EdgeInsets.all(2),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: <Widget>[
+                  Row(
+                    mainAxisSize: MainAxisSize.max,
+                    children: <Widget>[
+                      Expanded(
+                        flex: 1,
+                        child: Align(
+                          alignment: Alignment.centerLeft,
+                          child: Builder(builder: (context) {
+                            final departureStatus = station.departure?.status;
+                            final arrivalStatus = station.arrival?.status;
+                            int delay;
+                            bool real;
+                            if (departureStatus == null) {
+                              delay = arrivalStatus?.delay ?? 0;
+                              real = arrivalStatus?.real ?? false;
+                            } else if (arrivalStatus == null) {
+                              delay = departureStatus.delay;
+                              real = departureStatus.real;
+                            } else {
+                              delay = departureStatus.delay;
+                              real = departureStatus.real;
+                              if (!real && arrivalStatus.real) {
+                                delay = arrivalStatus.delay;
+                                real = arrivalStatus.real;
+                              }
+                            }
+
+                            final isDelayed = delay > 0 && real == true;
+                            final isOnTime = delay <= 0 && real == true;
+                            const isNotScheduled = false;
+
+                            return Badge(
+                              text: station.km.toString(),
+                              caption: 'km',
+                              isNotScheduled: isNotScheduled,
+                              isDelayed: isDelayed,
+                              isOnTime: isOnTime,
+                            );
+                          }),
+                        ),
+                      ),
+                      Title(
+                        station: station,
+                      ),
+                      Expanded(
+                        flex: 1,
+                        child: (station.platform == null)
+                            ? Container()
+                            : Align(
+                                alignment: Alignment.centerRight,
+                                child: Badge(
+                                  text: station.platform!,
+                                  caption: 'linia',
+                                ),
+                              ),
+                      ),
+                    ],
+                  ),
+                  Time(
                     station: station,
                   ),
-                  Expanded(
+                  if (station.notes
-                    flex: 1, 
+                      .whereType<TrainDataNoteDetachingWagons>()
-                    child: (station.platform == null) 
+                      .isNotEmpty)
-                      ? Container() 
+                    Builder(
-                      : Align(
+                      builder: (context) {
-                        alignment: Alignment.centerRight,
+                        final note = station.notes
-                        child: Badge(text: station.platform!, caption: 'linia',),
+                            .whereType<TrainDataNoteDetachingWagons>()
-                      ),
+                            .first;
+                        return Text(
+                          'Trenul detașează vagoane către ${note.station}',
+                          textAlign: TextAlign.center,
+                        );
+                      },
+                    ),
+                  if (station.notes
+                      .whereType<TrainDataNoteReceivingWagons>()
+                      .isNotEmpty)
+                    Builder(
+                      builder: (context) {
+                        final note = station.notes
+                            .whereType<TrainDataNoteReceivingWagons>()
+                            .first;
+                        return Text(
+                          'Trenul primește vagoane de la ${note.station}',
+                          textAlign: TextAlign.center,
+                        );
+                      },
+                    ),
+                  Delay(
+                    station: station,
                   ),
                 ],
               ),
-              Time(
+            ),
-                station: station,
-              ),
-              Delay(
-                station: station,
-              ),
-            ],
           ),
         ),
-      ),
+        if (station.notes
+            .whereType<TrainDataNoteTrainNumberChange>()
+            .isNotEmpty)
+          Builder(
+            builder: (context) {
+              final note = station.notes
+                  .whereType<TrainDataNoteTrainNumberChange>()
+                  .first;
+              return Padding(
+                padding: const EdgeInsets.all(2.0),
+                child: Text.rich(
+                  TextSpan(
+                    children: [
+                      const TextSpan(text: 'Trenul își schimbă numărul în '),
+                      trainIdSpan(rank: note.rank, number: note.number),
+                    ],
+                  ),
+                ),
+              );
+            },
+          ),
+      ],
     );
   }
 }
 
 class Title extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Title({
     required this.station,
@@ -105,20 +181,22 @@ class Title extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return  Text(
+    return Text(
       station.name,
       style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-        fontSize: isSmallScreen(context) ? 18 : 22,
+            fontSize: isSmallScreen(context) ? 18 : 22,
-        fontWeight: MediaQuery.of(context).boldText ? FontWeight.w500 : FontWeight.w300,
+            fontWeight: MediaQuery.of(context).boldText
-        // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+                ? FontWeight.w500
-      ),
+                : FontWeight.w300,
+            // fontStyle: items[1] == "ONI" ? FontStyle.italic : FontStyle.normal,
+          ),
       textAlign: TextAlign.center,
     );
   }
 }
 
 class Time extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Time({
     required this.station,
@@ -149,21 +227,35 @@ class Time extends StatelessWidget {
         Text(
           "→",
           style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            fontSize: isSmallScreen(context) ? 18 : 22,
+                fontSize: isSmallScreen(context) ? 18 : 22,
-          ),
+              ),
+        ),
+        Container(
+          width: 2,
+        ),
+        ArrivalTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        StopTime(
+          station: station,
+        ),
+        Expanded(
+          child: Container(),
+        ),
+        DepartureTime(
+          station: station,
+        ),
+        Container(
+          width: 2,
         ),
-        Container(width: 2,),
-        ArrivalTime(station: station,),
-        Expanded(child: Container(),),
-        StopTime(station: station,),
-        Expanded(child: Container(),),
-        DepartureTime(station: station,),
-        Container(width: 2,),
         Text(
           "→",
           style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            fontSize: isSmallScreen(context) ? 18 : 22,
+                fontSize: isSmallScreen(context) ? 18 : 22,
-          ),
+              ),
         ),
       ],
     );
@@ -171,7 +263,7 @@ class Time extends StatelessWidget {
 }
 
 class ArrivalTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool finalStation;
 
   const ArrivalTime({
@@ -193,24 +285,29 @@ class ArrivalTime extends ConsumerWidget {
           Text(
             "→",
             style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              fontSize: isSmallScreen(context) ? 18 : 22,
+                  fontSize: isSmallScreen(context) ? 18 : 22,
-            ),
+                ),
+          ),
+          Container(
+            width: 2,
           ),
-          Container(width: 2,),
           const Text("sosire la "),
-          ArrivalTime(station: station,),
+          ArrivalTime(
-          Expanded(child: Container(),),
+            station: station,
+          ),
+          Expanded(
+            child: Container(),
+          ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.arrival!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.arrival!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -220,19 +317,18 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: Colors.red.shade300,
+                    color: Colors.red.shade300,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -242,14 +338,14 @@ class ArrivalTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: Colors.green.shade300,
+                    color: Colors.green.shade300,
-              ),
+                  ),
             ),
           ],
         );
@@ -259,7 +355,7 @@ class ArrivalTime extends ConsumerWidget {
 }
 
 class StopTime extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const StopTime({
     required this.station,
@@ -288,14 +384,12 @@ class StopTime extends StatelessWidget {
                 "1 ${minutes ? 'minut' : 'secundă'}",
                 textAlign: TextAlign.center,
               );
-            }
+            } else if (stopsForInt < 20) {
-            else if (stopsForInt < 20) {
               return Text(
                 "$stopsForInt ${minutes ? 'minute' : 'secunde'}",
                 textAlign: TextAlign.center,
               );
-            }
+            } else {
-            else {
               return Text(
                 "$stopsForInt de ${minutes ? 'minute' : 'secunde'}",
                 textAlign: TextAlign.center,
@@ -309,7 +403,7 @@ class StopTime extends StatelessWidget {
 }
 
 class DepartureTime extends ConsumerWidget {
-  final Station station;
+  final TrainDataStation station;
   final bool firstStation;
 
   const DepartureTime({
@@ -328,27 +422,32 @@ class DepartureTime extends ConsumerWidget {
       return Row(
         crossAxisAlignment: CrossAxisAlignment.center,
         children: <Widget>[
-          Expanded(child: Container(),),
+          Expanded(
+            child: Container(),
+          ),
           const Text("plecare la "),
-          DepartureTime(station: station,),
+          DepartureTime(
-          Container(width: 2,),
+            station: station,
+          ),
+          Container(
+            width: 2,
+          ),
           Text(
             "→",
             style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-              fontSize: 22,
+                  fontSize: 22,
-            ),
+                ),
           ),
         ],
       );
-    }
+    } else {
-    else {
       final delay = station.departure!.status?.delay ?? 0;
       final time = tz.convertDateTime(station.departure!.scheduleTime);
 
       if (delay == 0) {
-        return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
+        return Text(
-      }
+            "${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
-      else if (delay > 0) {
+      } else if (delay > 0) {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -358,19 +457,18 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: Colors.red.shade300,
+                    color: Colors.red.shade300,
-              ),
+                  ),
             ),
           ],
         );
-      }
+      } else {
-      else {
         final oldDate = time;
         final newDate = oldDate.add(Duration(minutes: delay));
 
@@ -380,14 +478,14 @@ class DepartureTime extends ConsumerWidget {
             Text(
               "${oldDate.hour.toString().padLeft(2, '0')}:${oldDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                decoration: TextDecoration.lineThrough,
+                    decoration: TextDecoration.lineThrough,
-              ),
+                  ),
             ),
             Text(
               "${newDate.hour.toString().padLeft(2, '0')}:${newDate.minute.toString().padLeft(2, '0')}",
               style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                color: Colors.green.shade300,
+                    color: Colors.green.shade300,
-              ),
+                  ),
             ),
           ],
         );
@@ -396,9 +494,8 @@ class DepartureTime extends ConsumerWidget {
   }
 }
 
-
 class Delay extends StatelessWidget {
-  final Station station;
+  final TrainDataStation station;
 
   const Delay({
     required this.station,
@@ -421,20 +518,19 @@ class Delay extends StatelessWidget {
       return Text(
         "$delay ${delay == 1 ? 'minut' : 'minute'} întârziere",
         style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-          color: Colors.red.shade300,
+              color: Colors.red.shade300,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
-    }
+    } else if (delay < 0) {
-    else if (delay < 0) {
       return Text(
         "${-delay} ${delay == -1 ? 'minut' : 'minute'} mai devreme",
         style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-          color: Colors.green.shade300,
+              color: Colors.green.shade300,
-          fontSize: 14,
+              fontSize: 14,
-          fontStyle: FontStyle.italic,
+              fontStyle: FontStyle.italic,
-        ),
+            ),
       );
     }
 

lib/providers.dart

@@ -3,13 +3,17 @@ import 'dart:developer';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/api/station_data.dart';
+import 'package:info_tren/api/train_data.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/station_arrdep_page/view_station/view_station.dart';
 import 'package:info_tren/pages/train_info_page/view_train/train_info.dart';
 import 'package:info_tren/utils/default_ui_design.dart';
 import 'package:info_tren/utils/iterable_extensions.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+part 'providers.g.dart';
+
 final sharedPreferencesProvider = Provider<SharedPreferences>(
   (_) => throw UnimplementedError('Please override in ProviderScope'),
 );
@@ -76,8 +80,8 @@ final trainInfoArgumentsProvider = Provider<TrainInfoArguments>(
   (_) => throw UnimplementedError('Please override in ProviderScope'),
 );
 
-final stationDataProvider = FutureProvider.family((ref, String stationName) async {
+final stationDataProvider = FutureProvider.family((ref, ViewStationArguments args) async {
-  final data = await getStationData(stationName);
+  final data = await getStationData(args.stationName, args.date);
 
   final timer = Timer(const Duration(minutes: 2), () {
     ref.invalidateSelf();
@@ -93,6 +97,9 @@ final viewStationArgumentsProvider = Provider<ViewStationArguments>(
 );
 final viewStationDataProvider = Provider((ref) {
   final args = ref.watch(viewStationArgumentsProvider);
-  final data = ref.watch(stationDataProvider(args.stationName));
+  final data = ref.watch(stationDataProvider(args));
   return data;
 }, dependencies: [viewStationArgumentsProvider, stationDataProvider]);
+
+@Riverpod(keepAlive: true)
+Future<TrainData> trainInfo(TrainInfoRef ref, {required String trainNumber, DateTime? date}) => getTrain(trainNumber, date: date);

lib/providers.g.dart

@@ -0,0 +1,120 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'providers.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$trainInfoHash() => r'd25aabc3ba656acf6497ec6831e11892178b22c9';
+
+/// Copied from Dart SDK
+class _SystemHash {
+  _SystemHash._();
+
+  static int combine(int hash, int value) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + value);
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
+    return hash ^ (hash >> 6);
+  }
+
+  static int finish(int hash) {
+    // ignore: parameter_assignments
+    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
+    // ignore: parameter_assignments
+    hash = hash ^ (hash >> 11);
+    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
+  }
+}
+
+typedef TrainInfoRef = FutureProviderRef<TrainData>;
+
+/// See also [trainInfo].
+@ProviderFor(trainInfo)
+const trainInfoProvider = TrainInfoFamily();
+
+/// See also [trainInfo].
+class TrainInfoFamily extends Family<AsyncValue<TrainData>> {
+  /// See also [trainInfo].
+  const TrainInfoFamily();
+
+  /// See also [trainInfo].
+  TrainInfoProvider call({
+    required String trainNumber,
+    DateTime? date,
+  }) {
+    return TrainInfoProvider(
+      trainNumber: trainNumber,
+      date: date,
+    );
+  }
+
+  @override
+  TrainInfoProvider getProviderOverride(
+    covariant TrainInfoProvider provider,
+  ) {
+    return call(
+      trainNumber: provider.trainNumber,
+      date: provider.date,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'trainInfoProvider';
+}
+
+/// See also [trainInfo].
+class TrainInfoProvider extends FutureProvider<TrainData> {
+  /// See also [trainInfo].
+  TrainInfoProvider({
+    required this.trainNumber,
+    this.date,
+  }) : super.internal(
+          (ref) => trainInfo(
+            ref,
+            trainNumber: trainNumber,
+            date: date,
+          ),
+          from: trainInfoProvider,
+          name: r'trainInfoProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$trainInfoHash,
+          dependencies: TrainInfoFamily._dependencies,
+          allTransitiveDependencies: TrainInfoFamily._allTransitiveDependencies,
+        );
+
+  final String trainNumber;
+  final DateTime? date;
+
+  @override
+  bool operator ==(Object other) {
+    return other is TrainInfoProvider &&
+        other.trainNumber == trainNumber &&
+        other.date == date;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, trainNumber.hashCode);
+    hash = _SystemHash.combine(hash, date.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+// ignore_for_file: unnecessary_raw_strings, subtype_of_sealed_class, invalid_use_of_internal_member, do_not_use_environment, prefer_const_constructors, public_member_api_docs, avoid_private_typedef_functions

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';
-  }
-}

linux/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,13 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dynamic_color/dynamic_color_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
+  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

linux/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dynamic_color
   url_launcher_linux
 )
 

macos/Flutter/Flutter-Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/Flutter-Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

macos/Podfile

@@ -0,0 +1,40 @@
+platform :osx, '10.14'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end

macos/Podfile.lock

@@ -0,0 +1,41 @@
+PODS:
+  - dynamic_color (0.0.2):
+    - FlutterMacOS
+  - FlutterMacOS (1.0.0)
+  - package_info_plus (0.0.1):
+    - FlutterMacOS
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_macos (0.0.1):
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
+  - FlutterMacOS (from `Flutter/ephemeral`)
+  - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
+  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
+
+EXTERNAL SOURCES:
+  dynamic_color:
+    :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+  package_info_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
+  shared_preferences_foundation:
+    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
+  url_launcher_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
+
+SPEC CHECKSUMS:
+  dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
+
+PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
+
+COCOAPODS: 1.12.1

macos/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -26,6 +26,7 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		520B64251BD594DD8421C698 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE5B44A3963C12914D375BF2 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,6 +53,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0796070C1CDACAE0CA888A94 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* Info Tren.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Info Tren.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -68,6 +70,9 @@
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+		982BB43264C0B37351AE0773 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		BE5B44A3963C12914D375BF2 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		FCA310A2438DD41F2A155FE5 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -75,6 +80,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				520B64251BD594DD8421C698 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -99,6 +105,7 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
+				EB1CD289E0F53193A2CB7A73 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -148,10 +155,22 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				BE5B44A3963C12914D375BF2 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		EB1CD289E0F53193A2CB7A73 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FCA310A2438DD41F2A155FE5 /* Pods-Runner.debug.xcconfig */,
+				0796070C1CDACAE0CA888A94 /* Pods-Runner.release.xcconfig */,
+				982BB43264C0B37351AE0773 /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -159,11 +178,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				85962951F5B916ED962A8FBD /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
+				907AE34F1B4BFF5379ADD9D0 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -182,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -235,6 +256,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3399D490228B24CF009A79C7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -270,6 +292,45 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
+		85962951F5B916ED962A8FBD /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		907AE34F1B4BFF5379ADD9D0 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -344,7 +405,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -423,7 +484,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -470,7 +531,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

macos/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

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

windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,12 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  DynamicColorPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  dynamic_color
   url_launcher_windows
 )