summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAldrik Ramaekers <aldrik@amftech.nl>2022-12-01 10:38:25 +0100
committerAldrik Ramaekers <aldrik@amftech.nl>2022-12-01 10:38:25 +0100
commitcfe52b8e397deb03a63dccd8dfd754e38d9b8a85 (patch)
tree1724118c9ce03edd137e22589a617a985121536a /lib
parent03bd15045beee64dab5795053b662d02f7049e31 (diff)
force orientation, fix labels, hide bars when navigating
Diffstat (limited to 'lib')
-rw-r--r--lib/config/defaults.dart4
-rw-r--r--lib/main.dart6
-rw-r--r--lib/pages/developer_page.dart9
-rw-r--r--lib/pages/home_page.dart1
-rw-r--r--lib/pages/logbook_page.dart5
-rw-r--r--lib/pages/navigation_page.dart11
-rw-r--r--lib/services/log_service.dart2
-rw-r--r--lib/services/storegear_api_service.dart13
8 files changed, 41 insertions, 10 deletions
diff --git a/lib/config/defaults.dart b/lib/config/defaults.dart
index e059169..58e2412 100644
--- a/lib/config/defaults.dart
+++ b/lib/config/defaults.dart
@@ -1,5 +1,5 @@
-String program_version = '0.8';
-bool debug_output = true;
+String program_version = '0.9';
+bool debug_mode = false;
class ShiftType {
String name;
diff --git a/lib/main.dart b/lib/main.dart
index 513be69..a860b91 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,9 +1,11 @@
import 'dart:async';
import 'dart:io';
+import 'package:auto_orientation/auto_orientation.dart';
import 'package:event_bus/event_bus.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:training_planner/services/iroute_provider_service.dart';
import 'package:training_planner/services/ishift_provider_service.dart';
@@ -24,9 +26,11 @@ import 'package:here_sdk/core.engine.dart';
import 'package:here_sdk/core.errors.dart';
import 'package:here_sdk/mapview.dart';
-void main() {
+Future<void> main() async {
_initializeHERESDK();
WidgetsFlutterBinding.ensureInitialized();
+ await SystemChrome.setPreferredOrientations(
+ [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]);
configureNotifications();
runZonedGuarded(() {
runApp(const MyApp());
diff --git a/lib/pages/developer_page.dart b/lib/pages/developer_page.dart
index a90d9f5..9a7f9d5 100644
--- a/lib/pages/developer_page.dart
+++ b/lib/pages/developer_page.dart
@@ -43,6 +43,12 @@ class _DeveloperPageState extends State<DeveloperPage> {
}
}
+ _toggleDebugMode() {
+ setState(() {
+ debug_mode = !debug_mode;
+ });
+ }
+
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -57,6 +63,9 @@ class _DeveloperPageState extends State<DeveloperPage> {
child: Column(
children: [
Text('Versie ' + program_version),
+ ElevatedButton(
+ onPressed: _toggleDebugMode,
+ child: Text('Test Modus: ' + debug_mode.toString()))
/*
TextButton(
onPressed: () {
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index 07fc1a8..b669edb 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:training_planner/pages/agenda_page.dart';
import 'package:training_planner/pages/delivery_login_page.dart';
import 'package:training_planner/pages/developer_page.dart';
diff --git a/lib/pages/logbook_page.dart b/lib/pages/logbook_page.dart
index 44d2644..be1a8e1 100644
--- a/lib/pages/logbook_page.dart
+++ b/lib/pages/logbook_page.dart
@@ -153,9 +153,8 @@ class _LogbookPageState extends State<LogbookPage> {
Padding(
padding:
EdgeInsets.only(left: 5, bottom: 5, right: 5)),
- Text('Per uur: ' +
- month.calculateHourlyRate().toStringAsFixed(2) +
- ' uur'),
+ Text('Per uur: €' +
+ month.calculateHourlyRate().toStringAsFixed(2)),
Text('Verdiend: €' +
month.actualSalary.toStringAsFixed(2)),
Padding(
diff --git a/lib/pages/navigation_page.dart b/lib/pages/navigation_page.dart
index f4042fc..16494b5 100644
--- a/lib/pages/navigation_page.dart
+++ b/lib/pages/navigation_page.dart
@@ -1,4 +1,6 @@
import 'dart:async';
+import 'package:auto_orientation/auto_orientation.dart';
+import 'package:flutter/services.dart';
import 'package:training_planner/route.dart' as DHLRoute;
import 'package:carousel_slider/carousel_slider.dart';
import 'package:flutter/material.dart';
@@ -21,6 +23,7 @@ import 'package:here_sdk/core.dart';
import 'package:here_sdk/core.engine.dart';
import 'package:here_sdk/core.errors.dart';
import 'package:here_sdk/mapview.dart';
+import 'package:wakelock/wakelock.dart';
class NavigationPage extends StatefulWidget {
@override
@@ -69,6 +72,10 @@ class _NavigationPageState extends State<NavigationPage> {
initState() {
super.initState();
+ SystemChrome.setEnabledSystemUIOverlays([]);
+ Wakelock.enable();
+ AutoOrientation.portraitDownMode();
+
_handleLocationPermission();
panGestureEvent = eventBus.on<MapPanningEvent>().listen((event) {
@@ -263,6 +270,10 @@ class _NavigationPageState extends State<NavigationPage> {
panGestureEvent?.cancel();
taskLoadedEvent?.cancel();
_routingExample?.destroy();
+ Wakelock.disable();
+ AutoOrientation.portraitUpMode();
+ SystemChrome.setEnabledSystemUIOverlays(
+ [SystemUiOverlay.top, SystemUiOverlay.bottom]);
super.dispose();
}
}
diff --git a/lib/services/log_service.dart b/lib/services/log_service.dart
index cf8ea0b..9775823 100644
--- a/lib/services/log_service.dart
+++ b/lib/services/log_service.dart
@@ -2,7 +2,7 @@ import 'package:training_planner/config/defaults.dart';
class LogService {
static void log(dynamic data) {
- if (debug_output) {
+ if (debug_mode) {
print(data);
}
}
diff --git a/lib/services/storegear_api_service.dart b/lib/services/storegear_api_service.dart
index b40626d..55a9042 100644
--- a/lib/services/storegear_api_service.dart
+++ b/lib/services/storegear_api_service.dart
@@ -1,6 +1,7 @@
import 'dart:convert';
import 'package:flutter/cupertino.dart';
import 'package:http/http.dart' as http;
+import 'package:training_planner/config/defaults.dart';
import 'package:training_planner/models/login_request.dart';
import 'package:training_planner/models/login_response.dart';
import 'package:training_planner/models/route_list.dart';
@@ -14,7 +15,9 @@ class StoregearApiService extends IStoregearApiService {
@override
Future<LoginResponse> login(LoginRequest req) async {
- //return LoginResponse();
+ if (debug_mode) {
+ return LoginResponse();
+ }
final response = await http.post(
Uri.parse('http://dhlapis.com/delivery/v1/users/login?env_type=PROD'),
@@ -90,7 +93,9 @@ class StoregearApiService extends IStoregearApiService {
@override
Future<RouteList> getRoutes() async {
- //return _getMockRouteList();
+ if (debug_mode) {
+ return _getMockRouteList();
+ }
final response = await http.get(
Uri.parse('http://dhlapis.com/delivery/v1/routes'),
@@ -114,7 +119,9 @@ class StoregearApiService extends IStoregearApiService {
@override
Future<DHLRoute.Route?> getRoute(String tripkey) async {
- //return MockRouteProviderService().getRoute(int.parse(tripkey));
+ if (debug_mode) {
+ return MockRouteProviderService().getRoute(int.parse(tripkey));
+ }
final response = await http.get(
Uri.parse(