From 7abbf1097dede61538884387466b6497adf8c052 Mon Sep 17 00:00:00 2001
From: u221711 <thomas.bomatter@sbb.ch>
Date: Tue, 5 Nov 2024 14:14:57 +0100
Subject: [PATCH] chore: review changes

---
 das_client/README.md                                            | 2 ++
 das_client/integration_test/app_test.dart                       | 2 +-
 das_client/lib/app.dart                                         | 2 +-
 das_client/lib/{ => app}/i18n/i18n.dart                         | 2 +-
 das_client/lib/{ => app}/i18n/src/build_context_x.dart          | 2 +-
 das_client/lib/app/nav/das_navigation_drawer.dart               | 2 +-
 das_client/lib/app/pages/journey/journey_page.dart              | 2 +-
 .../journey/train_journey/widgets/header/adl_notification.dart  | 2 +-
 .../journey/train_journey/widgets/header/main_container.dart    | 2 +-
 .../lib/app/pages/journey/train_selection/train_selection.dart  | 2 +-
 das_client/lib/app/pages/links/links_page.dart                  | 2 +-
 das_client/lib/app/pages/login/login_page.dart                  | 2 +-
 das_client/lib/app/pages/profile/profile_page.dart              | 2 +-
 das_client/lib/app/pages/settings/settings_page.dart            | 2 +-
 das_client/lib/{util => app/widgets}/widget_extensions.dart     | 0
 15 files changed, 15 insertions(+), 13 deletions(-)
 rename das_client/lib/{ => app}/i18n/i18n.dart (88%)
 rename das_client/lib/{ => app}/i18n/src/build_context_x.dart (79%)
 rename das_client/lib/{util => app/widgets}/widget_extensions.dart (100%)

diff --git a/das_client/README.md b/das_client/README.md
index da4c82fa..f4ebab91 100644
--- a/das_client/README.md
+++ b/das_client/README.md
@@ -76,6 +76,8 @@ This application uses the code style defined in the [Flutter Wiki][2]. The
 recommendations are mandatory and should always be followed unless there is a
 good reason not to do so. However, this must be approved by all developers.
 
+Notable difference: Line length is set to 120 characters. Please adapt your IDE configuration accordingly.
+
 ## Flutter SDK version
 
 This app uses [FVM][1] to configure the Flutter SDK version.
diff --git a/das_client/integration_test/app_test.dart b/das_client/integration_test/app_test.dart
index 0339804c..79db99df 100644
--- a/das_client/integration_test/app_test.dart
+++ b/das_client/integration_test/app_test.dart
@@ -1,5 +1,5 @@
 import 'package:das_client/flavor.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/main.dart';
 import 'package:fimber/fimber.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations_de.dart';
diff --git a/das_client/lib/app.dart b/das_client/lib/app.dart
index 497981d2..8c0724bd 100644
--- a/das_client/lib/app.dart
+++ b/das_client/lib/app.dart
@@ -1,4 +1,4 @@
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/app_router.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
diff --git a/das_client/lib/i18n/i18n.dart b/das_client/lib/app/i18n/i18n.dart
similarity index 88%
rename from das_client/lib/i18n/i18n.dart
rename to das_client/lib/app/i18n/i18n.dart
index 1f9b9af7..2f8f0f63 100644
--- a/das_client/lib/i18n/i18n.dart
+++ b/das_client/lib/app/i18n/i18n.dart
@@ -3,7 +3,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 
 export 'package:flutter_gen/gen_l10n/app_localizations.dart';
-export 'package:das_client/i18n/src/build_context_x.dart';
+export 'package:das_client/app/i18n/src/build_context_x.dart';
 
 const localizationDelegates = <LocalizationsDelegate<dynamic>>[
   AppLocalizations.delegate,
diff --git a/das_client/lib/i18n/src/build_context_x.dart b/das_client/lib/app/i18n/src/build_context_x.dart
similarity index 79%
rename from das_client/lib/i18n/src/build_context_x.dart
rename to das_client/lib/app/i18n/src/build_context_x.dart
index af50c86b..c5f7655f 100644
--- a/das_client/lib/i18n/src/build_context_x.dart
+++ b/das_client/lib/app/i18n/src/build_context_x.dart
@@ -1,4 +1,4 @@
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:flutter/widgets.dart';
 
 extension BuildContextX on BuildContext {
diff --git a/das_client/lib/app/nav/das_navigation_drawer.dart b/das_client/lib/app/nav/das_navigation_drawer.dart
index 17239893..dbdc3832 100644
--- a/das_client/lib/app/nav/das_navigation_drawer.dart
+++ b/das_client/lib/app/nav/das_navigation_drawer.dart
@@ -1,5 +1,5 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/app_router.dart';
 import 'package:das_client/app/widgets/app_version_text.dart';
 import 'package:das_client/app/widgets/device_id_text.dart';
diff --git a/das_client/lib/app/pages/journey/journey_page.dart b/das_client/lib/app/pages/journey/journey_page.dart
index 7a91b4a0..e8c5ecc5 100644
--- a/das_client/lib/app/pages/journey/journey_page.dart
+++ b/das_client/lib/app/pages/journey/journey_page.dart
@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:das_client/auth/authentication_component.dart';
 import 'package:das_client/app/bloc/train_journey_cubit.dart';
 import 'package:das_client/di.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/app_router.dart';
 import 'package:das_client/app/nav/das_navigation_drawer.dart';
 import 'package:das_client/app/pages/journey/train_journey/train_journey_overview.dart';
diff --git a/das_client/lib/app/pages/journey/train_journey/widgets/header/adl_notification.dart b/das_client/lib/app/pages/journey/train_journey/widgets/header/adl_notification.dart
index f16b01e8..1eaf9ce9 100644
--- a/das_client/lib/app/pages/journey/train_journey/widgets/header/adl_notification.dart
+++ b/das_client/lib/app/pages/journey/train_journey/widgets/header/adl_notification.dart
@@ -1,4 +1,4 @@
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
 
diff --git a/das_client/lib/app/pages/journey/train_journey/widgets/header/main_container.dart b/das_client/lib/app/pages/journey/train_journey/widgets/header/main_container.dart
index 0d807a0f..9017efbf 100644
--- a/das_client/lib/app/pages/journey/train_journey/widgets/header/main_container.dart
+++ b/das_client/lib/app/pages/journey/train_journey/widgets/header/main_container.dart
@@ -1,6 +1,6 @@
 import 'package:das_client/app/pages/journey/train_journey/widgets/header/departure_authorization.dart';
 import 'package:das_client/app/pages/journey/train_journey/widgets/header/radio_channel.dart';
-import 'package:das_client/util/widget_extensions.dart';
+import 'package:das_client/app/widgets/widget_extensions.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
 
diff --git a/das_client/lib/app/pages/journey/train_selection/train_selection.dart b/das_client/lib/app/pages/journey/train_selection/train_selection.dart
index e45549cd..3fdafabc 100644
--- a/das_client/lib/app/pages/journey/train_selection/train_selection.dart
+++ b/das_client/lib/app/pages/journey/train_selection/train_selection.dart
@@ -1,5 +1,5 @@
 import 'package:das_client/app/bloc/train_journey_cubit.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
diff --git a/das_client/lib/app/pages/links/links_page.dart b/das_client/lib/app/pages/links/links_page.dart
index b54a70af..dc678125 100644
--- a/das_client/lib/app/pages/links/links_page.dart
+++ b/das_client/lib/app/pages/links/links_page.dart
@@ -1,5 +1,5 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/das_navigation_drawer.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
diff --git a/das_client/lib/app/pages/login/login_page.dart b/das_client/lib/app/pages/login/login_page.dart
index 44bf6627..87de7aca 100644
--- a/das_client/lib/app/pages/login/login_page.dart
+++ b/das_client/lib/app/pages/login/login_page.dart
@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:das_client/auth/authentication_component.dart';
 import 'package:das_client/di.dart';
 import 'package:das_client/flavor.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/app_router.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:fimber/fimber.dart';
diff --git a/das_client/lib/app/pages/profile/profile_page.dart b/das_client/lib/app/pages/profile/profile_page.dart
index 630e60f8..c1e1e668 100644
--- a/das_client/lib/app/pages/profile/profile_page.dart
+++ b/das_client/lib/app/pages/profile/profile_page.dart
@@ -1,5 +1,5 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/das_navigation_drawer.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
diff --git a/das_client/lib/app/pages/settings/settings_page.dart b/das_client/lib/app/pages/settings/settings_page.dart
index cfe54ea3..6e3b6438 100644
--- a/das_client/lib/app/pages/settings/settings_page.dart
+++ b/das_client/lib/app/pages/settings/settings_page.dart
@@ -1,5 +1,5 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:das_client/i18n/i18n.dart';
+import 'package:das_client/app/i18n/i18n.dart';
 import 'package:das_client/app/nav/das_navigation_drawer.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
diff --git a/das_client/lib/util/widget_extensions.dart b/das_client/lib/app/widgets/widget_extensions.dart
similarity index 100%
rename from das_client/lib/util/widget_extensions.dart
rename to das_client/lib/app/widgets/widget_extensions.dart