1.13.7

3 files changed, 21 insertions, 5 deletions

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<AllRoutesPage> {
 
     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<DeliveryLoginPage> {
 
     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<DeliveryLoginPage> {
               Padding(padding: EdgeInsets.all(10)),
               TextField(
                 decoration: InputDecoration(labelText: "Versie"),
-                keyboardType: TextInputType.number,
+                keyboardType: TextInputType.text,
                 controller: versionController,
-                inputFormatters: <TextInputFormatter>[
-                  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<SettingsPage> {
+  final versionController = TextEditingController();
+
   @override
   initState() {
     super.initState();
+
+    versionController.text = widget.settings.version;
   }
 
   Future<void> saveSettings() async {
@@ -45,6 +49,14 @@ class _SettingsPageState extends State<SettingsPage> {
                   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(
                   onPressed: () async => await saveSettings(),