Weight + Measurement Widget Redesign

integration_test/6_weight.dart

@@ -3,16 +3,14 @@ import 'package:mockito/mockito.dart';
 import 'package:provider/provider.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/body_weight.dart';
-import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/user.dart';
-import 'package:wger/screens/form_screen.dart';
-import 'package:wger/screens/weight_screen.dart';
 import 'package:wger/theme/theme.dart';
+import 'package:wger/widgets/dashboard/widgets/weight.dart';
 
 import '../test/utils.dart';
-import '../test/weight/weight_screen_test.mocks.dart';
+import '../test/weight/weight_entries_modal_test.mocks.dart';
+import '../test/weight/weight_provider_test.mocks.dart';
 import '../test_data/body_weight.dart';
-import '../test_data/nutritional_plans.dart';
 import '../test_data/profile.dart';
 
 Widget createWeightScreen({Locale? locale}) {
@@ -23,10 +21,6 @@ Widget createWeightScreen({Locale? locale}) {
   final mockUserProvider = MockUserProvider();
   when(mockUserProvider.profile).thenReturn(tProfile1);
 
-  final mockNutritionPlansProvider = MockNutritionPlansProvider();
-  when(mockNutritionPlansProvider.currentPlan).thenReturn(null);
-  when(mockNutritionPlansProvider.items).thenReturn([getNutritionalPlan()]);
-
   return MediaQuery(
     data: MediaQueryData.fromView(WidgetsBinding.instance.platformDispatcher.views.first).copyWith(
       padding: EdgeInsets.zero,
@@ -41,18 +35,18 @@ Widget createWeightScreen({Locale? locale}) {
         ChangeNotifierProvider<BodyWeightProvider>(
           create: (context) => weightProvider,
         ),
-        ChangeNotifierProvider<NutritionPlansProvider>(
-          create: (context) => mockNutritionPlansProvider,
-        ),
       ],
       child: MaterialApp(
         locale: locale,
         debugShowCheckedModeBanner: false,
         localizationsDelegates: AppLocalizations.localizationsDelegates,
         supportedLocales: AppLocalizations.supportedLocales,
         theme: wgerLightTheme,
-        home: const WeightScreen(),
-        routes: {FormScreen.routeName: (ctx) => const FormScreen()},
+        home: const Scaffold(
+          body: SingleChildScrollView(
+            child: DashboardWeightWidget(),
+          ),
+        ),
       ),
     ),
   );

lib/l10n/app_de.arb

@@ -1187,5 +1187,19 @@
         }
     },
     "superset": "Superset",
-    "@superset": {}
+    "@superset": {},
+    "entries": "Einträge",
+    "@entries": {},
+    "week": "Woche",
+    "@week": {},
+    "month": "Monat",
+    "@month": {},
+    "sixMonths": "6 Monate",
+    "@sixMonths": {},
+    "year": "Jahr",
+    "@year": {},
+    "recentEntries": "Letzte Einträge",
+    "@recentEntries": {},
+    "seeAll": "Alle anzeigen",
+    "@seeAll": {}
 }

lib/l10n/app_en.arb

@@ -431,6 +431,10 @@
   "@measurementCategoriesHelpText": {},
   "measurementEntriesHelpText": "The unit used to measure the category such as 'cm' or '%'",
   "@measurementEntriesHelpText": {},
+  "entries": "entries",
+  "@entries": {
+    "description": "Plural form of entry, used to show count of measurement entries"
+  },
   "date": "Date",
   "@date": {
     "description": "The date of a workout log or body weight entry"
@@ -1114,5 +1118,29 @@
   "themeMode": "Theme mode",
   "darkMode": "Always dark mode",
   "lightMode": "Always light mode",
-  "systemMode": "System settings"
+  "systemMode": "System settings",
+  "week": "Week",
+  "@week": {
+    "description": "Time range option for one week"
+  },
+  "month": "Month",
+  "@month": {
+    "description": "Time range option for one month"
+  },
+  "sixMonths": "6M",
+  "@sixMonths": {
+    "description": "Time range option for six months"
+  },
+  "year": "Year",
+  "@year": {
+    "description": "Time range option for one year"
+  },
+  "all": "All",
+  "@all": {
+    "description": "Time range option for all-time data"
+  },
+  "recentEntries": "Recent entries",
+  "@recentEntries": {},
+  "seeAll": "See all",
+  "@seeAll": {}
 }

lib/l10n/app_es.arb

@@ -1114,5 +1114,19 @@
                 "type": "String"
             }
         }
-    }
+    },
+    "entries": "entradas",
+    "@entries": {},
+    "week": "Semana",
+    "@week": {},
+    "month": "Mes",
+    "@month": {},
+    "sixMonths": "6 Meses",
+    "@sixMonths": {},
+    "year": "Año",
+    "@year": {},
+    "recentEntries": "Entradas recientes",
+    "@recentEntries": {},
+    "seeAll": "Ver todos",
+    "@seeAll": {}
 }

lib/l10n/app_fr.arb

@@ -1184,5 +1184,19 @@
         }
     },
     "superset": "Superset",
-    "@superset": {}
+    "@superset": {},
+    "entries": "entrées",
+    "@entries": {},
+    "week": "Semaine",
+    "@week": {},
+    "month": "Mois",
+    "@month": {},
+    "sixMonths": "6 Mois",
+    "@sixMonths": {},
+    "year": "Année",
+    "@year": {},
+    "recentEntries": "Entrées récentes",
+    "@recentEntries": {},
+    "seeAll": "Voir tout",
+    "@seeAll": {}
 }

lib/l10n/app_pl.arb

@@ -1012,5 +1012,19 @@
     "systemMode": "Ustawienia systemu",
     "@systemMode": {},
     "fitInWeek": "Dopasuj w tygodniu",
-    "@fitInWeek": {}
+    "@fitInWeek": {},
+    "entries": "wpisy",
+    "@entries": {},
+    "week": "Tydzień",
+    "@week": {},
+    "month": "Miesiąc",
+    "@month": {},
+    "sixMonths": "6 miesięcy",
+    "@sixMonths": {},
+    "year": "Rok",
+    "@year": {},
+    "recentEntries": "Ostatnie wpisy",
+    "@recentEntries": {},
+    "seeAll": "Zobacz wszystkie",
+    "@seeAll": {}
 }

lib/l10n/app_pt.arb

@@ -1032,5 +1032,19 @@
     "identicalExercisePleaseDiscard": "Se encontrares um exercício igual ao que estás a introduzir, por favor descarta o teu rascunho e edita antes esse exercício.",
     "@identicalExercisePleaseDiscard": {},
     "overview": "Panorama",
-    "@overview": {}
+    "@overview": {},
+    "entries": "entradas",
+    "@entries": {},
+    "week": "Semana",
+    "@week": {},
+    "month": "Mês",
+    "@month": {},
+    "sixMonths": "6 Meses",
+    "@sixMonths": {},
+    "year": "Ano",
+    "@year": {},
+    "recentEntries": "Entradas recentes",
+    "@recentEntries": {},
+    "seeAll": "Ver todos",
+    "@seeAll": {}
 }

lib/main.dart

@@ -48,7 +48,6 @@ import 'package:wger/screens/home_tabs_screen.dart';
 import 'package:wger/screens/log_meal_screen.dart';
 import 'package:wger/screens/log_meals_screen.dart';
 import 'package:wger/screens/measurement_categories_screen.dart';
-import 'package:wger/screens/measurement_entries_screen.dart';
 import 'package:wger/screens/nutritional_diary_screen.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/screens/nutritional_plans_screen.dart';
@@ -58,7 +57,6 @@ 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';
 import 'package:wger/widgets/core/log_overview.dart';
@@ -234,13 +232,11 @@ class MainApp extends StatelessWidget {
               GymModeScreen.routeName: (ctx) => const GymModeScreen(),
               HomeTabsScreen.routeName: (ctx) => HomeTabsScreen(),
               MeasurementCategoriesScreen.routeName: (ctx) => const MeasurementCategoriesScreen(),
-              MeasurementEntriesScreen.routeName: (ctx) => const MeasurementEntriesScreen(),
               NutritionalPlansScreen.routeName: (ctx) => const NutritionalPlansScreen(),
               NutritionalDiaryScreen.routeName: (ctx) => const NutritionalDiaryScreen(),
               NutritionalPlanScreen.routeName: (ctx) => const NutritionalPlanScreen(),
               LogMealsScreen.routeName: (ctx) => const LogMealsScreen(),
               LogMealScreen.routeName: (ctx) => const LogMealScreen(),
-              WeightScreen.routeName: (ctx) => const WeightScreen(),
               RoutineScreen.routeName: (ctx) => const RoutineScreen(),
               RoutineEditScreen.routeName: (ctx) => const RoutineEditScreen(),
               WorkoutLogsScreen.routeName: (ctx) => const WorkoutLogsScreen(),

lib/screens/home_tabs_screen.dart

@@ -17,7 +17,6 @@
  */
 
 import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:logging/logging.dart';
 import 'package:provider/provider.dart';
 import 'package:rive/rive.dart';
@@ -35,7 +34,6 @@ import 'package:wger/screens/dashboard.dart';
 import 'package:wger/screens/gallery_screen.dart';
 import 'package:wger/screens/nutritional_plans_screen.dart';
 import 'package:wger/screens/routine_list_screen.dart';
-import 'package:wger/screens/weight_screen.dart';
 
 class HomeTabsScreen extends StatefulWidget {
   final _logger = Logger('HomeTabsScreen');
@@ -79,7 +77,6 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
     const DashboardScreen(),
     const RoutineListScreen(),
     const NutritionalPlansScreen(),
-    const WeightScreen(),
     const GalleryScreen(),
   ];
 
@@ -164,10 +161,6 @@ class _HomeTabsScreenState extends State<HomeTabsScreen> with SingleTickerProvid
         icon: const Icon(Icons.restaurant),
         label: AppLocalizations.of(context).labelBottomNavNutrition,
       ),
-      NavigationDestination(
-        icon: const FaIcon(FontAwesomeIcons.weightScale, size: 20),
-        label: AppLocalizations.of(context).weight,
-      ),
       NavigationDestination(
         icon: const Icon(Icons.photo_library),
         label: AppLocalizations.of(context).gallery,

lib/screens/measurement_categories_screen.dart

@@ -21,35 +21,49 @@ import 'package:provider/provider.dart';
 import 'package:wger/core/wide_screen_wrapper.dart';
 import 'package:wger/l10n/generated/app_localizations.dart';
 import 'package:wger/providers/measurement.dart';
-import 'package:wger/screens/form_screen.dart';
+import 'package:wger/widgets/core/time_range_tab_bar.dart';
 import 'package:wger/widgets/measurements/categories.dart';
-import 'package:wger/widgets/measurements/forms.dart';
+import 'package:wger/widgets/measurements/charts.dart';
+import 'package:wger/widgets/measurements/edit_modals.dart';
 
-class MeasurementCategoriesScreen extends StatelessWidget {
+class MeasurementCategoriesScreen extends StatefulWidget {
   const MeasurementCategoriesScreen();
 
   static const routeName = '/measurement-categories';
 
+  @override
+  State<MeasurementCategoriesScreen> createState() => _MeasurementCategoriesScreenState();
+}
+
+class _MeasurementCategoriesScreenState extends State<MeasurementCategoriesScreen> {
+  ChartTimeRange _selectedRange = ChartTimeRange.month;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context).measurements)),
       floatingActionButton: FloatingActionButton(
         child: const Icon(Icons.add, color: Colors.white),
-        onPressed: () {
-          Navigator.pushNamed(
-            context,
-            FormScreen.routeName,
-            arguments: FormScreenArguments(
-              AppLocalizations.of(context).newEntry,
-              MeasurementCategoryForm(),
-            ),
-          );
-        },
+        onPressed: () => showEditCategoryModal(context, null),
       ),
       body: WidescreenWrapper(
         child: Consumer<MeasurementProvider>(
-          builder: (context, provider, child) => const CategoriesList(),
+          builder: (context, provider, child) => Column(
+            children: [
+              // Time range tabs
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 12, 16, 8),
+                child: TimeRangeTabBar(
+                  selectedRange: _selectedRange,
+                  onRangeChanged: (range) => setState(() => _selectedRange = range),
+                ),
+              ),
+              // Categories list
+              Expanded(
+                child: CategoriesList(timeRange: _selectedRange),
+              ),
+            ],
+          ),
         ),
       ),
     );