addded measurements to dashboard, categories card refactor

lib/l10n/app_en.arb

@@ -396,6 +396,14 @@
   "@noWeightEntries": {
     "description": "Message shown when the user has no logged weight entries"
   },
+  "noMeasurementEntries": "You have no measurement entries",
+    "@noMeasurementntries": {
+      "description": "Message shown when the user has no logged measurement entries"
+    },
+  "moreMeasurementEntries": "Add new measurement",
+     "@moreMeasurementEntries": {
+       "description": "Message shown when the user wants to add new measurement"
+     },
   "edit": "Edit",
   "@edit": {},
   "loadingText": "Loading...",

lib/screens/dashboard.dart

@@ -41,6 +41,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
             DashboardWorkoutWidget(),
             DashboardNutritionWidget(),
             DashboardWeightWidget(),
+            DashboardMeasurementWidget(),
             const DashboardCalendarWidget(),
           ],
         ),

lib/widgets/dashboard/widgets.dart

@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -25,16 +26,20 @@ import 'package:provider/provider.dart';
 import 'package:wger/models/nutrition/nutritional_plan.dart';
 import 'package:wger/models/workouts/workout_plan.dart';
 import 'package:wger/providers/body_weight.dart';
+import 'package:wger/providers/measurement.dart';
 import 'package:wger/providers/nutrition.dart';
 import 'package:wger/providers/workout_plans.dart';
 import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/gym_mode.dart';
+import 'package:wger/screens/measurement_categories_screen.dart';
 import 'package:wger/screens/nutritional_plan_screen.dart';
 import 'package:wger/screens/weight_screen.dart';
 import 'package:wger/screens/workout_plan_screen.dart';
 import 'package:wger/theme/theme.dart';
 import 'package:wger/widgets/core/charts.dart';
 import 'package:wger/widgets/core/core.dart';
+import 'package:wger/widgets/measurements/categories_card.dart';
+import 'package:wger/widgets/measurements/forms.dart';
 import 'package:wger/widgets/nutrition/charts.dart';
 import 'package:wger/widgets/nutrition/forms.dart';
 import 'package:wger/widgets/weight/forms.dart';
@@ -253,22 +258,9 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
                 style: Theme.of(context).textTheme.headline4,
               ),
               leading: const FaIcon(
-                FontAwesomeIcons.weightScale,
+                FontAwesomeIcons.weight,
                 color: Colors.black,
               ),
-              trailing: IconButton(
-                icon: const Icon(Icons.add),
-                onPressed: () async {
-                  Navigator.pushNamed(
-                    context,
-                    FormScreen.routeName,
-                    arguments: FormScreenArguments(
-                      AppLocalizations.of(context).newEntry,
-                      WeightForm(),
-                    ),
-                  );
-                },
-              ),
             ),
             Column(
               children: [
@@ -283,13 +275,26 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
                             .toList()),
                       ),
                       Row(
-                        mainAxisAlignment: MainAxisAlignment.end,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: <Widget>[
                           TextButton(
                               child: Text(AppLocalizations.of(context).goToDetailPage),
                               onPressed: () {
                                 Navigator.of(context).pushNamed(WeightScreen.routeName);
                               }),
+                          IconButton(
+                            icon: const Icon(Icons.add),
+                            onPressed: () async {
+                              Navigator.pushNamed(
+                                context,
+                                FormScreen.routeName,
+                                arguments: FormScreenArguments(
+                                  AppLocalizations.of(context).newEntry,
+                                  WeightForm(),
+                                ),
+                              );
+                            },
+                          ),
                         ],
                       ),
                     ],
@@ -309,6 +314,115 @@ class _DashboardWeightWidgetState extends State<DashboardWeightWidget> {
   }
 }
 
+class DashboardMeasurementWidget extends StatefulWidget {
+  @override
+  _DashboardMeasurementWidgetState createState() => _DashboardMeasurementWidgetState();
+}
+
+class _DashboardMeasurementWidgetState extends State<DashboardMeasurementWidget> {
+  int _current = 0;
+  final CarouselController _controller = CarouselController();
+
+  @override
+  Widget build(BuildContext context) {
+    final _provider = Provider.of<MeasurementProvider>(context, listen: false);
+
+    List<Widget> items = _provider.categories
+        .map<Widget>(
+          (item) => CategoriesCard(
+            item,
+            elevation: 0,
+          ),
+        )
+        .toList();
+    if (items.isNotEmpty) {
+      items.add(
+        NothingFound(
+          AppLocalizations.of(context).moreMeasurementEntries,
+          AppLocalizations.of(context).newEntry,
+          MeasurementCategoryForm(),
+        ),
+      );
+    }
+    return Consumer<MeasurementProvider>(
+      builder: (context, workoutProvider, child) => Card(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            ListTile(
+              title: Text(
+                AppLocalizations.of(context).measurements,
+                style: Theme.of(context).textTheme.headline4,
+              ),
+              leading: const FaIcon(
+                FontAwesomeIcons.weight,
+                color: Colors.black,
+              ),
+              trailing: IconButton(
+                icon: const Icon(Icons.arrow_forward),
+                onPressed: () => Navigator.pushNamed(
+                  context,
+                  MeasurementCategoriesScreen.routeName,
+                ),
+              ),
+            ),
+            Column(
+              children: [
+                if (items.isNotEmpty)
+                  Column(children: [
+                    CarouselSlider(
+                      items: items,
+                      carouselController: _controller,
+                      options: CarouselOptions(
+                          autoPlay: false,
+                          enlargeCenterPage: false,
+                          viewportFraction: 1,
+                          enableInfiniteScroll: false,
+                          aspectRatio: 1.1,
+                          onPageChanged: (index, reason) {
+                            setState(() {
+                              _current = index;
+                            });
+                          }),
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(bottom: 10),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: items.asMap().entries.map((entry) {
+                          return GestureDetector(
+                            onTap: () => _controller.animateToPage(entry.key),
+                            child: Container(
+                              width: 12.0,
+                              height: 12.0,
+                              margin: EdgeInsets.symmetric(vertical: 8.0, horizontal: 4.0),
+                              decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  color: (Theme.of(context).brightness == Brightness.dark
+                                          ? Colors.white
+                                          : wgerPrimaryColor)
+                                      .withOpacity(_current == entry.key ? 0.9 : 0.4)),
+                            ),
+                          );
+                        }).toList(),
+                      ),
+                    ),
+                  ])
+                else
+                  NothingFound(
+                    AppLocalizations.of(context).noMeasurementEntries,
+                    AppLocalizations.of(context).newEntry,
+                    MeasurementCategoryForm(),
+                  ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class DashboardWorkoutWidget extends StatefulWidget {
   @override
   _DashboardWorkoutWidgetState createState() => _DashboardWorkoutWidgetState();

lib/widgets/measurements/categories.dart

@@ -24,6 +24,7 @@ import 'package:wger/screens/form_screen.dart';
 import 'package:wger/screens/measurement_entries_screen.dart';
 import 'package:wger/widgets/core/charts.dart';
 
+import 'categories_card.dart';
 import 'forms.dart';
 
 class CategoriesList extends StatelessWidget {
@@ -37,58 +38,7 @@ class CategoriesList extends StatelessWidget {
       itemBuilder: (context, index) {
         final currentCategory = _provider.categories[index];
 
-        return Card(
-          child: Column(
-            children: [
-              Padding(
-                padding: const EdgeInsets.only(top: 5),
-                child: Text(
-                  currentCategory.name,
-                  style: Theme.of(context).textTheme.headline6,
-                ),
-              ),
-              Container(
-                color: Colors.white,
-                padding: const EdgeInsets.all(10),
-                height: 220,
-                child: MeasurementChartWidget(
-                  currentCategory.entries
-                      .map((e) => MeasurementChartEntry(e.value, e.date))
-                      .toList(),
-                  unit: currentCategory.unit,
-                ),
-              ),
-              const Divider(),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: <Widget>[
-                  TextButton(
-                      child: Text(AppLocalizations.of(context).goToDetailPage),
-                      onPressed: () {
-                        Navigator.pushNamed(
-                          context,
-                          MeasurementEntriesScreen.routeName,
-                          arguments: currentCategory.id,
-                        );
-                      }),
-                  IconButton(
-                    onPressed: () async {
-                      await Navigator.pushNamed(
-                        context,
-                        FormScreen.routeName,
-                        arguments: FormScreenArguments(
-                          AppLocalizations.of(context).newEntry,
-                          MeasurementEntryForm(currentCategory.id!),
-                        ),
-                      );
-                    },
-                    icon: const Icon(Icons.add),
-                  ),
-                ],
-              ),
-            ],
-          ),
-        );
+        return CategoriesCard(currentCategory);
       },
     );
   }

lib/widgets/measurements/categories_card.dart

@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+
+import '../../models/measurements/measurement_category.dart';
+import '../../screens/form_screen.dart';
+import '../../screens/measurement_entries_screen.dart';
+import '../core/charts.dart';
+import 'forms.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+class CategoriesCard extends StatelessWidget {
+  MeasurementCategory currentCategory;
+  double? elevation;
+
+  CategoriesCard(this.currentCategory,{this.elevation});
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      elevation: elevation,
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(top: 5),
+            child: Text(
+              currentCategory.name,
+              style: Theme.of(context).textTheme.headline6,
+            ),
+          ),
+          Container(
+            color: Colors.white,
+            padding: const EdgeInsets.all(10),
+            height: 220,
+            child: MeasurementChartWidget(
+              currentCategory.entries
+                  .map((e) => MeasurementChartEntry(e.value, e.date))
+                  .toList(),
+              unit: currentCategory.unit,
+            ),
+          ),
+          const Divider(),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              TextButton(
+                  child: Text(AppLocalizations.of(context).goToDetailPage),
+                  onPressed: () {
+                    Navigator.pushNamed(
+                      context,
+                      MeasurementEntriesScreen.routeName,
+                      arguments: currentCategory.id,
+                    );
+                  }),
+              IconButton(
+                onPressed: () async {
+                  await Navigator.pushNamed(
+                    context,
+                    FormScreen.routeName,
+                    arguments: FormScreenArguments(
+                      AppLocalizations.of(context).newEntry,
+                      MeasurementEntryForm(currentCategory.id!),
+                    ),
+                  );
+                },
+                icon: const Icon(Icons.add),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

pubspec.lock

@@ -141,6 +141,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0+1"
+  carousel_slider:
+    dependency: "direct main"
+    description:
+      name: carousel_slider
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.1.1"
   change:
     dependency: transitive
     description:
@@ -1006,7 +1013,7 @@ packages:
       name: url_launcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.6"
+    version: "6.1.5"
   url_launcher_android:
     dependency: transitive
     description:

pubspec.yaml

@@ -51,9 +51,10 @@ dependencies:
   rive: ^0.9.1
   shared_preferences: ^2.0.15
   table_calendar: ^3.0.7
-  url_launcher: ^6.1.6
+  url_launcher: ^6.1.5
   flutter_barcode_scanner: ^2.0.0
   video_player: ^2.4.7
+  carousel_slider: ^4.1.1
   multi_select_flutter: ^4.1.2
   flutter_svg: ^0.23.0+1