Merge branch 'master' into 12people_maintenance

# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/core/charts.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/workouts/charts.dart
#	pubspec.lock
#	pubspec.yaml
#	test_driver/screenshot_driver.dart

.github/workflows/ci.yml

@@ -5,32 +5,32 @@ on:
       - '**.dart'
       - 'pubspec.yaml'
   pull_request:
-    branches: [ pull_request, master ]
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
 jobs:
   test:
     runs-on: ubuntu-latest
-    steps:  
-    - uses: actions/checkout@v1
+    steps:
+      - uses: actions/checkout@v1
 
-    - name: Install Flutter
-      uses: subosito/flutter-action@v1
-      with:
-        channel: 'stable'
-        flutter-version: '3.7.x'
+      - name: Install Flutter
+        uses: subosito/flutter-action@v1
+        with:
+          channel: 'stable'
+          flutter-version: '3.13.x'
 
-    - run: dart --version
-    - run: flutter --version
+      - run: dart --version
+      - run: flutter --version
 
-    - name: Install app dependencies
-      run: flutter pub get
+      - name: Install app dependencies
+        run: flutter pub get
 
-    - name: Test app
-      run: flutter test --coverage
+      - name: Test app
+        run: flutter test --coverage
 
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linter.yml

@@ -20,7 +20,7 @@ jobs:
         uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-          flutter-version: '3.7.x'
+          flutter-version: '3.13.x'
 
       - name: Get dependencies
         run: flutter pub get

README.md

@@ -38,13 +38,12 @@ Alternatively, you can use the test server (the db is reset every day):
 * password: `flutteruser`
 * API key: `31e2ea0322c07b9df583a9b6d1e794f7139e78d4`
 
-
 ### 2
 
 Install Flutter, and all its dependencies, and create a new virtual device:
 <https://flutter.dev/docs/get-started/install>.
 
-The app currently uses flutter 3.7
+The app currently uses flutter 3.13
 
 ### 3
 

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

ios/Podfile.lock

@@ -61,7 +61,7 @@ SPEC CHECKSUMS:
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  rive_common: 60ae7896ab40f9513974f36f015de33f70d2c5c5
+  rive_common: b5b1aa30c63b8f0f00f32cddc9ea394d3d3473b5
   shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126

lib/exceptions/http_exception.dart

@@ -29,12 +29,11 @@ class WgerHttpException implements Exception {
       errors = {'unknown_error': 'An unknown error occurred, no further information available'};
     } else {
       try {
-        errors = json.decode(responseBody);
+        errors = {'unknown_error': json.decode(responseBody)};
       } catch (e) {
-        errors = responseBody;
+        errors = {'unknown_error': responseBody};
       }
     }
-    errors = errors;
   }
 
   @override

lib/helpers/charts.dart

@@ -0,0 +1,5 @@
+double chartGetInterval(DateTime first, DateTime last, {divider = 3}) {
+  final dayDiff = last.difference(first);
+
+  return dayDiff.inMilliseconds == 0 ? 1000 : dayDiff.inMilliseconds.abs() / divider;
+}

lib/helpers/colors.dart

@@ -0,0 +1,43 @@
+import 'dart:math';
+import 'dart:ui';
+
+const LIST_OF_COLORS8 = [
+  Color(0xFF2A4C7D),
+  Color(0xFF5B5291),
+  Color(0xFF8E5298),
+  Color(0xFFBF5092),
+  Color(0xFFE7537E),
+  Color(0xFFFF6461),
+  Color(0xFFFF813D),
+  Color(0xFFFFA600),
+];
+
+const LIST_OF_COLORS5 = [
+  Color(0xFF2A4C7D),
+  Color(0xFF825298),
+  Color(0xFFD45089),
+  Color(0xFFFF6A59),
+  Color(0xFFFFA600),
+];
+
+const LIST_OF_COLORS3 = [
+  Color(0xFF2A4C7D),
+  Color(0xFFD45089),
+  Color(0xFFFFA600),
+];
+
+Iterable<Color> generateChartColors(int nrOfItems) sync* {
+  final List<Color> colors;
+
+  if (nrOfItems <= 3) {
+    colors = LIST_OF_COLORS3;
+  } else if (nrOfItems <= 5) {
+    colors = LIST_OF_COLORS5;
+  } else {
+    colors = LIST_OF_COLORS8;
+  }
+
+  for (final color in colors) {
+    yield color;
+  }
+}

lib/models/nutrition/nutritional_plan.dart

@@ -82,6 +82,30 @@ class NutritionalPlan {
     return out;
   }
 
+  NutritionalValues get nutritionalValuesToday {
+    final now = DateTime.now();
+    final today = DateTime(now.year, now.month, now.day);
+
+    return logEntriesValues.containsKey(today) ? logEntriesValues[today]! : NutritionalValues();
+  }
+
+  NutritionalValues get nutritionalValues7DayAvg {
+    final currentDate = DateTime.now();
+    final sevenDaysAgo = currentDate.subtract(Duration(days: 7));
+
+    final entries = logs.where((obj) {
+      DateTime objDate = obj.datetime;
+      return objDate.isAfter(sevenDaysAgo) && objDate.isBefore(currentDate);
+    }).toList();
+
+    var out = NutritionalValues();
+    entries.forEach((log) {
+      out = out + log.nutritionalValues;
+    });
+
+    return out;
+  }
+
   /// Calculates the percentage each macro nutrient adds to the total energy
   BaseNutritionalValues energyPercentage(NutritionalValues values) {
     return BaseNutritionalValues(