lib/components/select_train_suggestions/select_train_suggestions_cupertino.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:info_tren/components/cupertino_divider.dart';
 import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 
 class SelectTrainSuggestionsCupertino extends SelectTrainSuggestionsShared {
@@ -70,8 +69,8 @@ class OperatorAutocompleteTileCupertino extends OperatorAutocompleteTile {
                     style: CupertinoTheme.of(context).textTheme.textStyle.copyWith(fontSize: 10, fontWeight: FontWeight.w200),
                     textAlign: TextAlign.left,
                   ),
-                  Text.rich(
+                  Text(
-                    trainIdSpan(rank: train.rank, number: train.number),
+                    "${train.rank} ${train.number}",
                     textAlign: TextAlign.left,
                   ),
                 ],

lib/components/select_train_suggestions/select_train_suggestions_fluent.dart

@@ -1,6 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 
 class SelectTrainSuggestionsFluent extends SelectTrainSuggestionsShared {
@@ -69,8 +68,8 @@ class OperatorAutocompleteTileFluent extends OperatorAutocompleteTile {
                     style: FluentTheme.of(context).typography.body?.copyWith(fontSize: 10, fontWeight: FontWeight.w200),
                     textAlign: TextAlign.left,
                   ),
-                  Text.rich(
+                  Text(
-                    trainIdSpan(rank: train.rank, number: train.number),
+                    "${train.rank} ${train.number}",
                     textAlign: TextAlign.left,
                   ),
                 ],

lib/components/select_train_suggestions/select_train_suggestions_material.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:info_tren/components/select_train_suggestions/select_train_suggestions.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 
 class SelectTrainSuggestionsMaterial extends SelectTrainSuggestionsShared {
@@ -45,7 +44,7 @@ class OperatorAutocompleteTileMaterial extends OperatorAutocompleteTile {
   Widget build(BuildContext context) {
     return ListTile(
       dense: true,
-      title: Text.rich(trainIdSpan(rank: train.rank, number: train.number)),
+      title: Text("${train.rank} ${train.number}"),
       subtitle: Text(operatorName),
       onTap: () {
         onTrainSelected(train.number);

lib/components/train_id_text_span.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/gestures.dart';
-import 'package:flutter/rendering.dart';
-
-TextSpan trainIdSpan({
-  required String rank,
-  required String number,
-  Locale? locale,
-  MouseCursor? mouseCursor,
-  void Function(PointerEnterEvent)? onEnter,
-  void Function(PointerExitEvent)? onExit,
-  GestureRecognizer? recognizer,
-  String? semanticsLabel,
-  bool? spellOut,
-  TextStyle? style,
-}) => TextSpan(
-  children: [
-    TextSpan(
-      text: rank,
-      style: TextStyle(
-        inherit: true,
-        color: rank.startsWith('IC')
-            ? const Color.fromARGB(255, 0, 255, 0)
-            : rank.startsWith('IR')
-                ? const Color.fromARGB(255, 255, 0, 0)
-                : null,
-      ),
-    ),
-    const TextSpan(text: ' '),
-    TextSpan(text: number),
-  ],
-  locale: locale,
-  mouseCursor: mouseCursor,
-  onEnter: onEnter,
-  onExit: onExit,
-  recognizer: recognizer,
-  semanticsLabel: semanticsLabel,
-  spellOut: spellOut,
-  style: style,
-);

lib/main.dart

@@ -17,10 +17,8 @@ import 'package:info_tren/pages/train_info_page/view_train/train_info.dart';
 import 'package:info_tren/pages/train_info_page/select_train/select_train.dart';
 import 'package:info_tren/providers.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:timezone/data/latest.dart';
 
 void main() async {
-  initializeTimeZones();
   final sharedPreferences = await SharedPreferences.getInstance();
   runApp(
     ProviderScope(

lib/models.dart

@@ -7,7 +7,6 @@ export 'package:info_tren/models/stations_result.dart';
 export 'package:info_tren/models/train_data.dart' hide State;
 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;
 

lib/models/ui_timezone.dart

@@ -1,94 +0,0 @@
-import 'package:timezone/timezone.dart' as tz;
-
-enum UiTimeZoneType {
-  ro,
-  local,
-  utc,
-  iana,
-}
-
-extension UITimeZoneTypeName on UiTimeZoneType {
-  String get userInterfaceName => (const {
-    UiTimeZoneType.iana: 'Fus orar IANA',
-    UiTimeZoneType.local: 'Local',
-    UiTimeZoneType.ro: 'România',
-    UiTimeZoneType.utc: 'UTC',
-  })[this]!;
-}
-
-const Map<UiTimeZoneType, UiTimeZone Function(String)> fromSerStringConstructors = {
-  UiTimeZoneType.ro: RoUiTimeZone.fromSerString,
-  UiTimeZoneType.local: LocalUiTimeZone.fromSerString,
-  UiTimeZoneType.utc: UtcUiTimeZone.fromSerString,
-  UiTimeZoneType.iana: IanaUiTimeZone.fromSerString,
-};
-
-abstract class UiTimeZone {
-  final UiTimeZoneType type;
-
-  const UiTimeZone({required this.type});
-
-  DateTime convertDateTime(DateTime dt);
-
-  factory UiTimeZone.fromSerString(String ser) {
-    final arr = ser.split('\n');
-    return fromSerStringConstructors.map((key, value) => MapEntry(key.name, value))[arr[0]]!(ser);
-  }
-
-  String toSerString() {
-    return '${type.name}\n';
-  }
-}
-
-class RoUiTimeZone extends UiTimeZone {
-  static final roTz = tz.getLocation('Europe/Bucharest');
-
-  const RoUiTimeZone() : super(type: UiTimeZoneType.ro);
-
-  factory RoUiTimeZone.fromSerString(String ser) => const RoUiTimeZone();
-
-  @override
-  DateTime convertDateTime(DateTime dt) {
-    return tz.TZDateTime.from(dt, roTz);
-  }
-}
-
-class LocalUiTimeZone extends UiTimeZone {
-  const LocalUiTimeZone() : super(type: UiTimeZoneType.local);
-
-  factory LocalUiTimeZone.fromSerString(String ser) => LocalUiTimeZone();
-
-  @override
-  DateTime convertDateTime(DateTime dt) => dt.toLocal();
-}
-
-class UtcUiTimeZone extends UiTimeZone {
-  const UtcUiTimeZone() : super(type: UiTimeZoneType.utc);
-
-  factory UtcUiTimeZone.fromSerString(String ser) => UtcUiTimeZone();
-
-  @override
-  DateTime convertDateTime(DateTime dt) => dt.toUtc();
-}
-
-class IanaUiTimeZone extends UiTimeZone {
-  late final tz.Location location;
-
-  IanaUiTimeZone({required String ianaName}): super(type: UiTimeZoneType.iana) {
-    location = tz.getLocation(ianaName);
-  }
-
-  factory IanaUiTimeZone.fromSerString(String ser) => IanaUiTimeZone(
-    ianaName: ser.split('\n').skip(1).join('\n'),
-  );
-
-  @override
-  DateTime convertDateTime(DateTime dt) {
-    return tz.TZDateTime.from(dt, location);
-  }
-
-  @override
-  String toSerString() {
-    return '${type.name}\n${location.name}';
-  }
-}

lib/pages/settings/setings_page.dart

@@ -31,7 +31,6 @@ class SettingsPage extends ConsumerWidget {
 abstract class SettingsPageShared extends StatelessWidget {
   final String pageTitle = 'Setări';
   final String appearanceTitle = 'Aspect';
-  final String timeZoneTitle = 'Fus orar';
 
   const SettingsPageShared({super.key});
 

lib/pages/settings/settings_page_cupertino.dart

@@ -67,26 +67,6 @@ class SettingsPageCupertino extends SettingsPageShared {
                     );
                   },
                 ),
-                Consumer(
-                  builder: (context, ref, _) {
-                    final currentTZ = ref.watch(uiTimeZoneProvider);
-                    return CupertinoListTile(
-                      title: Text(timeZoneTitle),
-                      trailing: Text(currentTZ.type.userInterfaceName),
-                      onTap: () async {
-                        final choice = await singleChoice(
-                          context: context,
-                          choices: UiTimeZoneType.values.where((tz) => tz != UiTimeZoneType.iana).toList(),
-                          labelBuilder: (UiTimeZoneType utzt) => utzt.userInterfaceName,
-                          title: timeZoneTitle,
-                        );
-                        if (choice != null) {
-                          ref.read(uiTimeZoneProvider.notifier).set(UiTimeZone.fromSerString('${choice.name}\n'));
-                        }
-                      },
-                    );
-                  },
-                ),
               ],
             ),
           );

lib/pages/settings/settings_page_fluent.dart

@@ -34,29 +34,6 @@ class SettingsPageFluent extends SettingsPageShared {
                 );
               },
             ),
-            Consumer(
-              builder: (context, ref, _) {
-                final currentTZ = ref.watch(uiTimeZoneProvider);
-                return ListTile(
-                  title: Text(timeZoneTitle),
-                  trailing: ComboBox<UiTimeZoneType>(
-                    items: UiTimeZoneType.values.where((tz) => tz != UiTimeZoneType.iana).map((tzt) => ComboBoxItem(
-                      value: tzt,
-                      child: Text(tzt.userInterfaceName),
-                    )).toList(),
-                    value: currentTZ.type,
-                    onChanged: (newTZ) {
-                      if (newTZ != null) {
-                        ref.read(uiTimeZoneProvider.notifier).set(UiTimeZone.fromSerString('${newTZ.name}\n'));
-                      }
-                      else {
-                        ref.read(uiTimeZoneProvider.notifier).set(null);
-                      }
-                    },
-                  ),
-                );
-              },
-            ),
           ],
         ),
       ),

lib/pages/settings/settings_page_material.dart

@@ -35,29 +35,6 @@ class SettingsPageMaterial extends SettingsPageShared {
                 );
               },
             ),
-            Consumer(
-              builder: (context, ref, _) {
-                final currentTZ = ref.watch(uiTimeZoneProvider);
-                return ListTile(
-                  title: Text(timeZoneTitle),
-                  trailing: DropdownButton<UiTimeZoneType>(
-                    items: UiTimeZoneType.values.where((tz) => tz != UiTimeZoneType.iana).map((tzt) => DropdownMenuItem(
-                      value: tzt,
-                      child: Text(tzt.userInterfaceName),
-                    )).toList(),
-                    value: currentTZ.type,
-                    onChanged: (newTZ) {
-                      if (newTZ != null) {
-                        ref.read(uiTimeZoneProvider.notifier).set(UiTimeZone.fromSerString('${newTZ.name}\n'));
-                      }
-                      else {
-                        ref.read(uiTimeZoneProvider.notifier).set(null);
-                      }
-                    },
-                  ),
-                );
-              },
-            ),
           ],
         ),
       ),

lib/pages/station_arrdep_page/view_station/view_station_cupertino.dart

@@ -3,7 +3,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/loading/loading.dart';
 import 'package:info_tren/components/refresh_future_builder.dart';
 import 'package:info_tren/components/sliver_persistent_header_padding.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/station_arrdep_page/view_station/view_station.dart';
 import 'package:info_tren/providers.dart';
@@ -67,7 +66,18 @@ class ViewStationPageCupertino extends ViewStationPageShared {
       onTap: () => onTrainTapped(context, item.train),
       child: CupertinoFormRow(
         prefix: Text.rich(
-          trainIdSpan(rank: item.train.rank, number: item.train.number),
+          TextSpan(
+            children: [
+              TextSpan(
+                text: item.train.rank,
+                style: TextStyle(
+                  color: item.train.rank.startsWith('IR') ? const Color.fromARGB(255, 255, 0, 0) : null,
+                ),
+              ),
+              const TextSpan(text: ' '),
+              TextSpan(text: item.train.number,),
+            ],
+          ),
         ),
         helper: Text.rich(
           TextSpan(
@@ -78,13 +88,7 @@ class ViewStationPageCupertino extends ViewStationPageShared {
             ],
           ),
         ),
-        child: Consumer(
+        child: Text('${item.time.toLocal().hour.toString().padLeft(2, '0')}:${item.time.toLocal().minute.toString().padLeft(2, '0')}'),
-          builder: (context, ref, _) {
-            final tz = ref.watch(uiTimeZoneProvider);
-            final time = tz.convertDateTime(item.time);
-            return Text('${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}');
-          },
-        ),
       ),
     );
   }
@@ -95,7 +99,18 @@ class ViewStationPageCupertino extends ViewStationPageShared {
       onTap: () => onTrainTapped(context, item.train),
       child: CupertinoFormRow(
         prefix: Text.rich(
-          trainIdSpan(rank: item.train.rank, number: item.train.number),
+          TextSpan(
+            children: [
+              TextSpan(
+                text: item.train.rank,
+                style: TextStyle(
+                  color: item.train.rank.startsWith('IR') ? const Color.fromARGB(255, 255, 0, 0) : null,
+                ),
+              ),
+              const TextSpan(text: ' '),
+              TextSpan(text: item.train.number,),
+            ],
+          ),
         ),
         helper: Text.rich(
           TextSpan(
@@ -106,13 +121,7 @@ class ViewStationPageCupertino extends ViewStationPageShared {
             ],
           ),
         ),
-        child: Consumer(
+        child: Text('${item.time.toLocal().hour.toString().padLeft(2, '0')}:${item.time.toLocal().minute.toString().padLeft(2, '0')}'),
-          builder: (context, ref, _) {
-            final tz = ref.watch(uiTimeZoneProvider);
-            final time = tz.convertDateTime(item.time);
-            return Text('${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}');
-          },
-        ),
       ),
     );
   }

lib/pages/station_arrdep_page/view_station/view_station_fluent.dart

@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
 import 'package:info_tren/components/loading/loading.dart';
 import 'package:info_tren/components/refresh_future_builder.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/station_arrdep_page/view_station/view_station.dart';
 import 'package:info_tren/providers.dart';
@@ -142,31 +141,24 @@ class ViewStationPageFluent extends ViewStationPageShared {
                   mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    Consumer(
+                    Text(
-                      builder: (context, ref, _) {
+                      '${item.time.toLocal().hour.toString().padLeft(2, '0')}:${item.time.toLocal().minute.toString().padLeft(2, '0')}',
-                        final tz = ref.watch(uiTimeZoneProvider);
+                      style: TextStyle(
-                        final time = tz.convertDateTime(item.time);
+                        inherit: true,
-                        return Text(
+                        fontFeatures: const [
-                          '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}',
+                          FontFeature.tabularFigures(),
-                          style: TextStyle(
+                        ],
-                            inherit: true,
+                        decoration: item.status.cancelled || item.status.delay != 0 ? TextDecoration.lineThrough : null,
-                            fontFeatures: const [
+                        fontSize: item.status.delay != 0 ? 12 : null,
-                              FontFeature.tabularFigures(),
+                      ),
-                            ],
-                            decoration: item.status.cancelled || item.status.delay != 0 ? TextDecoration.lineThrough : null,
-                            fontSize: item.status.delay != 0 ? 12 : null,
-                          ),
-                        );
-                      },
                     ),
-                    if (item.status.delay != 0) Consumer(
+                    if (item.status.delay != 0) Builder(
-                      builder: (context, ref, _) {
+                      builder: (context) {
-                        final tz = ref.watch(uiTimeZoneProvider);
+                        final newTime = item.time.add(Duration(minutes: item.status.delay));
-                        final newTime = tz.convertDateTime(item.time.add(Duration(minutes: item.status.delay)));
                         final delay = item.status.delay > 0;
 
                         return Text(
-                          '${newTime.hour.toString().padLeft(2, '0')}:${newTime.minute.toString().padLeft(2, '0')}',
+                          '${newTime.toLocal().hour.toString().padLeft(2, '0')}:${newTime.toLocal().minute.toString().padLeft(2, '0')}',
                           style: TextStyle(
                             inherit: true,
                             fontFeatures: const [
@@ -185,7 +177,18 @@ class ViewStationPageFluent extends ViewStationPageShared {
                   child: ListTile(
                     // isThreeLine: item.status.delay != 0,
                     title: Text.rich(
-                      trainIdSpan(rank: item.train.rank, number: item.train.number),
+                      TextSpan(
+                        children: [
+                          TextSpan(
+                            text: item.train.rank,
+                            style: TextStyle(
+                              color: item.train.rank.startsWith('IR') ? const Color.fromARGB(255, 255, 0, 0) : null,
+                            ),
+                          ),
+                          const TextSpan(text: ' '),
+                          TextSpan(text: item.train.number,),
+                        ],
+                      ),
                     ),
                     subtitle: Text.rich(
                       TextSpan(

lib/pages/station_arrdep_page/view_station/view_station_material.dart

@@ -5,7 +5,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
 import 'package:info_tren/components/loading/loading.dart';
 import 'package:info_tren/components/refresh_future_builder.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/station_arrdep_page/view_station/view_station.dart';
 import 'package:info_tren/providers.dart';
@@ -107,31 +106,24 @@ class ViewStationPageMaterial extends ViewStationPageShared {
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Consumer(
+                  Text(
-                    builder: (context, ref, _) {
+                    '${item.time.toLocal().hour.toString().padLeft(2, '0')}:${item.time.toLocal().minute.toString().padLeft(2, '0')}',
-                      final tz = ref.watch(uiTimeZoneProvider);
+                    style: TextStyle(
-                      final time = tz.convertDateTime(item.time);
+                      inherit: true,
-                      return Text(
+                      fontFeatures: const [
-                        '${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}',
+                        FontFeature.tabularFigures(),
-                        style: TextStyle(
+                      ],
-                          inherit: true,
+                      decoration: item.status.cancelled || item.status.delay != 0 ? TextDecoration.lineThrough : null,
-                          fontFeatures: const [
+                      fontSize: item.status.delay != 0 ? 12 : null,
-                            FontFeature.tabularFigures(),
+                    ),
-                          ],
-                          decoration: item.status.cancelled || item.status.delay != 0 ? TextDecoration.lineThrough : null,
-                          fontSize: item.status.delay != 0 ? 12 : null,
-                        ),
-                      );
-                    },
                   ),
-                  if (item.status.delay != 0) Consumer(
+                  if (item.status.delay != 0) Builder(
-                    builder: (context, ref, _) {
+                    builder: (context) {
-                      final tz = ref.watch(uiTimeZoneProvider);
+                      final newTime = item.time.add(Duration(minutes: item.status.delay));
-                      final newTime = tz.convertDateTime(item.time.add(Duration(minutes: item.status.delay)));
                       final delay = item.status.delay > 0;
 
                       return Text(
-                        '${newTime.hour.toString().padLeft(2, '0')}:${newTime.minute.toString().padLeft(2, '0')}',
+                        '${newTime.toLocal().hour.toString().padLeft(2, '0')}:${newTime.toLocal().minute.toString().padLeft(2, '0')}',
                         style: TextStyle(
                           inherit: true,
                           fontFeatures: const [
@@ -150,7 +142,18 @@ class ViewStationPageMaterial extends ViewStationPageShared {
                 child: ListTile(
                   isThreeLine: item.status.delay != 0,
                   title: Text.rich(
-                    trainIdSpan(rank: item.train.rank, number: item.train.number),
+                    TextSpan(
+                      children: [
+                        TextSpan(
+                          text: item.train.rank,
+                          style: TextStyle(
+                            color: item.train.rank.startsWith('IR') ? const Color.fromARGB(255, 255, 0, 0) : null,
+                          ),
+                        ),
+                        const TextSpan(text: ' '),
+                        TextSpan(text: item.train.number,),
+                      ],
+                    ),
                   ),
                   subtitle: Text.rich(
                     TextSpan(

lib/pages/train_info_page/view_train/train_info_cupertino.dart

@@ -4,7 +4,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:info_tren/components/cupertino_divider.dart';
 import 'package:info_tren/components/sliver_persistent_header_padding.dart';
-import 'package:info_tren/components/train_id_text_span.dart';
 import 'package:info_tren/models.dart';
 import 'package:info_tren/pages/train_info_page/train_info_constants.dart';
 import 'package:info_tren/pages/train_info_page/view_train/train_info.dart';
@@ -563,7 +562,18 @@ class DisplayTrainID extends StatelessWidget {
       child: Padding(
         padding: const EdgeInsets.all(8.0),
         child: Text.rich(
-          trainIdSpan(rank: trainData.rank, number: trainData.number),
+        TextSpan(
+          children: [
+            TextSpan(
+              text: trainData.rank,
+              style: TextStyle(
+                color: trainData.rank.startsWith('IR') ? const Color.fromARGB(255, 255, 0, 0) : null,
+              ),
+            ),
+            const TextSpan(text: ' '),
+            TextSpan(text: trainData.number,),
+          ],
+        ),
           style: CupertinoTheme.of(context).textTheme.navLargeTitleTextStyle,
         ),
       ),

lib/pages/train_info_page/view_train/train_info_cupertino_DisplayTrainStation.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/cupertino.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/components/badge/badge.dart';
 import 'package:info_tren/models.dart';
-import 'package:info_tren/providers.dart';
 
 class DisplayTrainStation extends StatelessWidget {
   final Station station;
@@ -158,7 +156,7 @@ class Time extends StatelessWidget {
   }
 }
 
-class ArrivalTime extends ConsumerWidget {
+class ArrivalTime extends StatelessWidget {
   final Station station;
   final bool finalStation;
 
@@ -169,9 +167,7 @@ class ArrivalTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
-
     if (finalStation) {
       return Row(
         crossAxisAlignment: CrossAxisAlignment.center,
@@ -191,7 +187,7 @@ class ArrivalTime extends ConsumerWidget {
     }
     else {
       final delay = station.arrival!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.arrival!.scheduleTime);
+      final time = station.arrival!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");
@@ -295,7 +291,7 @@ class StopTime extends StatelessWidget {
   }
 }
 
-class DepartureTime extends ConsumerWidget {
+class DepartureTime extends StatelessWidget {
   final Station station;
   final bool firstStation;
 
@@ -306,8 +302,7 @@ class DepartureTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
     if (firstStation) {
       return Row(
         crossAxisAlignment: CrossAxisAlignment.center,
@@ -327,7 +322,7 @@ class DepartureTime extends ConsumerWidget {
     }
     else {
       final delay = station.departure!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.departure!.scheduleTime);
+      final time = station.departure!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, "0")}:${time.minute.toString().padLeft(2, "0")}");

lib/pages/train_info_page/view_train/train_info_fluent.dart

@@ -1,6 +1,5 @@
 import 'package:fluent_ui/fluent_ui.dart';
 import 'package:flutter/gestures.dart';
-import 'package:info_tren/components/train_id_text_span.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';
@@ -304,7 +303,22 @@ class DisplayTrainID extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Text.rich(
-      trainIdSpan(rank: trainData.rank, number: trainData.number),
+      TextSpan(
+        children: [
+          TextSpan(
+            text: trainData.rank,
+            style: TextStyle(
+              color: trainData.rank.startsWith('IR')
+                  ? const Color.fromARGB(255, 255, 0, 0)
+                  : null,
+            ),
+          ),
+          const TextSpan(text: ' '),
+          TextSpan(
+            text: trainData.number,
+          ),
+        ],
+      ),
       style: FluentTheme.of(context).typography.title?.copyWith(
         color: FluentTheme.of(context).typography.body?.color,
         fontWeight: FontWeight.bold,

lib/pages/train_info_page/view_train/train_info_fluent_DisplayTrainStation.dart

@@ -1,8 +1,6 @@
 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/models.dart';
-import 'package:info_tren/providers.dart';
 
 class DisplayTrainStation extends StatelessWidget {
   final Station station;
@@ -172,7 +170,7 @@ class Time extends StatelessWidget {
   }
 }
 
-class ArrivalTime extends ConsumerWidget {
+class ArrivalTime extends StatelessWidget {
   final Station station;
   final bool finalStation;
 
@@ -183,8 +181,7 @@ class ArrivalTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
     if (station.arrival == null) {
       return Container();
     }
@@ -207,7 +204,7 @@ class ArrivalTime extends ConsumerWidget {
     }
     else {
       final delay = station.arrival!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.arrival!.scheduleTime);
+      final time = station.arrival!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
@@ -312,7 +309,7 @@ class StopTime extends StatelessWidget {
   }
 }
 
-class DepartureTime extends ConsumerWidget {
+class DepartureTime extends StatelessWidget {
   final Station station;
   final bool firstStation;
 
@@ -323,8 +320,7 @@ class DepartureTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
     if (station.departure == null) {
       return Container();
     }
@@ -347,7 +343,7 @@ class DepartureTime extends ConsumerWidget {
     }
     else {
       final delay = station.departure!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.departure!.scheduleTime);
+      final time = station.departure!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");

lib/pages/train_info_page/view_train/train_info_material.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:info_tren/components/slim_app_bar.dart';
-import 'package:info_tren/components/train_id_text_span.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';
@@ -319,7 +318,22 @@ class DisplayTrainID extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Text.rich(
-      trainIdSpan(rank: trainData.rank, number: trainData.number),
+      TextSpan(
+        children: [
+          TextSpan(
+            text: trainData.rank,
+            style: TextStyle(
+              color: trainData.rank.startsWith('IR')
+                  ? const Color.fromARGB(255, 255, 0, 0)
+                  : null,
+            ),
+          ),
+          const TextSpan(text: ' '),
+          TextSpan(
+            text: trainData.number,
+          ),
+        ],
+      ),
       style: (isSmallScreen(context)
               ? Theme.of(context).textTheme.headlineMedium
               : Theme.of(context).textTheme.displaySmall)

lib/pages/train_info_page/view_train/train_info_material_DisplayTrainStation.dart

@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.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;
@@ -170,7 +168,7 @@ class Time extends StatelessWidget {
   }
 }
 
-class ArrivalTime extends ConsumerWidget {
+class ArrivalTime extends StatelessWidget {
   final Station station;
   final bool finalStation;
 
@@ -181,8 +179,7 @@ class ArrivalTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
     if (station.arrival == null) {
       return Container();
     }
@@ -205,7 +202,7 @@ class ArrivalTime extends ConsumerWidget {
     }
     else {
       final delay = station.arrival!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.arrival!.scheduleTime);
+      final time = station.arrival!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");
@@ -308,7 +305,7 @@ class StopTime extends StatelessWidget {
   }
 }
 
-class DepartureTime extends ConsumerWidget {
+class DepartureTime extends StatelessWidget {
   final Station station;
   final bool firstStation;
 
@@ -319,8 +316,7 @@ class DepartureTime extends ConsumerWidget {
   });
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
-    final tz = ref.watch(uiTimeZoneProvider);
     if (station.departure == null) {
       return Container();
     }
@@ -343,7 +339,7 @@ class DepartureTime extends ConsumerWidget {
     }
     else {
       final delay = station.departure!.status?.delay ?? 0;
-      final time = tz.convertDateTime(station.departure!.scheduleTime);
+      final time = station.departure!.scheduleTime.toLocal();
 
       if (delay == 0) {
         return Text("${time.hour.toString().padLeft(2, '0')}:${time.minute.toString().padLeft(2, '0')}");

lib/providers.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:info_tren/api/station_data.dart';
@@ -37,39 +36,6 @@ final uiDesignProvider = StateNotifierProvider<UiDesignNotifier, UiDesign>(
   (ref) => UiDesignNotifier(
     sharedPreferences: ref.watch(sharedPreferencesProvider),
   ),
-  dependencies: [sharedPreferencesProvider],
-);
-
-class UiTimeZoneNotifier extends StateNotifier<UiTimeZone> {
-  final SharedPreferences sharedPreferences;
-
-  UiTimeZoneNotifier({required this.sharedPreferences,}) : super(const RoUiTimeZone()) {
-    final stored = sharedPreferences.getString('uiTimeZone');
-    if (stored != null) {
-      try {
-        state = UiTimeZone.fromSerString(stored);
-      }
-      catch (e) {
-        log('Invalid UiTimeZone ser: $stored, error: $e', level: 1000);
-      }
-    }
-  }
-
-  void set(UiTimeZone? timeZone) async {
-    if (timeZone != null) {
-      await sharedPreferences.setString('uiTimeZone', timeZone.toSerString());
-    }
-    else {
-      await sharedPreferences.remove('uiTimeZone');
-    }
-    state = timeZone ?? const LocalUiTimeZone();
-  }
-}
-final uiTimeZoneProvider = StateNotifierProvider<UiTimeZoneNotifier, UiTimeZone>(
-  (ref) => UiTimeZoneNotifier(
-    sharedPreferences: ref.watch(sharedPreferencesProvider),
-  ),
-  dependencies: [sharedPreferencesProvider],
 );
 
 final trainInfoArgumentsProvider = Provider<TrainInfoArguments>(

pubspec.lock

@@ -616,13 +616,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
-  timezone:
-    dependency: "direct main"
-    description:
-      name: timezone
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.0"
   timing:
     dependency: transitive
     description:

pubspec.yaml

@@ -34,7 +34,6 @@ dependencies:
   json_annotation: ^4.7.0
   shared_preferences: ^2.0.15
   fluent_ui: ^4.0.3+1
-  timezone: ^0.9.0
 
 dev_dependencies:
   # flutter_test: