Add support for units in cardio - 1.0.67 🚀

fastlane/metadata/android/en-US/changelogs/74.txt

@@ -0,0 +1,5 @@
+- Add support for units in cardio
+- Fix grouping by week for cardio lines
+- Fix grouping by weeks for graph
+- Fix grouping by week
+- Refactor plans

lib/add_exercise_page.dart

@@ -52,7 +52,8 @@ class _AddExercisePageState extends State<AddExercisePage> {
             DropdownButtonFormField<String>(
               value: _unit,
               decoration: const InputDecoration(labelText: 'Default unit'),
-              items: ['kg', 'lb'].map((String value) {
+              items:
+                  (_cardio ? ['km', 'mi'] : ['kg', 'lb']).map((String value) {
                 return DropdownMenuItem<String>(
                   value: value,
                   child: Text(value),
@@ -69,6 +70,10 @@ class _AddExercisePageState extends State<AddExercisePage> {
               onTap: () {
                 setState(() {
                   _cardio = !_cardio;
+                  if (_cardio)
+                    _unit = 'km';
+                  else
+                    _unit = 'kg';
                 });
               },
               trailing: Switch(

lib/cardio_data.dart

@@ -1,9 +1,11 @@
 class CardioData {
   final DateTime created;
   final double value;
+  final String unit;
 
   CardioData({
     required this.created,
     required this.value,
+    required this.unit,
   });
 }

lib/cardio_line.dart

@@ -61,6 +61,7 @@ class _CardioLineState extends State<CardioLine> {
             db.gymSets.distance.sum(),
             db.gymSets.distance.sum() / db.gymSets.duration.sum(),
             db.gymSets.created,
+            db.gymSets.unit,
           ])
           ..where(db.gymSets.name.equals(widget.name))
           ..where(db.gymSets.hidden.equals(false))
@@ -112,6 +113,7 @@ class _CardioLineState extends State<CardioLine> {
           rows.add(CardioData(
             value: value,
             created: row.read(db.gymSets.created)!,
+            unit: row.read(db.gymSets.unit)!,
           ));
           spots.add(FlSpot(index.toDouble(), value));
         }

lib/edit_gym_set.dart

@@ -192,22 +192,22 @@ class _EditGymSetState extends State<EditGymSet> {
                     baseOffset: 0,
                     extentOffset: _bodyWeightController.text.length),
               ),
-            if (!_cardio)
-              DropdownButtonFormField<String>(
-                value: _unit,
-                decoration: const InputDecoration(labelText: 'Unit'),
-                items: ['kg', 'lb'].map((String value) {
-                  return DropdownMenuItem<String>(
-                    value: value,
-                    child: Text(value),
-                  );
-                }).toList(),
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _unit = newValue!;
-                  });
-                },
-              ),
+            DropdownButtonFormField<String>(
+              value: _unit,
+              decoration: const InputDecoration(labelText: 'Unit'),
+              items:
+                  (_cardio ? ['km', 'mi'] : ['kg', 'lb']).map((String value) {
+                return DropdownMenuItem<String>(
+                  value: value,
+                  child: Text(value),
+                );
+              }).toList(),
+              onChanged: (String? newValue) {
+                setState(() {
+                  _unit = newValue!;
+                });
+              },
+            ),
             ListTile(
               title: const Text('Created Date'),
               subtitle: Text(_created.toString()),

lib/graph_history.dart

@@ -117,7 +117,7 @@ class _GraphHistoryState extends State<GraphHistory> {
                         .format(gymSet.created)),
                     trailing: Text(
                         gymSet.cardio
-                            ? "${gymSet.distance} / ${gymSet.duration}"
+                            ? "${gymSet.distance}${gymSet.unit} / ${gymSet.duration}"
                             : "${gymSet.reps} x ${gymSet.weight} ${gymSet.unit}",
                         style: const TextStyle(fontSize: 16)),
                     selected: _selected.contains(gymSet.id),

lib/start_plan_page.dart

@@ -101,6 +101,8 @@ class _StartPlanPageState extends State<StartPlanPage> {
           ..limit(1))
         .getSingleOrNull();
     setState(() {
+      _unit = last?.unit ?? 'kg';
+      if (last?.cardio == true && _unit == 'kg') _unit = 'km';
       _repsController.text = last != null ? last.reps.toString() : "0.0";
       _weightController.text = last != null ? last.weight.toString() : "0.0";
       _distanceController.text =
@@ -236,23 +238,21 @@ class _StartPlanPageState extends State<StartPlanPage> {
                 },
                 onSubmitted: (value) async => await _save(timerState, settings),
               ),
-            if (settings.showUnits && !_cardio)
-              DropdownButtonFormField<String>(
-                value: _unit,
-                decoration: const InputDecoration(labelText: 'Unit'),
-                items: ['kg', 'lb'].map((String value) {
-                  return DropdownMenuItem<String>(
-                    value: value,
-                    child: Text(value),
+            if (_cardio) ...[
+              TextField(
+                controller: _durationController,
+                focusNode: _durationNode,
+                decoration: const InputDecoration(
+                  labelText: 'Duration',
+                ),
+                keyboardType: TextInputType.number,
+                onTap: () {
+                  _durationController.selection = TextSelection(
+                    baseOffset: 0,
+                    extentOffset: _durationController.text.length,
                   );
-                }).toList(),
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _unit = newValue!;
-                  });
                 },
               ),
-            if (_cardio) ...[
               TextField(
                 focusNode: _distanceNode,
                 controller: _distanceController,
@@ -270,21 +270,24 @@ class _StartPlanPageState extends State<StartPlanPage> {
                   _durationNode.requestFocus();
                 },
               ),
-              TextField(
-                controller: _durationController,
-                focusNode: _durationNode,
-                decoration: const InputDecoration(
-                  labelText: 'Duration',
-                ),
-                keyboardType: TextInputType.number,
-                onTap: () {
-                  _durationController.selection = TextSelection(
-                    baseOffset: 0,
-                    extentOffset: _durationController.text.length,
+            ],
+            if (settings.showUnits)
+              DropdownButtonFormField<String>(
+                value: _unit,
+                decoration: const InputDecoration(labelText: 'Unit'),
+                items:
+                    (_cardio ? ['km', 'mi'] : ['kg', 'lb']).map((String value) {
+                  return DropdownMenuItem<String>(
+                    value: value,
+                    child: Text(value),
                   );
+                }).toList(),
+                onChanged: (String? newValue) {
+                  setState(() {
+                    _unit = newValue!;
+                  });
                 },
               ),
-            ],
             Expanded(
               child: StreamBuilder(
                 stream: _countStream,

pubspec.yaml

@@ -1,7 +1,7 @@
 name: flexify
 description: Track gym progress, visualize graphs, enjoy offline support & timers
 publish_to: none
-version: 1.0.66+73
+version: 1.0.67+74
 environment:
   sdk: '>=3.2.6 <4.0.0'
 dependencies: