diff --git a/lib/widgets/core/charts.dart b/lib/widgets/core/charts.dart index 05396619..ccbba73f 100644 --- a/lib/widgets/core/charts.dart +++ b/lib/widgets/core/charts.dart @@ -30,10 +30,10 @@ class MeasurementChartEntry { /// Weight chart widget class MeasurementChartWidget extends StatelessWidget { final List _entries; - late String unit; + final String unit; /// [_entries] is a list of [MeasurementChartEntry] - MeasurementChartWidget(this._entries, {this.unit = 'kg'}); + const MeasurementChartWidget(this._entries, {this.unit = 'kg'}); @override Widget build(BuildContext context) { diff --git a/lib/widgets/core/core.dart b/lib/widgets/core/core.dart index da52a78c..d1f22dd2 100644 --- a/lib/widgets/core/core.dart +++ b/lib/widgets/core/core.dart @@ -21,24 +21,19 @@ import 'package:wger/theme/theme.dart'; class MutedText extends StatelessWidget { final String _text; - TextAlign _textAlign = TextAlign.left; + final TextAlign textAlign; - MutedText( + const MutedText( this._text, { - Key? key, - TextAlign? textAlign, - }) : super(key: key) { - if (textAlign != null) { - _textAlign = textAlign; - } - } + this.textAlign = TextAlign.left, + }); @override Widget build(BuildContext context) { return Text( _text, style: TextStyle(color: wgerTextMuted), - textAlign: _textAlign, + textAlign: textAlign, ); } } diff --git a/lib/widgets/gallery/forms.dart b/lib/widgets/gallery/forms.dart index 9bce0ca4..bcffe508 100644 --- a/lib/widgets/gallery/forms.dart +++ b/lib/widgets/gallery/forms.dart @@ -28,7 +28,7 @@ import 'package:wger/models/gallery/image.dart' as gallery; import 'package:wger/providers/gallery.dart'; class ImageForm extends StatefulWidget { - late gallery.Image _image; + late final gallery.Image _image; ImageForm([gallery.Image? image]) { _image = image ?? gallery.Image.emtpy(); diff --git a/lib/widgets/measurements/forms.dart b/lib/widgets/measurements/forms.dart index d5cf4a17..ee7bea3d 100644 --- a/lib/widgets/measurements/forms.dart +++ b/lib/widgets/measurements/forms.dart @@ -32,7 +32,7 @@ class MeasurementCategoryForm extends StatelessWidget { final nameController = TextEditingController(); final unitController = TextEditingController(); - Map categoryData = {'id': null, 'name': '', 'unit': ''}; + final Map categoryData = {'id': null, 'name': '', 'unit': ''}; MeasurementCategoryForm([MeasurementCategory? category]) { //this._category = category ?? MeasurementCategory(); @@ -130,7 +130,7 @@ class MeasurementEntryForm extends StatelessWidget { final _dateController = TextEditingController(); final _notesController = TextEditingController(); - late Map _entryData; + late final Map _entryData; MeasurementEntryForm(this._categoryId, [MeasurementEntry? entry]) { _entryData = { diff --git a/lib/widgets/nutrition/forms.dart b/lib/widgets/nutrition/forms.dart index f87aa94e..040e69cf 100644 --- a/lib/widgets/nutrition/forms.dart +++ b/lib/widgets/nutrition/forms.dart @@ -31,7 +31,7 @@ import 'package:wger/providers/nutrition.dart'; import 'package:wger/screens/nutritional_plan_screen.dart'; class MealForm extends StatelessWidget { - late Meal _meal; + late final Meal _meal; final int _planId; final _form = GlobalKey(); @@ -114,7 +114,7 @@ class MealForm extends StatelessWidget { class MealItemForm extends StatelessWidget { final Meal _meal; - late MealItem _mealItem; + late final MealItem _mealItem; MealItemForm(this._meal, [mealItem]) { _mealItem = mealItem ?? MealItem.empty(); @@ -210,7 +210,7 @@ class MealItemForm extends StatelessWidget { class PlanForm extends StatelessWidget { final _form = GlobalKey(); final _descriptionController = TextEditingController(); - late NutritionalPlan _plan; + late final NutritionalPlan _plan; PlanForm([NutritionalPlan? plan]) { _plan = plan ?? NutritionalPlan.empty(); diff --git a/lib/widgets/weight/forms.dart b/lib/widgets/weight/forms.dart index f1e1d765..7be89bbe 100644 --- a/lib/widgets/weight/forms.dart +++ b/lib/widgets/weight/forms.dart @@ -31,7 +31,7 @@ class WeightForm extends StatelessWidget { final dateController = TextEditingController(); final weightController = TextEditingController(); - late WeightEntry _weightEntry; + late final WeightEntry _weightEntry; WeightForm([WeightEntry? weightEntry]) { _weightEntry = weightEntry ?? WeightEntry(date: DateTime.now()); diff --git a/lib/widgets/workouts/day.dart b/lib/widgets/workouts/day.dart index efeef767..a2951f97 100644 --- a/lib/widgets/workouts/day.dart +++ b/lib/widgets/workouts/day.dart @@ -33,12 +33,12 @@ import 'package:wger/widgets/exercises/images.dart'; import 'package:wger/widgets/workouts/forms.dart'; class SettingWidget extends StatelessWidget { - Set set; - Setting setting; + final Set set; + final Setting setting; final bool expanded; final toggle; - SettingWidget({ + const SettingWidget({ required this.set, required this.setting, required this.expanded, diff --git a/lib/widgets/workouts/forms.dart b/lib/widgets/workouts/forms.dart index d4f8d54b..ba524cc1 100644 --- a/lib/widgets/workouts/forms.dart +++ b/lib/widgets/workouts/forms.dart @@ -35,7 +35,7 @@ import 'package:wger/theme/theme.dart'; import 'package:wger/widgets/exercises/images.dart'; class WorkoutForm extends StatelessWidget { - WorkoutPlan _plan; + final WorkoutPlan _plan; final _form = GlobalKey(); WorkoutForm(this._plan); @@ -106,11 +106,12 @@ class WorkoutForm extends StatelessWidget { await Provider.of(context, listen: false).editWorkout(_plan); Navigator.of(context).pop(); } else { - _plan = await Provider.of(context, listen: false) - .addWorkout(_plan); + final WorkoutPlan newPlan = + await Provider.of(context, listen: false) + .addWorkout(_plan); Navigator.of(context).pushReplacementNamed( WorkoutPlanScreen.routeName, - arguments: _plan, + arguments: newPlan, ); } }, @@ -157,7 +158,7 @@ class _DayCheckboxState extends State { class DayFormWidget extends StatefulWidget { final WorkoutPlan workout; final dayController = TextEditingController(); - Day _day = Day(); + late final Day _day; DayFormWidget(this.workout, [Day? day]) { _day = day ?? Day(); @@ -256,7 +257,7 @@ class _DayFormWidgetState extends State { class SetFormWidget extends StatefulWidget { final Day _day; - late Set _set; + late final Set _set; SetFormWidget(this._day, [Set? set]) { _set = set ?? Set.withData(day: _day.id, order: _day.sets.length, sets: 4); @@ -537,7 +538,7 @@ class _SetFormWidgetState extends State { class ExerciseSetting extends StatelessWidget { final Exercise _exercise; - int _numberOfSets = 4; + late final int _numberOfSets; final bool _detailed; final Function removeExercise; final List _settings; diff --git a/lib/widgets/workouts/gym_mode.dart b/lib/widgets/workouts/gym_mode.dart index d7c375c2..a9c09cc8 100644 --- a/lib/widgets/workouts/gym_mode.dart +++ b/lib/widgets/workouts/gym_mode.dart @@ -44,7 +44,7 @@ import 'package:wger/widgets/workouts/forms.dart'; class GymMode extends StatefulWidget { final Day _workoutDay; - late TimeOfDay _start; + late final TimeOfDay _start; GymMode(this._workoutDay) { _start = TimeOfDay.now(); @@ -1045,9 +1045,9 @@ class NavigationFooter extends StatelessWidget { class NavigationHeader extends StatelessWidget { final PageController _controller; final String _title; - Map exercisePages; + final Map exercisePages; - NavigationHeader( + const NavigationHeader( this._title, this._controller, { required this.exercisePages,