From e938da92fa92f6c7036934dd5e673c5b9df68f4f Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sat, 5 Nov 2022 16:31:35 +0100 Subject: work --- lib/events/RouteLoadedEvent.dart | 6 ++++++ lib/pages/delivery_login_page.dart | 4 ++++ lib/pages/navigation_page.dart | 21 ++++++++++++++++++--- lib/services/authentication_service.dart | 4 ++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 lib/events/RouteLoadedEvent.dart (limited to 'lib') diff --git a/lib/events/RouteLoadedEvent.dart b/lib/events/RouteLoadedEvent.dart new file mode 100644 index 0000000..98e1a3b --- /dev/null +++ b/lib/events/RouteLoadedEvent.dart @@ -0,0 +1,6 @@ +import 'package:training_planner/pages/navigation_page.dart'; + +class RouteLoadedEvent { + final NavigationPage page; + const RouteLoadedEvent({required this.page}); +} diff --git a/lib/pages/delivery_login_page.dart b/lib/pages/delivery_login_page.dart index 1724ba2..bdf1b0e 100644 --- a/lib/pages/delivery_login_page.dart +++ b/lib/pages/delivery_login_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:training_planner/events/RouteLoadedEvent.dart'; import 'package:training_planner/pages/agenda_page.dart'; import 'package:training_planner/pages/developer_page.dart'; import 'package:training_planner/pages/logbook_page.dart'; @@ -23,6 +24,9 @@ class _DeliveryLoginPageState extends State { @override initState() { super.initState(); + + pnumberController.text = remoteAuthService.storedPNumber; + daycodeController.text = remoteAuthService.storedDaycode; } _attemptLogin() async { diff --git a/lib/pages/navigation_page.dart b/lib/pages/navigation_page.dart index d1c15b9..2d8c52b 100644 --- a/lib/pages/navigation_page.dart +++ b/lib/pages/navigation_page.dart @@ -9,6 +9,7 @@ import 'package:loading_animation_widget/loading_animation_widget.dart'; import 'package:training_planner/RoutingExample.dart'; import 'package:training_planner/events/MapPanningEvent.dart'; import 'package:training_planner/events/NextStopLoadedEvent.dart'; +import 'package:training_planner/events/RouteLoadedEvent.dart'; import 'package:training_planner/events/StopCompletedEvent.dart'; import 'package:training_planner/main.dart'; import 'package:training_planner/shift.dart'; @@ -142,11 +143,23 @@ class _NavigationPageState extends State { decoration: BoxDecoration(color: Colors.black), height: 2, ), - Expanded(child: HereMap(onMapCreated: _onMapCreated)), + Expanded( + child: Stack( + children: [HereMap(onMapCreated: _onMapCreated)], + ), + ), ], )); } + Widget getLoadingScreen() { + return LoadingAnimationWidget.flickr( + leftDotColor: Style.titleColor, + rightDotColor: Style.background, + size: MediaQuery.of(context).size.width / 4, + ); + } + Widget _createNextDropInfoWidget() { if (_routingExample == null) return Padding(padding: EdgeInsets.all(0)); @@ -227,13 +240,15 @@ class _NavigationPageState extends State { ); } - void _onMapCreated(HereMapController hereMapController) { + void _onMapCreated(HereMapController hereMapController) async { hereMapController.mapScene.loadSceneForMapScheme(MapScheme.normalDay, (MapError? error) { if (error == null) { _routingExample = RoutingExample(hereMapController); routeProvider.getRoute(0).then((value) { - _routingExample?.addRoute(value); + _routingExample?.addRoute(value).then((value) { + eventBus.fire(RouteLoadedEvent(page: widget)); + }); }); } else { print("Map scene not loaded. MapError: " + error.toString()); diff --git a/lib/services/authentication_service.dart b/lib/services/authentication_service.dart index a1fd370..ede8808 100644 --- a/lib/services/authentication_service.dart +++ b/lib/services/authentication_service.dart @@ -1,10 +1,14 @@ class AuthenticationService { bool isAuthenticated = false; String apiKey = ''; + String storedPNumber = ''; + String storedDaycode = ''; Future authenticate(String username, String password) async { isAuthenticated = true; apiKey = 'test'; + storedPNumber = username; + storedDaycode = password; return true; } } -- cgit v1.2.3-70-g09d2