Allow resetting the ingredient cache from the settings page

rolandgeider · rolandgeider · commit 72a68b4f5919 · 2024-09-29T11:25:14.000+02:00
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
@@ -820,8 +820,8 @@
   "@images": {},
   "language": "Llenguatge",
   "@language": {},
-  "settingsCacheDescription": "Caché d'exercicis",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Caché d'exercicis",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Caché esborrada correctament",
   "@settingsCacheDeletedSnackbar": {},
   "aboutPageTitle": "Sobre Wger",
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
@@ -627,8 +627,8 @@
   "@settingsTitle": {},
   "settingsCacheTitle": "Mezipaměť",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Mezipaměť cvičení",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Mezipaměť cvičení",
+  "@settingsExerciseCacheDescription": {},
   "noMatchingExerciseFound": "Nenalezeny žádné odpovídající tréninky",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -781,8 +781,8 @@
   "@aboutDonateText": {},
   "settingsCacheTitle": "Zwischenspeicher",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Übungs-Zwischenspeicher",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Übungs-Zwischenspeicher",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Zwischenspeicher erfolgreich gelöscht",
   "@settingsCacheDeletedSnackbar": {},
   "lb": "lb",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -690,7 +690,8 @@
   },
   "settingsTitle": "Settings",
   "settingsCacheTitle": "Cache",
-  "settingsCacheDescription": "Exercise cache",
+  "settingsExerciseCacheDescription": "Exercise cache",
+  "settingsIngredientCacheDescription": "Ingredient cache",
   "settingsCacheDeletedSnackbar": "Cache successfully cleared",
   "aboutPageTitle": "About Wger",
   "contributeExerciseWarning": "You can only contribute exercises if your account is older than {days} days and have verified your email",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
@@ -782,8 +782,8 @@
   "@aboutMastodonText": {
     "description": "Text for the mastodon section in the about dialog"
   },
-  "settingsCacheDescription": "Cache de ejercicios",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Cache de ejercicios",
+  "@settingsExerciseCacheDescription": {},
   "aboutDonateTitle": "Donar",
   "@aboutDonateTitle": {},
   "aboutDonateText": "Invítanos un café para ayudar al proyecto, cubrir los costos del servidor y mantenernos activos",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
@@ -844,8 +844,8 @@
   "@settingsTitle": {},
   "settingsCacheTitle": "Cache",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Cache d'exercices",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Cache d'exercices",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Cache nettoyé avec succès",
   "@settingsCacheDeletedSnackbar": {},
   "log": "Journaliser",
diff --git a/lib/l10n/app_hr.arb b/lib/l10n/app_hr.arb
@@ -832,8 +832,8 @@
   "@settingsTitle": {},
   "settingsCacheTitle": "Predmemorija",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Izvrši predmemoriju",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Izvrši predmemoriju",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Predmemorija je uspješno izbrisana",
   "@settingsCacheDeletedSnackbar": {},
   "useMetric": "Koristi metričke jedinice za tjelesnu težinu",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
@@ -848,8 +848,8 @@
   "@settingsTitle": {},
   "settingsCacheTitle": "Cache",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Cache degli esercizi",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Cache degli esercizi",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Cache svuotata con successo",
   "@settingsCacheDeletedSnackbar": {},
   "done": "Fatto",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -587,8 +587,8 @@
   "@bench": {
     "description": "Generated entry for translation for server strings"
   },
-  "settingsCacheDescription": "エクササイズキャッシュ",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "エクササイズキャッシュ",
+  "@settingsExerciseCacheDescription": {},
   "settingsTitle": "設定",
   "@settingsTitle": {},
   "settingsCacheTitle": "キャッシュ",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
@@ -724,8 +724,8 @@
   "@settingsTitle": {},
   "settingsCacheDeletedSnackbar": "Pamięć podręczna pomyślnie została wyczyszczona",
   "@settingsCacheDeletedSnackbar": {},
-  "settingsCacheDescription": "Pamięć podręczna ćwiczeń",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Pamięć podręczna ćwiczeń",
+  "@settingsExerciseCacheDescription": {},
   "log": "Zarejestruj",
   "@log": {
     "description": "Log a specific meal (imperative form)"
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
@@ -754,8 +754,8 @@
   },
   "settingsCacheTitle": "Cache",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Cache do exercício",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Cache do exercício",
+  "@settingsExerciseCacheDescription": {},
   "useMetric": "Use unidades métricas para o peso corpora",
   "@useMetric": {},
   "settingsTitle": "Configurações",
diff --git a/lib/l10n/app_pt_BR.arb b/lib/l10n/app_pt_BR.arb
@@ -620,8 +620,8 @@
   "@next": {},
   "settingsCacheTitle": "Cache",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Cache do exercício",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Cache do exercício",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Cache limpa com sucesso",
   "@settingsCacheDeletedSnackbar": {},
   "translateExercise": "Traduza este exercício agora",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
@@ -822,8 +822,8 @@
   "@verify": {},
   "settingsCacheTitle": "Кэш",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "Кэш упражнений",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Кэш упражнений",
+  "@settingsExerciseCacheDescription": {},
   "noMatchingExerciseFound": "Не выбрано упражнение для замены",
   "@noMatchingExerciseFound": {
     "description": "Message returned if no exercises match the searched string"
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
@@ -772,8 +772,8 @@
   "@aboutDonateTitle": {},
   "aboutDonateText": "Projeye yardımcı olmak, sunucu masraflarını karşılamak ve geliştirmeyi desteklemek için bağış yapın",
   "@aboutDonateText": {},
-  "settingsCacheDescription": "Egzersiz önbelleği",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "Egzersiz önbelleği",
+  "@settingsExerciseCacheDescription": {},
   "settingsCacheDeletedSnackbar": "Önbellek başarıyla temizlendi",
   "@settingsCacheDeletedSnackbar": {},
   "log": "Kaydet",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
@@ -675,8 +675,8 @@
   "@settingsTitle": {},
   "settingsCacheTitle": "緩存",
   "@settingsCacheTitle": {},
-  "settingsCacheDescription": "訓練緩存",
-  "@settingsCacheDescription": {},
+  "settingsExerciseCacheDescription": "訓練緩存",
+  "@settingsExerciseCacheDescription": {},
   "gValue": "{value} 克",
   "@gValue": {
     "description": "A value in grams, e.g. 5 g",
diff --git a/lib/widgets/core/settings.dart b/lib/widgets/core/settings.dart
@@ -21,20 +21,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/nutrition.dart';
 
-class SettingsPage extends StatefulWidget {
+class SettingsPage extends StatelessWidget {
   static String routeName = '/SettingsPage';
 
   const SettingsPage({super.key});
 
-  @override
-  State<SettingsPage> createState() => _SettingsPageState();
-}
-
-class _SettingsPageState extends State<SettingsPage> {
   @override
   Widget build(BuildContext context) {
     final exerciseProvider = Provider.of<ExercisesProvider>(context, listen: false);
+    final nutritionProvider = Provider.of<NutritionPlansProvider>(context, listen: false);
 
     return Scaffold(
       appBar: AppBar(
@@ -43,11 +40,9 @@ class _SettingsPageState extends State<SettingsPage> {
       body: ListView(
         children: [
           ListTile(
-            // leading: const Icon(Icons.cached),
-            title: Text(AppLocalizations.of(context).settingsCacheTitle),
-            subtitle: Text(AppLocalizations.of(context).settingsCacheDescription),
+            title: Text(AppLocalizations.of(context).settingsExerciseCacheDescription),
             trailing: IconButton(
-              key: const ValueKey('cacheIcon'),
+              key: const ValueKey('cacheIconExercises'),
               icon: const Icon(Icons.delete),
               onPressed: () async {
                 await exerciseProvider.clearAllCachesAndPrefs();
@@ -57,8 +52,24 @@ class _SettingsPageState extends State<SettingsPage> {
                     content: Text(AppLocalizations.of(context).settingsCacheDeletedSnackbar),
                   );
 
-                  // Find the ScaffoldMessenger in the widget tree
-                  // and use it to show a SnackBar.
+                  ScaffoldMessenger.of(context).showSnackBar(snackBar);
+                }
+              },
+            ),
+          ),
+          ListTile(
+            title: Text(AppLocalizations.of(context).settingsIngredientCacheDescription),
+            trailing: IconButton(
+              key: const ValueKey('cacheIconIngredients'),
+              icon: const Icon(Icons.delete),
+              onPressed: () async {
+                await nutritionProvider.clearIngredientCaches();
+
+                if (context.mounted) {
+                  final snackBar = SnackBar(
+                    content: Text(AppLocalizations.of(context).settingsCacheDeletedSnackbar),
+                  );
+
                   ScaffoldMessenger.of(context).showSnackBar(snackBar);
                 }
               },
diff --git a/test/core/settings_test.dart b/test/core/settings_test.dart
@@ -23,17 +23,22 @@ import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/providers/exercises.dart';
+import 'package:wger/providers/nutrition.dart';
 import 'package:wger/widgets/core/settings.dart';
 
 import 'settings_test.mocks.dart';
 
-@GenerateMocks([ExercisesProvider])
+@GenerateMocks([ExercisesProvider, NutritionPlansProvider])
 void main() {
   final mockExerciseProvider = MockExercisesProvider();
+  final mockNutritionProvider = MockNutritionPlansProvider();
 
   Widget createSettingsScreen({locale = 'en'}) {
-    return ChangeNotifierProvider<ExercisesProvider>(
-      create: (context) => mockExerciseProvider,
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider<NutritionPlansProvider>(create: (context) => mockNutritionProvider),
+        ChangeNotifierProvider<ExercisesProvider>(create: (context) => mockExerciseProvider),
+      ],
       child: MaterialApp(
         locale: Locale(locale),
         localizationsDelegates: AppLocalizations.localizationsDelegates,
@@ -44,12 +49,20 @@ void main() {
   }
 
   group('Cache', () {
-    testWidgets('Test the widgets on the gym mode screen', (WidgetTester tester) async {
+    testWidgets('Test resetting the exercise cache', (WidgetTester tester) async {
       await tester.pumpWidget(createSettingsScreen());
-      await tester.tap(find.byKey(const ValueKey('cacheIcon')));
+      await tester.tap(find.byKey(const ValueKey('cacheIconExercises')));
       await tester.pumpAndSettle();
 
       verify(mockExerciseProvider.clearAllCachesAndPrefs());
     });
+
+    testWidgets('Test resetting the ingredient cache', (WidgetTester tester) async {
+      await tester.pumpWidget(createSettingsScreen());
+      await tester.tap(find.byKey(const ValueKey('cacheIconIngredients')));
+      await tester.pumpAndSettle();
+
+      verify(mockNutritionProvider.clearIngredientCaches());
+    });
   });
 }
diff --git a/test/core/settings_test.mocks.dart b/test/core/settings_test.mocks.dart
diff --git a/test/exercises/exercise_provider_db_test.dart b/test/exercises/exercise_provider_db_test.dart
diff --git a/test/nutrition/nutrition_provider_test.dart b/test/nutrition/nutrition_provider_test.dart
