Offline mode

.github/actions/flutter-common/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
-        flutter-version: 3.41.9
+        flutter-version: 3.44.0
         cache: true
 
     - name: Install Flutter dependencies

.github/workflows/build-linux.yml

@@ -61,7 +61,7 @@ jobs:
       - name: Build application for linux
         run: |
           sudo apt update
-          sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev --no-install-recommends
+          sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev libsecret-1-dev libjsoncpp-dev --no-install-recommends
           flutter build linux --release
           tar -zcvf linux-${{ matrix.platform }}.tar.gz build/linux/${{ matrix.platform }}/release/bundle
       - uses: actions/upload-artifact@v7
@@ -92,7 +92,7 @@ jobs:
           git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.14.1 ../flatpak-flutter
           pip install -r ../flatpak-flutter/requirements.txt
           python bump-versions.py ${{ inputs.ref }} ${{ needs.build_linux.outputs.flutter_sdk_version }}
-          ../flatpak-flutter/flatpak-flutter.py --app-module wger flatpak-flutter.json
+          ../flatpak-flutter/flatpak-flutter.py --app-module wger flatpak-flutter.yml
 
       - name: Push updated config to flathub repository
         env:

.github/workflows/screenshots.yml

@@ -20,12 +20,6 @@ jobs:
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common
 
-      - name: Install CocoaPods
-        run: |
-          cd ios
-          pod install || true
-          cd ..
-
       - name: Boot iOS simulator
         id: boot
         run: |

android/app/src/main/AndroidManifest.xml

@@ -49,6 +49,15 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <!-- Web-handoff deep link: the server redirects to wger://app-auth#token=…
+                 after a browser login; app_link_router consumes the URI. -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wger" android:host="app-auth" />
+            </intent-filter>
         </activity>
 
 

build.yaml

@@ -0,0 +1,6 @@
+targets:
+  $default:
+    builders:
+      drift_dev:
+        options:
+          store_date_time_values_as_text: true

devtools_options.yaml

@@ -1,3 +1,4 @@
 extensions:
   - drift: true
-  - provider: true
+  - provider: true
+  - shared_preferences: true

flatpak/de.wger.flutter.desktop

@@ -8,7 +8,8 @@ Comment=Fitness/workout, nutrition and weight tracker
 # HealthFitness;Exercise;Nutrition
 Categories=Education;Utility;Sports;
 Icon=de.wger.flutter
-Exec=wger
+Exec=wger %u
+MimeType=x-scheme-handler/wger;
 StartupWMClass=wger
 X-Purism-FormFactor=Workstation;Mobile;
 X-KDE-FormFactors=desktop;tablet;handset;mediacenter;

flatpak/de.wger.flutter.service

@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=de.wger.flutter
+Exec=/app/bin/wger --gapplication-service

integration_test/make_screenshots_test.dart

@@ -44,8 +44,7 @@ enum DeviceType {
   androidWear('wearScreenshots'),
 
   iOSPhoneBig('iPhone 6.9', isAndroid: false),
-  iOSPhoneSmall('iPhone 6.7', isAndroid: false)
-  ;
+  iOSPhoneSmall('iPhone 6.7', isAndroid: false);
 
   final String folderName;
   final bool isAndroid;

integration_test/screenshots_01_dashboard.dart

@@ -17,131 +17,112 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/models/workouts/session.dart';
-import 'package:wger/providers/auth.dart';
-import 'package:wger/providers/body_weight.dart';
-import 'package:wger/providers/exercises.dart';
-import 'package:wger/providers/gallery.dart';
-import 'package:wger/providers/measurement.dart';
-import 'package:wger/providers/nutrition.dart';
-import 'package:wger/providers/routines.dart';
-import 'package:wger/providers/user.dart';
+import 'package:wger/models/measurements/measurement_category.dart';
+import 'package:wger/providers/auth_notifier.dart';
+import 'package:wger/providers/auth_state.dart';
+import 'package:wger/providers/body_weight_repository.dart';
+import 'package:wger/providers/gallery_repository.dart';
+import 'package:wger/providers/ingredient_repository.dart';
+import 'package:wger/providers/measurement_repository.dart';
+import 'package:wger/providers/nutrition_notifier.dart';
+import 'package:wger/providers/nutrition_repository.dart';
+import 'package:wger/providers/routines_notifier.dart';
+import 'package:wger/providers/user_profile_repository.dart';
 import 'package:wger/screens/home_tabs_screen.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../test/exercises/contribute_exercise_test.mocks.dart';
 import '../test/gallery/gallery_form_test.mocks.dart';
 import '../test/measurements/measurement_categories_screen_test.mocks.dart';
 import '../test/nutrition/nutritional_plan_screen_test.mocks.dart';
-import '../test/routine/weight_unit_form_widget_test.mocks.dart';
 import '../test/weight/weight_screen_test.mocks.dart' as weight;
 import '../test_data/body_weight.dart';
 import '../test_data/exercises.dart';
+import '../test_data/gallery.dart';
 import '../test_data/measurements.dart';
 import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
 import '../test_data/routines.dart';
 
-Widget createDashboardScreen({Locale? locale}) {
-  locale ??= const Locale('en');
+class _FakeAuthNotifier extends AuthNotifier {
+  _FakeAuthNotifier(this._state);
 
-  final mockGalleryProvider = MockGalleryProvider();
+  final AuthState _state;
 
-  final mockExercisesProvider = MockExercisesProvider();
+  @override
+  Future<AuthState> build() async => _state;
+}
 
-  final mockAuthProvider = MockAuthProvider();
-  when(mockAuthProvider.setServerVersion()).thenAnswer((_) async {});
-  when(mockAuthProvider.dataInit).thenReturn(true);
+Widget createDashboardScreen({Locale? locale}) {
+  locale ??= const Locale('en');
 
-  final mockWorkoutProvider = MockRoutinesProvider();
-  when(mockWorkoutProvider.items).thenReturn([getTestRoutine(exercises: getScreenshotExercises())]);
-  when(
-    mockWorkoutProvider.currentRoutine,
-  ).thenReturn(getTestRoutine(exercises: getScreenshotExercises()));
+  final mockGalleryRepo = MockGalleryRepository();
+  when(mockGalleryRepo.watchAllDrift()).thenAnswer((_) => Stream.value(getTestImages()));
 
-  when(mockWorkoutProvider.fetchSessionData()).thenAnswer(
-    (a) => Future.value([
-      WorkoutSession(
-        routineId: 1,
-        date: DateTime.now().add(const Duration(days: -1)),
-        timeStart: const TimeOfDay(hour: 17, minute: 34),
-        timeEnd: const TimeOfDay(hour: 19, minute: 3),
-        impression: 3,
-      ),
-    ]),
-  );
+  final mockNutritionRepo = weight.MockNutritionRepository();
+  final mockIngredientRepo = weight.MockIngredientRepository();
+  when(mockIngredientRepo.getById(any)).thenAnswer((_) async => null);
 
-  final mockNutritionProvider = weight.MockNutritionPlansProvider();
+  final mockBodyWeightRepository = MockBodyWeightRepository();
+  when(
+    mockBodyWeightRepository.watchAllDrift(),
+  ).thenAnswer((_) => Stream.value(getWeightEntries()));
 
+  final mockMeasurementRepo = MockMeasurementRepository();
   when(
-    mockNutritionProvider.currentPlan,
-  ).thenAnswer((realInvocation) => getNutritionalPlanScreenshot());
-  when(mockNutritionProvider.items).thenReturn([getNutritionalPlanScreenshot()]);
+    mockMeasurementRepo.watchAll(),
+  ).thenAnswer((_) => Stream<List<MeasurementCategory>>.value(getMeasurementCategories()));
 
-  final mockWeightProvider = weight.MockBodyWeightProvider();
-  when(mockWeightProvider.items).thenReturn(getScreenshotWeightEntries());
+  final mockUserProfileRepo = weight.MockUserProfileRepository();
+  when(
+    mockUserProfileRepo.watchDrift(),
+  ).thenAnswer((_) => Stream.value(tUserProfile1));
 
-  final mockMeasurementProvider = MockMeasurementProvider();
-  when(mockMeasurementProvider.categories).thenReturn(getMeasurementCategories());
+  const loggedInAuth = AuthState(
+    status: AuthStatus.loggedIn,
+    credential: LegacyCredential('test-token'),
+    serverUrl: 'http://localhost',
+  );
+  final container = ProviderContainer.test(
+    overrides: [
+      bodyWeightRepositoryProvider.overrideWithValue(mockBodyWeightRepository),
+      measurementRepositoryProvider.overrideWithValue(mockMeasurementRepo),
+      authProvider.overrideWith(() => _FakeAuthNotifier(loggedInAuth)),
+      userProfileRepositoryProvider.overrideWithValue(mockUserProfileRepo),
+      nutritionRepositoryProvider.overrideWithValue(mockNutritionRepo),
+      ingredientRepositoryProvider.overrideWithValue(mockIngredientRepo),
+      galleryRepositoryProvider.overrideWithValue(mockGalleryRepo),
+    ],
+  );
+  container.read(routinesRiverpodProvider.notifier).state = AsyncData(
+    RoutinesState(
+      routines: [getTestRoutine(exercises: getScreenshotExercises())],
+    ),
+  );
 
-  final mockUserProvider = MockUserProvider();
-  when(mockUserProvider.profile).thenReturn(tProfile1);
-  when(mockUserProvider.dashboardWidgets).thenReturn([
-    DashboardWidget.routines,
-    DashboardWidget.weight,
-    DashboardWidget.measurements,
-    DashboardWidget.calendar,
-    DashboardWidget.nutrition,
-    DashboardWidget.trophies,
-  ]);
+  // Seed the nutrition notifier with the screenshot plan so the dashboard can
+  // show it without going through the server.
+  container.read(nutritionProvider.notifier).state = AsyncData(
+    NutritionState(plans: [getNutritionalPlanScreenshot()]),
+  );
 
-  return riverpod.ProviderScope(
-    child: MediaQuery(
-      data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first)
-          .copyWith(
-            padding: EdgeInsets.zero,
-            viewPadding: EdgeInsets.zero,
-            viewInsets: EdgeInsets.zero,
-          ),
-      child: MultiProvider(
-        providers: [
-          ChangeNotifierProvider<GalleryProvider>(
-            create: (context) => mockGalleryProvider,
-          ),
-          ChangeNotifierProvider<ExercisesProvider>(
-            create: (context) => mockExercisesProvider,
-          ),
-          ChangeNotifierProvider<AuthProvider>(
-            create: (context) => mockAuthProvider,
-          ),
-          ChangeNotifierProvider<UserProvider>(
-            create: (context) => mockUserProvider,
-          ),
-          ChangeNotifierProvider<RoutinesProvider>(
-            create: (context) => mockWorkoutProvider,
-          ),
-          ChangeNotifierProvider<NutritionPlansProvider>(
-            create: (context) => mockNutritionProvider,
-          ),
-          ChangeNotifierProvider<BodyWeightProvider>(
-            create: (context) => mockWeightProvider,
-          ),
-          ChangeNotifierProvider<MeasurementProvider>(
-            create: (context) => mockMeasurementProvider,
-          ),
-        ],
-        child: MaterialApp(
-          locale: locale,
-          debugShowCheckedModeBanner: false,
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
-          supportedLocales: AppLocalizations.supportedLocales,
-          theme: wgerLightTheme,
-          home: HomeTabsScreen(),
-        ),
+  return MediaQuery(
+    data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first).copyWith(
+      padding: EdgeInsets.zero,
+      viewPadding: EdgeInsets.zero,
+      viewInsets: EdgeInsets.zero,
+    ),
+    child: UncontrolledProviderScope(
+      container: container,
+      child: MaterialApp(
+        locale: locale,
+        debugShowCheckedModeBanner: false,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        theme: wgerLightTheme,
+        home: HomeTabsScreen(),
       ),
     ),
   );

integration_test/screenshots_02_workout.dart

@@ -17,37 +17,35 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:mockito/mockito.dart';
-import 'package:provider/provider.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart' as riverpod;
 import 'package:wger/l10n/generated/app_localizations.dart';
-import 'package:wger/providers/routines.dart';
+import 'package:wger/providers/routines_notifier.dart';
 import 'package:wger/screens/routine_screen.dart';
 import 'package:wger/theme/theme.dart';
 
-import '../test/routine/routine_form_test.mocks.dart';
 import '../test_data/exercises.dart';
 import '../test_data/routines.dart';
 
 Widget createWorkoutDetailScreen({Locale? locale}) {
   locale ??= const Locale('en');
   final key = GlobalKey<NavigatorState>();
 
-  final mockRoutinesProvider = MockRoutinesProvider();
   final routine = getTestRoutine(exercises: getScreenshotExercises());
-  when(mockRoutinesProvider.findById(1)).thenReturn(routine);
+  final container = riverpod.ProviderContainer.test();
+  container.read(routinesRiverpodProvider.notifier).state = riverpod.AsyncData(
+    RoutinesState(
+      routines: [getTestRoutine(exercises: getScreenshotExercises())],
+    ),
+  );
 
   return MediaQuery(
     data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first).copyWith(
       padding: EdgeInsets.zero,
       viewPadding: EdgeInsets.zero,
       viewInsets: EdgeInsets.zero,
     ),
-    child: MultiProvider(
-      providers: [
-        ChangeNotifierProvider<RoutinesProvider>(
-          create: (context) => mockRoutinesProvider,
-        ),
-      ],
+    child: riverpod.UncontrolledProviderScope(
+      container: container,
       child: MaterialApp(
         locale: locale,
         debugShowCheckedModeBanner: false,