From e37d74527e03b6a804a35cbfb0956d4e0100889f Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Mon, 6 Feb 2023 19:04:25 +0100 Subject: 1.13.7 --- lib/pages/all_routes_page.dart | 1 + lib/pages/delivery_login_page.dart | 13 ++++++++----- lib/pages/settings_page.dart | 12 ++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) (limited to 'lib/pages') diff --git a/lib/pages/all_routes_page.dart b/lib/pages/all_routes_page.dart index 0efe524..d3c1637 100644 --- a/lib/pages/all_routes_page.dart +++ b/lib/pages/all_routes_page.dart @@ -27,6 +27,7 @@ class _AllRoutesPageState extends State { try { apiService.getRoutes().then((value) { + debugPrint('xddd 2'); setState(() => {routeInfo = value}); }); } catch (e) { diff --git a/lib/pages/delivery_login_page.dart b/lib/pages/delivery_login_page.dart index 2ce6524..25cccf3 100644 --- a/lib/pages/delivery_login_page.dart +++ b/lib/pages/delivery_login_page.dart @@ -30,7 +30,13 @@ class _DeliveryLoginPageState extends State { pnumberController.text = '639174'; daycodeController.text = '424'; - versionController.text = "1.12.3-prod"; + versionController.text = ".."; + + settingsService.readSettingsFromFile().then((value) => { + setState(() => { + versionController.text = value.version + }) + }); } _attemptLogin() async { @@ -84,11 +90,8 @@ class _DeliveryLoginPageState extends State { Padding(padding: EdgeInsets.all(10)), TextField( decoration: InputDecoration(labelText: "Versie"), - keyboardType: TextInputType.number, + keyboardType: TextInputType.text, controller: versionController, - inputFormatters: [ - FilteringTextInputFormatter.digitsOnly - ], ), Padding(padding: EdgeInsets.all(10)), OutlinedButton( diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart index 8d35ee7..1dbb01a 100644 --- a/lib/pages/settings_page.dart +++ b/lib/pages/settings_page.dart @@ -13,9 +13,13 @@ class SettingsPage extends StatefulWidget { } class _SettingsPageState extends State { + final versionController = TextEditingController(); + @override initState() { super.initState(); + + versionController.text = widget.settings.version; } Future saveSettings() async { @@ -44,6 +48,14 @@ class _SettingsPageState extends State { decoration: InputDecoration( labelText: 'Huidige uurloon', ), + ), + TextField( + decoration: InputDecoration(labelText: "Versie"), + keyboardType: TextInputType.text, + controller: versionController, + onChanged: ((value) => { + widget.settings.version = value + }), ), Padding(padding: const EdgeInsets.all(0)), TextButton( -- cgit v1.2.3-70-g09d2