diff options
| author | Aldrik Ramaekers <aldrik@amftech.nl> | 2022-11-07 21:23:36 +0100 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrik@amftech.nl> | 2022-11-07 21:23:36 +0100 |
| commit | eed27fa5568e507c255a524185356786c877b2b8 (patch) | |
| tree | 4e2748dfd42ec1d3c4584102e6780db09bd82f0a /lib/pages | |
| parent | 94d5a9897bf536a359febab1b422a6aff1bfd080 (diff) | |
ready for irl test
Diffstat (limited to 'lib/pages')
| -rw-r--r-- | lib/pages/all_routes_page.dart | 38 | ||||
| -rw-r--r-- | lib/pages/delivery_login_page.dart | 4 | ||||
| -rw-r--r-- | lib/pages/navigation_page.dart | 11 |
3 files changed, 40 insertions, 13 deletions
diff --git a/lib/pages/all_routes_page.dart b/lib/pages/all_routes_page.dart index 495fc49..a1173cf 100644 --- a/lib/pages/all_routes_page.dart +++ b/lib/pages/all_routes_page.dart @@ -4,7 +4,8 @@ import 'package:in_date_utils/in_date_utils.dart' as DateUtilities; import 'package:loading_animation_widget/loading_animation_widget.dart'; import 'package:training_planner/main.dart'; import 'package:training_planner/models/route_list.dart'; -import 'package:training_planner/route.dart'; +import 'package:training_planner/pages/navigation_page.dart'; +import 'package:training_planner/route.dart' as DHLRoute; import 'package:training_planner/shift.dart'; import 'package:training_planner/style/style.dart'; import 'package:training_planner/utils/date.dart'; @@ -29,7 +30,26 @@ class _AllRoutesPageState extends State<AllRoutesPage> { setState(() => {routeInfo = value}); }); } catch (e) { - debugPrint(e.toString()); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Route lijst kan niet worden geladen'))); + } + } + + _startRoute(String tripkey) async { + try { + DHLRoute.Route? route = await apiService.getRoute(tripkey); + + if (route == null) { + throw new Exception(); + } + + Navigator.push( + context, + MaterialPageRoute(builder: (context) => NavigationPage(route: route)), + ); + } catch (e) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Route kan niet worden geladen'))); } } @@ -41,7 +61,8 @@ class _AllRoutesPageState extends State<AllRoutesPage> { padding: const EdgeInsets.only(bottom: 8, left: 10, right: 10), child: Container( decoration: BoxDecoration( - color: Style.background, + color: Color.fromARGB(40, 0, 0, 0), + border: Border.all(color: Color.fromARGB(160, 0, 0, 0)), borderRadius: BorderRadius.all(Radius.circular(4))), child: Padding( padding: const EdgeInsets.all(8), @@ -62,8 +83,10 @@ class _AllRoutesPageState extends State<AllRoutesPage> { padding: EdgeInsets.all(0), ), ), - OutlinedButton( - onPressed: () {}, + ElevatedButton( + onPressed: () { + _startRoute(route.tripKey!); + }, child: Text('Bekijk'), ), ], @@ -121,6 +144,11 @@ class _AllRoutesPageState extends State<AllRoutesPage> { @override Widget build(BuildContext context) { return Scaffold( + appBar: AppBar( + title: const Text('Werkschema'), + backgroundColor: Style.background, + foregroundColor: Style.titleColor, + ), body: Container( color: Colors.white, child: ShaderMask( diff --git a/lib/pages/delivery_login_page.dart b/lib/pages/delivery_login_page.dart index 15ab4b3..2ce6524 100644 --- a/lib/pages/delivery_login_page.dart +++ b/lib/pages/delivery_login_page.dart @@ -28,8 +28,8 @@ class _DeliveryLoginPageState extends State<DeliveryLoginPage> { initState() { super.initState(); - pnumberController.text = remoteAuthService.storedPNumber; - daycodeController.text = remoteAuthService.storedDaycode; + pnumberController.text = '639174'; + daycodeController.text = '424'; versionController.text = "1.12.3-prod"; } diff --git a/lib/pages/navigation_page.dart b/lib/pages/navigation_page.dart index 3ab40fd..f4042fc 100644 --- a/lib/pages/navigation_page.dart +++ b/lib/pages/navigation_page.dart @@ -1,5 +1,5 @@ import 'dart:async'; - +import 'package:training_planner/route.dart' as DHLRoute; import 'package:carousel_slider/carousel_slider.dart'; import 'package:flutter/material.dart'; import 'package:geolocator/geolocator.dart'; @@ -25,8 +25,9 @@ import 'package:here_sdk/mapview.dart'; class NavigationPage extends StatefulWidget { @override _NavigationPageState createState() => _NavigationPageState(); + final DHLRoute.Route route; - const NavigationPage({Key? key}) : super(key: key); + const NavigationPage({Key? key, required this.route}) : super(key: key); } class _NavigationPageState extends State<NavigationPage> { @@ -245,10 +246,8 @@ class _NavigationPageState extends State<NavigationPage> { (MapError? error) { if (error == null) { _routingExample = RoutingExample(hereMapController); - routeProvider.getRoute(0).then((value) { - _routingExample?.addRoute(value).then((value) { - eventBus.fire(RouteLoadedEvent(page: widget)); - }); + _routingExample?.addRoute(widget.route).then((value) { + eventBus.fire(RouteLoadedEvent(page: widget)); }); } else { print("Map scene not loaded. MapError: " + error.toString()); |
