From 8890805983adf4a26bc1fc141a8836d1c841ed1c Mon Sep 17 00:00:00 2001
From: Thomas <thomas.bomatter@sbb.ch>
Date: Mon, 14 Oct 2024 23:50:01 +0200
Subject: [PATCH] feat: adding navigation drawer (#299)

---
 .github/.DS_Store                             | Bin 0 -> 6148 bytes
 .github/workflows/flutter_android_build.yml   |   2 +-
 .../flutter_browserstack_android.yml          |   2 +-
 .../workflows/flutter_browserstack_ios.yml    |   2 +-
 .github/workflows/release-please.yml          |   4 +-
 das_client/.fvm/fvm_config.json               |   2 +-
 das_client/README.md                          |  16 +++
 das_client/integration_test/app_test.dart     |  32 +----
 das_client/integration_test/di.dart           |  26 ++--
 .../integration_test/test/fahrbild_test.dart  |  37 +++++
 .../test/navigation_test.dart                 | 126 ++++++++++++++++++
 das_client/ios/Podfile.lock                   |   6 +
 das_client/l10n/strings_de.arb                |   6 +-
 das_client/lib/nav/app_router.dart            |  37 +++--
 das_client/lib/nav/das_navigation_drawer.dart |  92 +++++++++++++
 .../home_page.dart => fahrt/fahrt_page.dart}  |  10 +-
 .../{home => fahrt}/widgets/fahrbild.dart     |   0
 .../widgets/train_selection.dart              |   0
 das_client/lib/pages/links/links_page.dart    |  29 ++++
 das_client/lib/pages/login/login_page.dart    |   2 +-
 das_client/lib/pages/login/splash_page.dart   |   2 +-
 .../lib/pages/profile/profile_page.dart       |  29 ++++
 .../lib/pages/settings/settings_page.dart     |  29 ++++
 das_client/lib/repo/sfera_repository.dart     |   2 +-
 .../service/sfera/task/handshake_task.dart    |   5 +-
 .../task/request_journey_profile_task.dart    |   5 +-
 .../lib/service/sfera/task/sfera_task.dart    |   6 +-
 das_client/lib/widgets/app_version_text.dart  |  36 +++++
 das_client/lib/widgets/device_id_text.dart    |  24 ++++
 das_client/pubspec.lock                       |  64 +++++----
 das_client/pubspec.yaml                       |   6 +-
 31 files changed, 542 insertions(+), 97 deletions(-)
 create mode 100644 .github/.DS_Store
 create mode 100644 das_client/integration_test/test/fahrbild_test.dart
 create mode 100644 das_client/integration_test/test/navigation_test.dart
 create mode 100644 das_client/lib/nav/das_navigation_drawer.dart
 rename das_client/lib/pages/{home/home_page.dart => fahrt/fahrt_page.dart} (85%)
 rename das_client/lib/pages/{home => fahrt}/widgets/fahrbild.dart (100%)
 rename das_client/lib/pages/{home => fahrt}/widgets/train_selection.dart (100%)
 create mode 100644 das_client/lib/pages/links/links_page.dart
 create mode 100644 das_client/lib/pages/profile/profile_page.dart
 create mode 100644 das_client/lib/pages/settings/settings_page.dart
 create mode 100644 das_client/lib/widgets/app_version_text.dart
 create mode 100644 das_client/lib/widgets/device_id_text.dart

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f74d0bcac15e3e78a3f1daf67bd46109e2ed613f
GIT binary patch
literal 6148
zcmeHK%}N6?5T3Nvb}2#+3VI88E!bAH1ux55U%(YTsMId4x^&%?ZtEUOVek4vzKGA`
zOp=PF6+DU98JK*@{A|dVC6fSv@Fu-FKm`CwsDwEOn-xNS(k01R3!%{8xQ7T7q>u#Z
zQZyU>A_KH{4(^zO5e(qV{w2d8QUQA3f?*UU<67-q<no1$&0^6hmW#Lkqe}g8cRWeF
z?&z9E7fMCJyx$Ej!+zSSY@e!l+zsRYNGF87K8D;}g>g@%o|?qHMCba(;W#CyQ`wtN
z8_i}_Hd;rss+`svwZp1BuC-<}r?j(waB|)mL{G7LF?<UA^|WkRoWm=2RxIt=AH|W1
zAJ99`oM$jH1Iz$3uqF)H<F8a+llAg4nE__t=M2#KAW;cji<v=vbYMf*NAed4Nw80E
z2|{VnwU`-14~j6Uh$dCoCx$TTXqPt5wU`++=^*sX_#Hd5urCy$XGgo#;UHXt+%f~q
zz#;>AGptbkKl}duznH`$W`G&^R}6?k+i!cgBwJgT7Du&KqTZpBP+Vs4GX*=k6k{xv
d;$2iNXqVJMbS-8E(SpJk0Zjup%)qZQ@BvRKP7eS8

literal 0
HcmV?d00001

diff --git a/.github/workflows/flutter_android_build.yml b/.github/workflows/flutter_android_build.yml
index 796ab9a4..42a417da 100644
--- a/.github/workflows/flutter_android_build.yml
+++ b/.github/workflows/flutter_android_build.yml
@@ -36,7 +36,7 @@ jobs:
         java-version: '17'
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.22.2'
+        flutter-version: '3.24.3'
     - name: Prepare Flutter Build
       env:
         ANDROID_KEYSTORE_STRING: ${{ secrets.ANDROID_KEYSTORE }}
diff --git a/.github/workflows/flutter_browserstack_android.yml b/.github/workflows/flutter_browserstack_android.yml
index 16475da0..a92626ec 100644
--- a/.github/workflows/flutter_browserstack_android.yml
+++ b/.github/workflows/flutter_browserstack_android.yml
@@ -37,7 +37,7 @@ jobs:
         java-version: '17'
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.22.2'
+        flutter-version: '3.24.3'
     - name: Prepare Flutter Build
       env:
         ANDROID_KEYSTORE_STRING: ${{ secrets.ANDROID_KEYSTORE }}
diff --git a/.github/workflows/flutter_browserstack_ios.yml b/.github/workflows/flutter_browserstack_ios.yml
index 788eda7a..d7d63c04 100644
--- a/.github/workflows/flutter_browserstack_ios.yml
+++ b/.github/workflows/flutter_browserstack_ios.yml
@@ -37,7 +37,7 @@ jobs:
         java-version: '17'
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.22.2'
+        flutter-version: '3.24.3'
     - run: flutter pub get
     - run: flutter pub run build_runner build --delete-conflicting-outputs
     - shell: bash
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
index 87a4afaf..5031b7d7 100644
--- a/.github/workflows/release-please.yml
+++ b/.github/workflows/release-please.yml
@@ -46,7 +46,7 @@ jobs:
           java-version: '17'
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.2'
+          flutter-version: '3.24.3'
       - name: Install the Apple signing certificate and appstore connect key
         env:
           SBB_APPSTORE_BASE64: ${{ secrets.SBB_APPSTORE_BASE64 }}
@@ -136,7 +136,7 @@ jobs:
           java-version: '17'
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.2'
+          flutter-version: '3.24.3'
       - name: Prepare Flutter Android Build
         env:
           ANDROID_KEYSTORE_STRING: ${{ secrets.ANDROID_KEYSTORE }}
diff --git a/das_client/.fvm/fvm_config.json b/das_client/.fvm/fvm_config.json
index b2dc994c..8a383785 100644
--- a/das_client/.fvm/fvm_config.json
+++ b/das_client/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.22.2",
+  "flutterSdkVersion": "3.24.3",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/das_client/README.md b/das_client/README.md
index e950a3cf..d4cd755d 100644
--- a/das_client/README.md
+++ b/das_client/README.md
@@ -48,6 +48,22 @@ The app is available in three languages:
   <img src="https://img.shields.io/badge/%F0%9F%87%AE%F0%9F%87%B9_italian_(it)-999999?style=for-the-badge" alt="Italian"/>
 </div>
 
+Localization terms/keys conform to the following format:
+
+```
+<PREFIX>_<CONTEXT?>_<LABEL>
+```
+
+The prefix is mandatory and indicates the scope of the term. Valid prefixes are:
+
+| Prefix | Scope  | Description                                    |
+| ---    | ---    | ---                                            |
+| c      | Common | Common terms that can be used in the whole app |
+| p      | Page   | Terms that belong to a specific page           |
+| w      | Widget | Terms that bleong to a specific widget         |
+
+The context is optional and indicate where a localization is used. When a localization is scoped to a page or widget, the context MUST be equal to the name of that page or widget. For example, localizations used on the login page would start with `p_login_`.
+
 ## Code style
 
 This application uses the code style defined in the [Flutter Wiki][2]. The
diff --git a/das_client/integration_test/app_test.dart b/das_client/integration_test/app_test.dart
index 4941edbf..bbe1a975 100644
--- a/das_client/integration_test/app_test.dart
+++ b/das_client/integration_test/app_test.dart
@@ -1,43 +1,19 @@
 import 'package:das_client/flavor.dart';
 import 'package:das_client/main.dart';
-import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:fimber/fimber.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 
 import 'di.dart';
+import 'test/fahrbild_test.dart' as FahrbildTests;
+import 'test/navigation_test.dart' as NavigationTests;
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   Fimber.plantTree(DebugTree());
 
-  group('home screen test', () {
-    testWidgets('load fahrbild company=1088, train=9232', (tester) async {
-      // Load app widget.
-      await prepareAndStartApp(tester);
-
-      await tester.pump(const Duration(seconds: 1));
-
-      // Verify we have trainnumber with 9232.
-      expect(find.text('9232'), findsOneWidget);
-
-      // Verify we have company with 1088.
-      expect(find.text('1088'), findsOneWidget);
-
-      // check that the primary button is enabled
-      var primaryButton = find.byWidgetPredicate((widget) => widget is SBBPrimaryButton).first;
-      expect(tester.widget<SBBPrimaryButton>(primaryButton).onPressed, isNotNull);
-
-      // press load Fahrordnung button
-      await tester.tap(primaryButton);
-
-      // wait for fahrbild to load
-      await tester.pumpAndSettle(const Duration(seconds: 1));
-
-      // check if station is present
-      expect(find.text('MEER-GRENS'), findsOneWidget);
-    });
-  });
+  FahrbildTests.main();
+  NavigationTests.main();
 }
 
 Future<void> prepareAndStartApp(WidgetTester tester) async {
diff --git a/das_client/integration_test/di.dart b/das_client/integration_test/di.dart
index 26989851..7314c487 100644
--- a/das_client/integration_test/di.dart
+++ b/das_client/integration_test/di.dart
@@ -10,18 +10,24 @@ import 'auth/mqtt_client_user_connector.dart';
 
 class IntegrationTestDI {
   const IntegrationTestDI._();
+  static bool _initialized = false;
 
   static Future<void> init(Flavor flavor) {
-    Fimber.i('Initialize integration test dependency injection');
-    GetIt.I.registerFlavor(flavor);
-    GetIt.I.registerTokenSpecProvider();
-    GetIt.I.registerOidcClient();
-    _registerIntegrationTestAuthenticator();
-    GetIt.I.registerBackendService();
-    _registerMqttClientConnector();
-    GetIt.I.registerMqttService();
-    GetIt.I.registerRepositories();
-    GetIt.I.registerServices();
+    if (_initialized) {
+      return GetIt.I.allReady();
+    } else {
+      Fimber.i('Initialize integration test dependency injection');
+      GetIt.I.registerFlavor(flavor);
+      GetIt.I.registerTokenSpecProvider();
+      GetIt.I.registerOidcClient();
+      _registerIntegrationTestAuthenticator();
+      GetIt.I.registerBackendService();
+      _registerMqttClientConnector();
+      GetIt.I.registerMqttService();
+      GetIt.I.registerRepositories();
+      GetIt.I.registerServices();
+      _initialized = true;
+    }
     return GetIt.I.allReady();
   }
 
diff --git a/das_client/integration_test/test/fahrbild_test.dart b/das_client/integration_test/test/fahrbild_test.dart
new file mode 100644
index 00000000..f52a7d0a
--- /dev/null
+++ b/das_client/integration_test/test/fahrbild_test.dart
@@ -0,0 +1,37 @@
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+import '../app_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('home screen test', () {
+    testWidgets('load fahrbild company=1088, train=9232', (tester) async {
+      // Load app widget.
+      await prepareAndStartApp(tester);
+
+      await tester.pump(const Duration(seconds: 1));
+
+      // Verify we have trainnumber with 9232.
+      expect(find.text('9232'), findsOneWidget);
+
+      // Verify we have company with 1088.
+      expect(find.text('1088'), findsOneWidget);
+
+      // check that the primary button is enabled
+      var primaryButton = find.byWidgetPredicate((widget) => widget is SBBPrimaryButton).first;
+      expect(tester.widget<SBBPrimaryButton>(primaryButton).onPressed, isNotNull);
+
+      // press load Fahrordnung button
+      await tester.tap(primaryButton);
+
+      // wait for fahrbild to load
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // check if station is present
+      expect(find.text('MEER-GRENS'), findsOneWidget);
+    });
+  });
+}
diff --git a/das_client/integration_test/test/navigation_test.dart b/das_client/integration_test/test/navigation_test.dart
new file mode 100644
index 00000000..6bc6f903
--- /dev/null
+++ b/das_client/integration_test/test/navigation_test.dart
@@ -0,0 +1,126 @@
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+import '../app_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  group('navigation drawer tests', () {
+    testWidgets('should show navigation drawer', (tester) async {
+      // Load app widget.
+      await prepareAndStartApp(tester);
+
+      await tester.pump(const Duration(seconds: 1));
+
+      // check that there is a drawer
+      var scaffold = find.byWidgetPredicate((widget) => widget is Scaffold).first;
+      expect(tester.widget<Scaffold>(scaffold).drawer, isNotNull);
+
+      // check that drawer is not shown
+      expect(find.text('Fahrtinfo'), findsNothing);
+      expect(find.text('Links'), findsNothing);
+      expect(find.text('Einstellungen'), findsNothing);
+      expect(find.text('Profil'), findsNothing);
+
+      // open drawer
+      final ScaffoldState scaffoldState = tester.firstState(find.byType(Scaffold));
+      scaffoldState.openDrawer();
+
+      // wait for drawer to open
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // check if navigation elements are present
+      expect(find.text('Fahrtinfo'), findsOneWidget);
+      expect(find.text('Links'), findsOneWidget);
+      expect(find.text('Einstellungen'), findsOneWidget);
+      expect(find.text('Profil'), findsOneWidget);
+    });
+
+    testWidgets('test navigate to links', (tester) async {
+      // Load app widget.
+      await prepareAndStartApp(tester);
+
+      await tester.pump(const Duration(seconds: 1));
+
+      // open drawer
+      final ScaffoldState scaffoldState = tester.firstState(find.byType(Scaffold));
+      scaffoldState.openDrawer();
+
+      // wait for drawer to open
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // check if navigation elements are present
+      expect(find.text('Links'), findsOneWidget);
+
+      var gestureDetector = find.ancestor(of: find.text('Links'), matching: find.byType(GestureDetector)).first;
+      await tester.tap(gestureDetector);
+
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // Check drawer is closed
+      expect(find.text('Einstellungen'), findsNothing);
+      expect(find.text('Profil'), findsNothing);
+
+      expect(find.text('Links'), findsOneWidget);
+    });
+
+    testWidgets('test navigate to settings', (tester) async {
+      // Load app widget.
+      await prepareAndStartApp(tester);
+
+      await tester.pump(const Duration(seconds: 1));
+
+      // open drawer
+      final ScaffoldState scaffoldState = tester.firstState(find.byType(Scaffold));
+      scaffoldState.openDrawer();
+
+      // wait for drawer to open
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // check if navigation elements are present
+      expect(find.text('Einstellungen'), findsOneWidget);
+
+      var gestureDetector = find.ancestor(of: find.text('Einstellungen'), matching: find.byType(GestureDetector)).first;
+      await tester.tap(gestureDetector);
+
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // Check drawer is closed
+      expect(find.text('Link'), findsNothing);
+      expect(find.text('Profil'), findsNothing);
+
+      expect(find.text('Einstellungen'), findsOneWidget);
+    });
+
+    testWidgets('test navigate to profile', (tester) async {
+      // Load app widget.
+      await prepareAndStartApp(tester);
+
+      await tester.pump(const Duration(seconds: 1));
+
+      // open drawer
+      final ScaffoldState scaffoldState = tester.firstState(find.byType(Scaffold));
+      scaffoldState.openDrawer();
+
+      // wait for drawer to open
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // check if navigation elements are present
+      expect(find.text('Profil'), findsOneWidget);
+
+      var gestureDetector = find.ancestor(of: find.text('Profil'), matching: find.byType(GestureDetector)).first;
+      await tester.tap(gestureDetector);
+
+      await tester.pumpAndSettle(const Duration(seconds: 1));
+
+      // Check drawer is closed
+      expect(find.text('Link'), findsNothing);
+      expect(find.text('Einstellungen'), findsNothing);
+
+      expect(find.text('Profil'), findsOneWidget);
+    });
+  });
+}
diff --git a/das_client/ios/Podfile.lock b/das_client/ios/Podfile.lock
index 28aff005..e1ca177f 100644
--- a/das_client/ios/Podfile.lock
+++ b/das_client/ios/Podfile.lock
@@ -17,6 +17,8 @@ PODS:
     - Flutter
   - isar_flutter_libs (1.0.0):
     - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -28,6 +30,7 @@ DEPENDENCIES:
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
 
 SPEC REPOS:
@@ -47,6 +50,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/integration_test/ios"
   isar_flutter_libs:
     :path: ".symlinks/plugins/isar_flutter_libs/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
 
@@ -58,6 +63,7 @@ SPEC CHECKSUMS:
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
   integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
+  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
 
 PODFILE CHECKSUM: d9dad56c0cd0b4fd8b4fe3034a53fd42a0b990f6
diff --git a/das_client/l10n/strings_de.arb b/das_client/l10n/strings_de.arb
index 5ebe2811..0f86854d 100644
--- a/das_client/l10n/strings_de.arb
+++ b/das_client/l10n/strings_de.arb
@@ -4,5 +4,9 @@
     "p_train_selection_trainnumber_description": "Zugnummer",
     "p_train_selection_trainnumber_placeholder": "z.B. 711",
     "p_train_selection_company_description": "Company code",
-    "p_train_selection_company_placeholder": "z.B. 0085"
+    "p_train_selection_company_placeholder": "z.B. 0085",
+    "w_navigation_drawer_fahrtinfo_title": "Fahrtinfo",
+    "w_navigation_drawer_links_title": "Links",
+    "w_navigation_drawer_settings_title": "Einstellungen",
+    "w_navigation_drawer_profile_title": "Profil"
 }
\ No newline at end of file
diff --git a/das_client/lib/nav/app_router.dart b/das_client/lib/nav/app_router.dart
index 0d00286e..cca1934e 100644
--- a/das_client/lib/nav/app_router.dart
+++ b/das_client/lib/nav/app_router.dart
@@ -1,18 +1,20 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:das_client/pages/home/home_page.dart';
+import 'package:das_client/pages/fahrt/fahrt_page.dart';
+import 'package:das_client/pages/links/links_page.dart';
+import 'package:das_client/pages/profile/profile_page.dart';
 import 'package:das_client/pages/login/login_page.dart';
 import 'package:das_client/pages/login/splash_page.dart';
+import 'package:das_client/pages/settings/settings_page.dart';
 
 part 'app_router.gr.dart';
 
 @AutoRouterConfig(replaceInRouteName: 'Page,Route')
-class AppRouter extends _$AppRouter {
+class AppRouter extends RootStackRouter {
   @override
-  List<AutoRoute> get routes => [
-        _splash,
-        _login,
-        _home,
-      ];
+  List<AutoRoute> get routes => [_splash, _login, _fahrt, _links, _settings, _profile];
+
+  @override
+  get defaultRouteType => const RouteType.custom();
 }
 
 // Routes
@@ -28,7 +30,22 @@ final _login = AutoRoute(
   page: LoginRoute.page,
 );
 
-final _home = AutoRoute(
-  path: '/home',
-  page: HomeRoute.page,
+final _fahrt = AutoRoute(
+  path: '/fahrt',
+  page: FahrtRoute.page,
+);
+
+final _links = AutoRoute(
+  path: '/links',
+  page: LinksRoute.page,
 );
+
+final _settings = AutoRoute(
+  path: '/settings',
+  page: SettingsRoute.page,
+);
+
+final _profile = AutoRoute(
+  path: '/profile',
+  page: ProfileRoute.page,
+);
\ No newline at end of file
diff --git a/das_client/lib/nav/das_navigation_drawer.dart b/das_client/lib/nav/das_navigation_drawer.dart
new file mode 100644
index 00000000..86a09fb6
--- /dev/null
+++ b/das_client/lib/nav/das_navigation_drawer.dart
@@ -0,0 +1,92 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:das_client/i18n/src/build_context_x.dart';
+import 'package:das_client/nav/app_router.dart';
+import 'package:das_client/widgets/app_version_text.dart';
+import 'package:das_client/widgets/device_id_text.dart';
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+
+class DASNavigationDrawer extends StatefulWidget {
+  const DASNavigationDrawer({super.key});
+
+  @override
+  State<DASNavigationDrawer> createState() => _DASNavigationDrawerState();
+}
+
+class _DASNavigationDrawerState extends State<DASNavigationDrawer> {
+  @override
+  Widget build(BuildContext context) {
+    return Drawer(
+      child: Column(
+        children: [
+          Expanded(
+            child: ListView(
+              shrinkWrap: true,
+              children: [
+                _navigationTile(
+                  context,
+                  icon: SBBIcons.route_circle_start_small,
+                  title: context.l10n.w_navigation_drawer_fahrtinfo_title,
+                  route: const FahrtRoute(),
+                ),
+                _navigationTile(
+                  context,
+                  icon: SBBIcons.link_external_small,
+                  title: context.l10n.w_navigation_drawer_links_title,
+                  route: const LinksRoute(),
+                ),
+                _navigationTile(
+                  context,
+                  icon: SBBIcons.gears_small,
+                  title: context.l10n.w_navigation_drawer_settings_title,
+                  route: const SettingsRoute(),
+                ),
+                _navigationTile(
+                  context,
+                  icon: SBBIcons.user_small,
+                  title: context.l10n.w_navigation_drawer_profile_title,
+                  route: const ProfileRoute()
+                ),
+              ],
+            ),
+          ),
+          _versionFooter(),
+        ],
+      ),
+    );
+  }
+
+  Widget _navigationTile(BuildContext context,
+      {required IconData icon, required String title, required PageRouteInfo route, bool active = true}) {
+    bool isActiveRoute = context.router.isRouteActive(route.routeName);
+
+    return ListTile(
+      leading: Icon(icon),
+      title: Text(title,
+          style: isActiveRoute ? SBBTextStyles.mediumBold : SBBTextStyles.mediumLight),
+      onTap: () {
+        Navigator.pop(context);
+        context.router.replace(route);
+      },
+    );
+  }
+
+  Widget _versionFooter() {
+    return const Align(
+      alignment: Alignment.bottomCenter,
+      child: Padding(
+        padding: EdgeInsets.all(sbbDefaultSpacing),
+        child: Column(
+          children: [
+            AppVersionText(
+              color: SBBColors.granite,
+            ),
+            DeviceIdText(
+              color: SBBColors.granite,
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/das_client/lib/pages/home/home_page.dart b/das_client/lib/pages/fahrt/fahrt_page.dart
similarity index 85%
rename from das_client/lib/pages/home/home_page.dart
rename to das_client/lib/pages/fahrt/fahrt_page.dart
index 08b6eca4..087ab330 100644
--- a/das_client/lib/pages/home/home_page.dart
+++ b/das_client/lib/pages/fahrt/fahrt_page.dart
@@ -3,21 +3,23 @@ import 'package:das_client/auth/auth_cubit.dart';
 import 'package:das_client/bloc/fahrbild_cubit.dart';
 import 'package:das_client/i18n/src/build_context_x.dart';
 import 'package:das_client/nav/app_router.dart';
-import 'package:das_client/pages/home/widgets/fahrbild.dart';
-import 'package:das_client/pages/home/widgets/train_selection.dart';
+import 'package:das_client/nav/das_navigation_drawer.dart';
+import 'package:das_client/pages/fahrt/widgets/fahrbild.dart';
+import 'package:das_client/pages/fahrt/widgets/train_selection.dart';
 import 'package:design_system_flutter/design_system_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 @RoutePage()
-class HomePage extends StatelessWidget {
-  const HomePage({super.key});
+class FahrtPage extends StatelessWidget {
+  const FahrtPage({super.key});
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: _appBar(context),
       body: _body(context),
+      drawer: DASNavigationDrawer(),
     );
   }
 
diff --git a/das_client/lib/pages/home/widgets/fahrbild.dart b/das_client/lib/pages/fahrt/widgets/fahrbild.dart
similarity index 100%
rename from das_client/lib/pages/home/widgets/fahrbild.dart
rename to das_client/lib/pages/fahrt/widgets/fahrbild.dart
diff --git a/das_client/lib/pages/home/widgets/train_selection.dart b/das_client/lib/pages/fahrt/widgets/train_selection.dart
similarity index 100%
rename from das_client/lib/pages/home/widgets/train_selection.dart
rename to das_client/lib/pages/fahrt/widgets/train_selection.dart
diff --git a/das_client/lib/pages/links/links_page.dart b/das_client/lib/pages/links/links_page.dart
new file mode 100644
index 00000000..32d06a0e
--- /dev/null
+++ b/das_client/lib/pages/links/links_page.dart
@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:das_client/i18n/src/build_context_x.dart';
+import 'package:das_client/nav/das_navigation_drawer.dart';
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+
+@RoutePage()
+class LinksPage extends StatelessWidget {
+  const LinksPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _appBar(context),
+      body: _body(context),
+      drawer: const DASNavigationDrawer(),
+    );
+  }
+
+  SBBHeader _appBar(BuildContext context) {
+    return SBBHeader(
+      title: context.l10n.c_app_name,
+    );
+  }
+
+  Widget _body(BuildContext context) {
+    return Center(child: Text(context.l10n.w_navigation_drawer_links_title));
+  }
+}
diff --git a/das_client/lib/pages/login/login_page.dart b/das_client/lib/pages/login/login_page.dart
index 060760ee..4edf7156 100644
--- a/das_client/lib/pages/login/login_page.dart
+++ b/das_client/lib/pages/login/login_page.dart
@@ -93,7 +93,7 @@ class _LoginPageState extends State<LoginPage> {
     try {
       await authenticator.login();
       if (context.mounted) {
-        context.router.replace(const HomeRoute());
+        context.router.replace(const FahrtRoute());
       }
     } catch (e) {
       Fimber.d('Login failed', ex: e);
diff --git a/das_client/lib/pages/login/splash_page.dart b/das_client/lib/pages/login/splash_page.dart
index b1255452..43bf873a 100644
--- a/das_client/lib/pages/login/splash_page.dart
+++ b/das_client/lib/pages/login/splash_page.dart
@@ -23,7 +23,7 @@ class SplashPage extends StatelessWidget {
     return BlocBuilder<AuthCubit, AuthState>(
       builder: (context, state) {
         if (state is Authenticated) {
-          context.router.replace(const HomeRoute());
+          context.router.replace(const FahrtRoute());
         } else if (state is Unauthenticated) {
           context.router.replace(const LoginRoute());
         }
diff --git a/das_client/lib/pages/profile/profile_page.dart b/das_client/lib/pages/profile/profile_page.dart
new file mode 100644
index 00000000..399d0d79
--- /dev/null
+++ b/das_client/lib/pages/profile/profile_page.dart
@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:das_client/i18n/src/build_context_x.dart';
+import 'package:das_client/nav/das_navigation_drawer.dart';
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+
+@RoutePage()
+class ProfilePage extends StatelessWidget {
+  const ProfilePage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _appBar(context),
+      body: _body(context),
+      drawer: const DASNavigationDrawer(),
+    );
+  }
+
+  SBBHeader _appBar(BuildContext context) {
+    return SBBHeader(
+      title: context.l10n.c_app_name,
+    );
+  }
+
+  Widget _body(BuildContext context) {
+    return Center(child: Text(context.l10n.w_navigation_drawer_profile_title));
+  }
+}
diff --git a/das_client/lib/pages/settings/settings_page.dart b/das_client/lib/pages/settings/settings_page.dart
new file mode 100644
index 00000000..d7a807c9
--- /dev/null
+++ b/das_client/lib/pages/settings/settings_page.dart
@@ -0,0 +1,29 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:das_client/i18n/src/build_context_x.dart';
+import 'package:das_client/nav/das_navigation_drawer.dart';
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+
+@RoutePage()
+class SettingsPage extends StatelessWidget {
+  const SettingsPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: _appBar(context),
+      body: _body(context),
+      drawer: const DASNavigationDrawer(),
+    );
+  }
+
+  SBBHeader _appBar(BuildContext context) {
+    return SBBHeader(
+      title: context.l10n.c_app_name,
+    );
+  }
+
+  Widget _body(BuildContext context) {
+    return Center(child: Text(context.l10n.w_navigation_drawer_settings_title));
+  }
+}
diff --git a/das_client/lib/repo/sfera_repository.dart b/das_client/lib/repo/sfera_repository.dart
index 3189f889..af71e5f8 100644
--- a/das_client/lib/repo/sfera_repository.dart
+++ b/das_client/lib/repo/sfera_repository.dart
@@ -54,7 +54,7 @@ class SferaRepository {
       final segmentProfileEntity = segmentProfile.toEntity(isarId: _db.segmentProfile.autoIncrement());
       Fimber.i(
           "Writing segment profile to db spId=${segmentProfileEntity.spId} majorVersion=${segmentProfileEntity.majorVersion} minorVersion=${segmentProfileEntity.minorVersion}");
-      await _db.writeAsync((isar) {
+      _db.write((isar) {
         isar.segmentProfile.put(segmentProfileEntity);
       });
     } else {
diff --git a/das_client/lib/service/sfera/task/handshake_task.dart b/das_client/lib/service/sfera/task/handshake_task.dart
index ae0b333e..240230cf 100644
--- a/das_client/lib/service/sfera/task/handshake_task.dart
+++ b/das_client/lib/service/sfera/task/handshake_task.dart
@@ -14,9 +14,8 @@ import 'package:das_client/util/error_code.dart';
 import 'package:fimber/fimber.dart';
 
 class HandshakeTask extends SferaTask {
-  HandshakeTask({required MqttService mqttService, required this.otnId, Duration? timeout})
-      : _mqttService = mqttService,
-        super(timeoutDuration: timeout);
+  HandshakeTask({required MqttService mqttService, required this.otnId, super.timeout})
+      : _mqttService = mqttService;
 
   final MqttService _mqttService;
   final OtnId otnId;
diff --git a/das_client/lib/service/sfera/task/request_journey_profile_task.dart b/das_client/lib/service/sfera/task/request_journey_profile_task.dart
index e729bef1..eb1f66cf 100644
--- a/das_client/lib/service/sfera/task/request_journey_profile_task.dart
+++ b/das_client/lib/service/sfera/task/request_journey_profile_task.dart
@@ -16,10 +16,9 @@ class RequestJourneyProfileTask extends SferaTask<JourneyProfile> {
       {required MqttService mqttService,
       required SferaRepository sferaRepository,
       required this.otnId,
-      Duration? timeout})
+      super.timeout})
       : _mqttService = mqttService,
-        _sferaRepository = sferaRepository,
-        super(timeoutDuration: timeout);
+        _sferaRepository = sferaRepository;
 
   final MqttService _mqttService;
   final OtnId otnId;
diff --git a/das_client/lib/service/sfera/task/sfera_task.dart b/das_client/lib/service/sfera/task/sfera_task.dart
index bcdae200..7fec8c17 100644
--- a/das_client/lib/service/sfera/task/sfera_task.dart
+++ b/das_client/lib/service/sfera/task/sfera_task.dart
@@ -8,9 +8,9 @@ typedef TaskFailed = void Function(SferaTask task, ErrorCode errorCode);
 typedef TaskCompleted<T> = void Function(SferaTask task, T? data);
 
 abstract class SferaTask<T> implements SferaMessageHandler {
-  SferaTask({Duration? timeoutDuration}) : _timeoutDuration = timeoutDuration ?? const Duration(seconds: 10);
+  SferaTask({Duration? timeout}) : _timeout = timeout ?? const Duration(seconds: 15);
 
-  final Duration _timeoutDuration;
+  final Duration _timeout;
   Timer? timeoutTimer;
 
   Future<void> execute(TaskCompleted<T> onCompleted, TaskFailed onFailed);
@@ -19,7 +19,7 @@ abstract class SferaTask<T> implements SferaMessageHandler {
     TaskFailed onFailed,
   ) {
     timeoutTimer?.cancel();
-    timeoutTimer = Timer(_timeoutDuration, () {
+    timeoutTimer = Timer(_timeout, () {
       Fimber.e("Timeout reached for task $this");
       onFailed(this, ErrorCode.sferaRequestTimeout);
     });
diff --git a/das_client/lib/widgets/app_version_text.dart b/das_client/lib/widgets/app_version_text.dart
new file mode 100644
index 00000000..3fc4a12d
--- /dev/null
+++ b/das_client/lib/widgets/app_version_text.dart
@@ -0,0 +1,36 @@
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+
+class AppVersionText extends StatelessWidget {
+  const AppVersionText({super.key, required this.color});
+
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: PackageInfo.fromPlatform(),
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData) {
+          final PackageInfo info = snapshot.data as PackageInfo;
+          return Row(
+            children: [
+              Icon(
+                SBBIcons.circle_information_small,
+                color: color,
+              ),
+              const SizedBox(
+                width: sbbDefaultSpacing / 2,
+              ),
+              Text(info.version,
+                  style: SBBTextStyles.smallLight.copyWith(color: color)),
+            ],
+          );
+        } else {
+          return const SizedBox.shrink();
+        }
+      },
+    );
+  }
+}
diff --git a/das_client/lib/widgets/device_id_text.dart b/das_client/lib/widgets/device_id_text.dart
new file mode 100644
index 00000000..3e54d407
--- /dev/null
+++ b/das_client/lib/widgets/device_id_text.dart
@@ -0,0 +1,24 @@
+import 'package:das_client/util/device_id_info.dart';
+import 'package:design_system_flutter/design_system_flutter.dart';
+import 'package:flutter/material.dart';
+
+class DeviceIdText extends StatelessWidget {
+  const DeviceIdText({super.key, required this.color});
+
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: DeviceIdInfo.getDeviceId(),
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData) {
+          final deviceId = snapshot.data as String? ?? '';
+          return Text(deviceId, style: SBBTextStyles.smallLight.copyWith(color: color));
+        } else {
+          return const SizedBox.shrink();
+        }
+      },
+    );
+  }
+}
diff --git a/das_client/pubspec.lock b/das_client/pubspec.lock
index 891ee846..3d0ec1ad 100644
--- a/das_client/pubspec.lock
+++ b/das_client/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "61.0.0"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
+    version: "6.4.1"
   android_id:
     dependency: "direct main"
     description:
@@ -53,18 +53,18 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "6cad3f408863ffff2b5757967c802b18415dac4acb1b40c5cdd45d0a26e5080f"
+      sha256: b83e8ce46da7228cdd019b5a11205454847f0a971bca59a7529b98df9876889b
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.3"
+    version: "9.2.2"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: ba28133d3a3bf0a66772bcc98dade5843753cd9f1a8fb4802b842895515b67d3
+      sha256: c9086eb07271e51b44071ad5cff34e889f3156710b964a308c2ab590769e79e6
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.0.0"
   bloc:
     dependency: transitive
     description:
@@ -117,10 +117,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
@@ -229,10 +229,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.6"
   design_system_flutter:
     dependency: "direct main"
     description:
@@ -246,18 +246,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91
+      sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.1.2"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "7.0.1"
   event_bus:
     dependency: transitive
     description:
@@ -468,10 +468,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -661,6 +661,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  package_info_plus:
+    dependency: "direct main"
+    description:
+      name: package_info_plus
+      sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.0.3"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   path:
     dependency: transitive
     description:
@@ -994,18 +1010,18 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "2.4.0"
   webdriver:
     dependency: transitive
     description:
@@ -1018,10 +1034,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.1"
+    version: "5.5.4"
   win32_registry:
     dependency: transitive
     description:
diff --git a/das_client/pubspec.yaml b/das_client/pubspec.yaml
index 83115bb9..dae13a77 100644
--- a/das_client/pubspec.yaml
+++ b/das_client/pubspec.yaml
@@ -51,7 +51,7 @@ dependencies:
   # https://pub.dev/packages/get_it
   get_it: ^8.0.0
   # https://pub.dev/packages/auto_route
-  auto_route: ^8.1.3
+  auto_route: ^9.2.2
   # https://pub.dev/packages/flutter_bloc
   flutter_bloc: ^8.1.5
   # https://pub.dev/packages/fimber
@@ -78,6 +78,8 @@ dependencies:
   isar_flutter_libs: ^4.0.0-dev.14
   # https://pub.dev/packages/path_provider
   path_provider: ^2.1.3
+  # https://pub.dev/packages/package_info_plus
+  package_info_plus: ^8.0.3
 
 dev_dependencies:
   integration_test:
@@ -86,7 +88,7 @@ dev_dependencies:
     sdk: flutter
 
   build_runner: ^2.4.9
-  auto_route_generator: ^8.0.0
+  auto_route_generator: ^9.0.0
   mockito: ^5.4.4
 
   # The "flutter_lints" package below contains a set of recommended lints to