Merge pull request #6 from Metatavu/feature-5-skip-updates

Added support for skipping updates
Metatavu · Apr 25, 2024 · 832fd72 · 832fd72
2 parents 8ad1ade + 06a99fd
commit 832fd72
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 13 deletions.
diff --git a/assets/l10n/fi-FI/localizations.json b/assets/l10n/fi-FI/localizations.json
@@ -4,6 +4,7 @@
   "updateAvailable": "Sovellukseen on saatavilla päivitys. Ole hyvä ja asenna päivitys painamalla alla olevaa painiketta.",
   "installUpdate": "Asenna päivitys",
   "installingUpdate": "Asennetaan päivitystä...",
+  "skipUpdate": "Ohita päivitys",
   "loginInstructions": "Aseta digikortti piirturiin ja paina \"Kirjaudu\".",
   "login": "Kirjaudu",
   "errors": {

diff --git a/lib/app/env.gen.dart b/lib/app/env.gen.dart
@@ -19,6 +19,9 @@ class Env {
 
   /// URL for app updates
   static const updatesUrl = String.fromEnvironment('UPDATES_URL');
+
+  /// Whether updates can be skipped
+  static const updatesSkippable = bool.fromEnvironment('UPDATES_SKIPPABLE');
 }
 
 
diff --git a/lib/views/login/login_screen.dart b/lib/views/login/login_screen.dart
@@ -5,6 +5,7 @@ import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:tms_api/tms_api.dart";
+import "package:vp_kuljetus_driver_app/app/env.gen.dart";
 import "package:vp_kuljetus_driver_app/providers/authentication/authentication_providers.dart";
 import "package:vp_kuljetus_driver_app/providers/trucks/trucks_providers.dart";
 import "package:vp_kuljetus_driver_app/services/localization/l10n.dart";
@@ -63,6 +64,11 @@ class LoginScreen extends HookConsumerWidget {
       }
     }
 
+    /// Skips the update
+    void skipUpdate() {
+      updateAvailable.value = false;
+    }
+
     Future<void> initLogin(final PublicTruck selectedTruck) async {
       try {
         await authNotifier.login(selectedTruck.id!);
@@ -81,10 +87,13 @@ class LoginScreen extends HookConsumerWidget {
       }
     }
 
-    useEffect(() {
-      checkUpdates();
-      return null;
-    }, [],);
+    useEffect(
+      () {
+        checkUpdates();
+        return null;
+      },
+      [],
+    );
 
     return Scaffold(
       resizeToAvoidBottomInset: false,
@@ -109,14 +118,44 @@ class LoginScreen extends HookConsumerWidget {
                               style: Theme.of(context).textTheme.bodyMedium,
                             ),
                             const SizedBox(height: 32),
-                            ElevatedButton(
-                              onPressed: !installingUpdate.value
-                                  ? installUpdate
-                                  : null,
-                              child: Text(l10n.t(installingUpdate.value
-                                  ? "installingUpdate"
-                                  : "installUpdate",),),
-                            ),
+                            Env.updatesSkippable
+                                ? Row(
+                                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                    children: [
+                                      ElevatedButton(
+                                        onPressed: !installingUpdate.value
+                                            ? installUpdate
+                                            : null,
+                                        child: Text(
+                                          l10n.t(
+                                            installingUpdate.value
+                                                ? "installingUpdate"
+                                                : "installUpdate",
+                                          ),
+                                        ),
+                                      ),
+                                      ElevatedButton(
+                                        onPressed: !installingUpdate.value
+                                          ? skipUpdate
+                                          : null,
+                                        child: Text(
+                                          l10n.t("skipUpdate"),
+                                        ),
+                                      ),
+                                    ],
+                                  )
+                                : ElevatedButton(
+                                    onPressed: !installingUpdate.value
+                                        ? installUpdate
+                                        : null,
+                                    child: Text(
+                                      l10n.t(
+                                        installingUpdate.value
+                                            ? "installingUpdate"
+                                            : "installUpdate",
+                                      ),
+                                    ),
+                                  ),
                           ],
                         )
                       : Column(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -99,4 +99,6 @@ dart_define:
     - name: KEYCLOAK_CLIENT_SECRET
       description: Keycloak client secret
     - name: UPDATES_URL
-      description: URL for app updates
+      description: URL for app updates
+    - name: UPDATES_SKIPPABLE
+      description: Whether updates can be skipped