From 1e8080cc02cf1c92b868278408fab1b1514557a9 Mon Sep 17 00:00:00 2001
From: Marvin M <39344769+M123-dev@users.noreply.github.com>
Date: Thu, 7 Oct 2021 20:43:55 +0200
Subject: [PATCH] always_declare_return_types

---
 analysis_options.yaml                             | 2 +-
 lib/models/measurements/measurement_category.dart | 1 +
 lib/models/nutrition/nutritrional_values.dart     | 2 +-
 lib/models/workouts/session.dart                  | 2 +-
 lib/providers/body_weight.dart                    | 2 +-
 lib/providers/gallery.dart                        | 2 +-
 lib/providers/nutrition.dart                      | 2 +-
 lib/providers/workout_plans.dart                  | 2 +-
 lib/widgets/dashboard/calendar.dart               | 7 +++----
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 5fa3c9fc..02df472e 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -24,7 +24,7 @@ linter:
     # These rules are documented on and in the same order as
     # the Dart Lint rules page to make maintenance easier
     # https://github.com/dart-lang/linter/blob/master/example/all.yaml
-    always_declare_return_types: false # definitely to be changed
+    always_declare_return_types: true
     always_put_control_body_on_new_line: true
     always_require_non_null_named_parameters: true
     always_specify_types: false #to be changed
diff --git a/lib/models/measurements/measurement_category.dart b/lib/models/measurements/measurement_category.dart
index 3c66cb53..21d1e94f 100644
--- a/lib/models/measurements/measurement_category.dart
+++ b/lib/models/measurements/measurement_category.dart
@@ -55,5 +55,6 @@ class MeasurementCategory extends Equatable {
   List<Object?> get props => [id, name, unit, entries];
 
   // Helper function which makes the entries list of the toJson output null, as it isn't needed
+  //ignore: always_declare_return_types
   static _nullValue(_) => null;
 }
diff --git a/lib/models/nutrition/nutritrional_values.dart b/lib/models/nutrition/nutritrional_values.dart
index 186cc823..ed08ac62 100644
--- a/lib/models/nutrition/nutritrional_values.dart
+++ b/lib/models/nutrition/nutritrional_values.dart
@@ -46,7 +46,7 @@ class NutritionalValues {
     return energy * 4.184;
   }
 
-  add(NutritionalValues data) {
+  void add(NutritionalValues data) {
     energy += data.energy;
     protein += data.protein;
     carbohydrates += data.carbohydrates;
diff --git a/lib/models/workouts/session.dart b/lib/models/workouts/session.dart
index fd919ddc..1c2aea7b 100644
--- a/lib/models/workouts/session.dart
+++ b/lib/models/workouts/session.dart
@@ -68,7 +68,7 @@ class WorkoutSession {
   factory WorkoutSession.fromJson(Map<String, dynamic> json) => _$WorkoutSessionFromJson(json);
   Map<String, dynamic> toJson() => _$WorkoutSessionToJson(this);
 
-  get impressionAsString {
+  String? get impressionAsString {
     return IMPRESSION_MAP[impression];
   }
 }
diff --git a/lib/providers/body_weight.dart b/lib/providers/body_weight.dart
index 3e85caad..251858cd 100644
--- a/lib/providers/body_weight.dart
+++ b/lib/providers/body_weight.dart
@@ -36,7 +36,7 @@ class BodyWeightProvider extends WgerBaseProvider with ChangeNotifier {
   }
 
   /// Clears all lists
-  clear() {
+  void clear() {
     _entries = [];
   }
 
diff --git a/lib/providers/gallery.dart b/lib/providers/gallery.dart
index f1815c30..d15bf32d 100644
--- a/lib/providers/gallery.dart
+++ b/lib/providers/gallery.dart
@@ -37,7 +37,7 @@ class GalleryProvider extends WgerBaseProvider with ChangeNotifier {
         super(auth, client);
 
   /// Clears all lists
-  clear() {
+  void clear() {
     images = [];
   }
 
diff --git a/lib/providers/nutrition.dart b/lib/providers/nutrition.dart
index 5b28c90f..efbb1dc2 100644
--- a/lib/providers/nutrition.dart
+++ b/lib/providers/nutrition.dart
@@ -54,7 +54,7 @@ class NutritionPlansProvider extends WgerBaseProvider with ChangeNotifier {
   }
 
   /// Clears all lists
-  clear() {
+  void clear() {
     _plans = [];
     _ingredients = [];
   }
diff --git a/lib/providers/workout_plans.dart b/lib/providers/workout_plans.dart
index a79ec404..b95ddb23 100644
--- a/lib/providers/workout_plans.dart
+++ b/lib/providers/workout_plans.dart
@@ -68,7 +68,7 @@ class WorkoutPlansProvider extends WgerBaseProvider with ChangeNotifier {
   }
 
   /// Clears all lists
-  clear() {
+  void clear() {
     _currentPlan = null;
     _workoutPlans = [];
     _weightUnits = [];
diff --git a/lib/widgets/dashboard/calendar.dart b/lib/widgets/dashboard/calendar.dart
index f14fd49b..dea7d720 100644
--- a/lib/widgets/dashboard/calendar.dart
+++ b/lib/widgets/dashboard/calendar.dart
@@ -46,11 +46,11 @@ class Event {
 
   Event(this._type, this._description);
 
-  get description {
+  String get description {
     return _description;
   }
 
-  get type {
+  EventType get type {
     return _type;
   }
 }
@@ -267,9 +267,8 @@ class _DashboardCalendarWidgetState extends State<DashboardCalendarWidget>
                               case EventType.measurement:
                                 return AppLocalizations.of(context).measurement;
                             }
-                            return event.description.toString();
                           })()),
-                          subtitle: Text(event.description.toString()),
+                          subtitle: Text(event.description),
                           //onTap: () => print('$event tapped!'),
                         ))
                     .toList()