Merge pull request #773 from wger-project/feature/improve-min-app-version

Refactor min app version handling

Author: rolandgeider

android/app/src/main/AndroidManifest.xml

@@ -29,10 +29,6 @@
         android:enableOnBackInvokedCallback="true"
         android:networkSecurityConfig="@xml/network_security_config">
 
-        <meta-data
-            android:name="wger.check_min_app_version"
-            android:value="true" />
-
         <activity
             android:name=".MainActivity"
             android:exported="true"

lib/helpers/consts.dart

@@ -31,9 +31,6 @@ const DEFAULT_SERVER_TEST = 'https://wger-master.rge.uber.space/';
 const TESTSERVER_USER_NAME = 'user';
 const TESTSERVER_PASSWORD = 'flutteruser';
 
-/// Keys used in the android manifest
-const MANIFEST_KEY_CHECK_UPDATE = 'wger.check_min_app_version';
-
 /// Default impression for a workout session (neutral)
 const DEFAULT_IMPRESSION = 2;
 

lib/main.dart

@@ -54,6 +54,7 @@ import 'package:wger/screens/routine_list_screen.dart';
 import 'package:wger/screens/routine_logs_screen.dart';
 import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/screens/splash_screen.dart';
+import 'package:wger/screens/update_app_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
 import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/about.dart';
@@ -82,11 +83,27 @@ void main() async {
   await PreferenceHelper.instance.migrationSupportFunctionForSharedPreferences();
 
   // Application
-  runApp(const riverpod.ProviderScope(child: MyApp()));
+  runApp(const riverpod.ProviderScope(child: MainApp()));
 }
 
-class MyApp extends StatelessWidget {
-  const MyApp();
+class MainApp extends StatelessWidget {
+  const MainApp();
+
+  Widget _getHomeScreen(AuthProvider auth) {
+    if (auth.state == AuthState.loggedIn) {
+      return HomeTabsScreen();
+    } else if (auth.state == AuthState.updateRequired) {
+      return const UpdateAppScreen();
+    } else {
+      return FutureBuilder(
+        future: auth.tryAutoLogin(),
+        builder: (ctx, authResultSnapshot) =>
+            authResultSnapshot.connectionState == ConnectionState.waiting
+                ? const SplashScreen()
+                : const AuthScreen(),
+      );
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -161,15 +178,7 @@ class MyApp extends StatelessWidget {
             highContrastTheme: wgerLightThemeHc,
             highContrastDarkTheme: wgerDarkThemeHc,
             themeMode: user.themeMode,
-            home: auth.isAuth
-                ? HomeTabsScreen()
-                : FutureBuilder(
-                    future: auth.tryAutoLogin(),
-                    builder: (ctx, authResultSnapshot) =>
-                        authResultSnapshot.connectionState == ConnectionState.waiting
-                            ? const SplashScreen()
-                            : const AuthScreen(),
-                  ),
+            home: _getHomeScreen(auth),
             routes: {
               DashboardScreen.routeName: (ctx) => const DashboardScreen(),
               FormScreen.routeName: (ctx) => const FormScreen(),

lib/models/exercises/exercise_api.dart

@@ -16,7 +16,7 @@ part 'exercise_api.g.dart';
 /// Basically this is just used as a convenience to create "real" exercise
 /// objects and nothing more
 @freezed
-class ExerciseApiData with _$ExerciseApiData {
+sealed class ExerciseApiData with _$ExerciseApiData {
   factory ExerciseApiData({
     required int id,
     required String uuid,
@@ -52,7 +52,7 @@ class ExerciseApiData with _$ExerciseApiData {
 /// Model for the search results returned from the /api/v2/exercise/search endpoint
 ///
 @freezed
-class ExerciseSearchDetails with _$ExerciseSearchDetails {
+sealed class ExerciseSearchDetails with _$ExerciseSearchDetails {
   factory ExerciseSearchDetails({
     // ignore: invalid_annotation_target
     @JsonKey(name: 'id') required int translationId,
@@ -70,7 +70,7 @@ class ExerciseSearchDetails with _$ExerciseSearchDetails {
 }
 
 @freezed
-class ExerciseSearchEntry with _$ExerciseSearchEntry {
+sealed class ExerciseSearchEntry with _$ExerciseSearchEntry {
   factory ExerciseSearchEntry({
     required String value,
     required ExerciseSearchDetails data,
@@ -81,7 +81,7 @@ class ExerciseSearchEntry with _$ExerciseSearchEntry {
 }
 
 @freezed
-class ExerciseApiSearch with _$ExerciseApiSearch {
+sealed class ExerciseApiSearch with _$ExerciseApiSearch {
   factory ExerciseApiSearch({
     required List<ExerciseSearchEntry> suggestions,
   }) = _ExerciseApiSearch;