remove logging of timetable data in TimetableHomeWidget

# Conflicts:
#	lib/view/pages/timetable/timetable.dart
#	pubspec.yaml

android/app/build.gradle

@@ -57,6 +57,9 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 flutter {

android/app/src/main/AndroidManifest.xml

@@ -1,45 +1,73 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+>
+
+    <!--
+     Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility?hl=en and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin.
+    -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+
+            <data android:mimeType="text/plain" />
+        </intent>
+    </queries>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
-        android:label="Marianum Fulda"
+        tools:replace="android:label"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="Marianum Fulda">
+        <receiver
+            android:name=".TimetableWidget"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/timetable_widget_info" />
+        </receiver>
+
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
+
+            <!--
+                 Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
+                 to determine the Window background behind the Flutter UI.
+            -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <!--
+ Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
+        -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-    <!-- Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
-        </intent>
-    </queries>
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
+</manifest>

android/app/src/main/java/eu/mhsl/marianum/mobile/client/TimetableWidget.kt

@@ -0,0 +1,39 @@
+package eu.mhsl.marianum.mobile.client
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.widget.RemoteViews
+
+import es.antonborri.home_widget.HomeWidgetPlugin
+import android.util.Base64
+
+/**
+ * Implementation of App Widget functionality.
+ */
+class TimetableWidget : AppWidgetProvider() {
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        for (appWidgetId in appWidgetIds) {
+            val widgetData = HomeWidgetPlugin.getData(context)
+            val views = RemoteViews(context.packageName, R.layout.timetable_widget).apply {
+                val imageBase64 = widgetData.getString("screen", null) ?: return@apply
+                val imageBytes = Base64.decode(imageBase64, Base64.DEFAULT);
+                val imageBitmap: Bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+                setImageViewBitmap(R.id.widget_image, imageBitmap)
+            }
+
+            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
+            val pendingIntent = PendingIntent.getActivity(context, 0, launchIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+            views.setOnClickPendingIntent(R.id.background, pendingIntent)
+
+            appWidgetManager.updateAppWidget(appWidgetId, views)
+        }
+    }
+}

android/app/src/main/res/drawable-v21/app_widget_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Background for widgets to make the rounded corners based on the
+appWidgetRadius attribute value
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="?attr/appWidgetRadius" />
+    <solid android:color="?android:attr/colorBackground" />
+</shape>

android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Background for views inside widgets to make the rounded corners based on the
+appWidgetInnerRadius attribute value
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="?attr/appWidgetInnerRadius" />
+    <solid android:color="?android:attr/colorAccent" />
+</shape>

android/app/src/main/res/layout/timetable_widget.xml

@@ -0,0 +1,26 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background"
+    style="@style/Widget.Android.AppWidget.Container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent"
+    android:padding="0dp"
+    android:theme="@style/Theme.Android.AppWidgetContainer">
+
+    <ImageView
+        android:id="@+id/widget_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="0dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginBottom="0dp"
+        android:layout_weight="1"
+        android:adjustViewBounds="false"
+        android:background="@android:color/transparent"
+        android:scaleType="fitCenter"
+        android:src="@drawable/timetable_widget_default"
+        android:visibility="visible"
+        tools:visibility="visible" />
+</RelativeLayout>

android/app/src/main/res/values-night-v31/themes.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    Having themes.xml for night-v31 because of the priority order of the resource qualifiers.
+    -->
+    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
+        <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
+    </style>
+</resources>

android/app/src/main/res/values-v21/styles.xml

@@ -0,0 +1,14 @@
+<resources>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:padding">?attr/appWidgetPadding</item>
+        <item name="android:background">@drawable/app_widget_background</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:padding">?attr/appWidgetPadding</item>
+        <item name="android:background">@drawable/app_widget_inner_view_background</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+</resources>

android/app/src/main/res/values-v31/styles.xml

@@ -18,4 +18,18 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:padding">?attr/appWidgetPadding</item>
+        <item name="android:background">@drawable/app_widget_background</item>
+        <item name="android:clipToOutline">true</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:padding">?attr/appWidgetPadding</item>
+        <item name="android:background">@drawable/app_widget_inner_view_background</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:clipToOutline">true</item>
+    </style>
 </resources>

android/app/src/main/res/values-v31/themes.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--
+    Having themes.xml for v31 variant because @android:dimen/system_app_widget_background_radius
+     and @android:dimen/system_app_widget_internal_padding requires API level 31
+    -->
+    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
+        <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
+        <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
+    </style>
+</resources>

android/app/src/main/res/values/attrs.xml

@@ -0,0 +1,7 @@
+<resources>
+    <declare-styleable name="AppWidgetAttrs">
+        <attr name="appWidgetPadding" format="dimension" />
+        <attr name="appWidgetInnerRadius" format="dimension" />
+        <attr name="appWidgetRadius" format="dimension" />
+    </declare-styleable>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<resources>
+    <color name="light_blue_50">#FFE1F5FE</color>
+    <color name="light_blue_200">#FF81D4FA</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+</resources>

android/app/src/main/res/values/dimens.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+Refer to App Widget Documentation for margin information
+http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
+    -->
+    <dimen name="widget_margin">0dp</dimen>
+
+</resources>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="appwidget_text">Marianum Vertretungsplan</string>
+    <string name="add_widget">Hinzufügen</string>
+    <string name="app_widget_description">Übersicht zum Vertretungsplan</string>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -19,4 +19,14 @@
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
+    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+        <item name="android:id">@android:id/background</item>
+        <item name="android:background">?android:attr/colorBackground</item>
+    </style>
+
+    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+        <item name="android:background">?android:attr/colorBackground</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
 </resources>

android/app/src/main/res/values/themes.xml

@@ -0,0 +1,17 @@
+<resources>
+
+    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
+        <!-- Radius of the outer bound of widgets to make the rounded corners -->
+        <item name="appWidgetRadius">16dp</item>
+        <!--
+        Radius of the inner view's bound of widgets to make the rounded corners.
+        It needs to be 8dp or less than the value of appWidgetRadius
+        -->
+        <item name="appWidgetInnerRadius">8dp</item>
+    </style>
+
+    <style name="Theme.Android.AppWidgetContainer" parent="Theme.Android.AppWidgetContainerParent">
+        <!-- Apply padding to avoid the content of the widget colliding with the rounded corners -->
+        <item name="appWidgetPadding">16dp</item>
+    </style>
+</resources>

android/app/src/main/res/xml/timetable_widget_info.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/app_widget_description"
+    android:initialKeyguardLayout="@layout/timetable_widget"
+    android:initialLayout="@layout/timetable_widget"
+    android:minWidth="220dp"
+    android:minHeight="294dp"
+    android:minResizeWidth="110dp"
+    android:minResizeHeight="147dp"
+    android:previewImage="@drawable/timetable_widget_preview"
+    android:previewLayout="@layout/timetable_widget"
+    android:resizeMode="horizontal|vertical"
+    android:targetCellWidth="3"
+    android:targetCellHeight="4"
+    android:updatePeriodMillis="86400000"
+    android:widgetCategory="home_screen" />

android/build.gradle

@@ -2,6 +2,21 @@ allprojects {
     repositories {
         google()
         mavenCentral()
+
+        // [required] background_fetch
+        maven {
+            url "${project(':background_fetch').projectDir}/libs"
+        }
+    }
+}
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

@@ -19,8 +19,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.9.1" apply false
-    id "com.android.library" version "8.9.1" apply false
+    id "com.android.application" version '8.7.3' apply false
     id "org.jetbrains.kotlin.android" version "2.1.10" apply false
 }
 

devtools_options.yaml

@@ -1,4 +1 @@
 extensions:
-  - hive_ce: true
-  - shared_preferences: true
-  - provider: true

flutter_launcher_icons.yaml

@@ -1,9 +0,0 @@
-flutter_launcher_icons:
-  android: true
-  ios: true
-  remove_alpha_ios: true
-  image_path_android: "assets/logo/icon/ic_launcher.png"
-  image_path_ios: "assets/logo/icon/1024.png"
-  adaptive_icon_background: "assets/logo/icon/ic_launcher_adaptive_back.png" # only available for Android 8.0 devices and above
-  adaptive_icon_foreground: "assets/logo/icon/ic_launcher_adaptive_fore.png" # only available for Android 8.0 devices and above
-  min_sdk_android: 16 # android min sdk min:16, default 21

lib/api/holidays/getHolidaysResponse.g.dart

@@ -8,42 +8,39 @@ part of 'getHolidaysResponse.dart';
 
 GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
     GetHolidaysResponse(
-        (json['data'] as List<dynamic>)
-            .map(
-              (e) =>
-                  GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toList(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['data'] as List<dynamic>)
+          .map((e) =>
+              GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetHolidaysResponseToJson(
-  GetHolidaysResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'data': instance.data.map((e) => e.toJson()).toList(),
-};
+        GetHolidaysResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };
 
 GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetHolidaysResponseObject(
-  start: json['start'] as String,
-  end: json['end'] as String,
-  year: (json['year'] as num).toInt(),
-  stateCode: json['stateCode'] as String,
-  name: json['name'] as String,
-  slug: json['slug'] as String,
-);
+        Map<String, dynamic> json) =>
+    GetHolidaysResponseObject(
+      start: json['start'] as String,
+      end: json['end'] as String,
+      year: (json['year'] as num).toInt(),
+      stateCode: json['stateCode'] as String,
+      name: json['name'] as String,
+      slug: json['slug'] as String,
+    );
 
 Map<String, dynamic> _$GetHolidaysResponseObjectToJson(
-  GetHolidaysResponseObject instance,
-) => <String, dynamic>{
-  'start': instance.start,
-  'end': instance.end,
-  'year': instance.year,
-  'stateCode': instance.stateCode,
-  'name': instance.name,
-  'slug': instance.slug,
-};
+        GetHolidaysResponseObject instance) =>
+    <String, dynamic>{
+      'start': instance.start,
+      'end': instance.end,
+      'year': instance.year,
+      'stateCode': instance.stateCode,
+      'name': instance.name,
+      'slug': instance.slug,
+    };

lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart

@@ -7,39 +7,40 @@ part of 'autocompleteResponse.dart';
 // **************************************************************************
 
 AutocompleteResponse _$AutocompleteResponseFromJson(
-  Map<String, dynamic> json,
-) => AutocompleteResponse(
-  (json['data'] as List<dynamic>)
-      .map(
-        (e) => AutocompleteResponseObject.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
-);
+        Map<String, dynamic> json) =>
+    AutocompleteResponse(
+      (json['data'] as List<dynamic>)
+          .map((e) =>
+              AutocompleteResponseObject.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
 
 Map<String, dynamic> _$AutocompleteResponseToJson(
-  AutocompleteResponse instance,
-) => <String, dynamic>{'data': instance.data.map((e) => e.toJson()).toList()};
+        AutocompleteResponse instance) =>
+    <String, dynamic>{
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };
 
 AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => AutocompleteResponseObject(
-  json['id'] as String,
-  json['label'] as String,
-  json['icon'] as String?,
-  json['source'] as String?,
-  json['status'] as String?,
-  json['subline'] as String?,
-  json['shareWithDisplayNameUniqe'] as String?,
-);
+        Map<String, dynamic> json) =>
+    AutocompleteResponseObject(
+      json['id'] as String,
+      json['label'] as String,
+      json['icon'] as String?,
+      json['source'] as String?,
+      json['status'] as String?,
+      json['subline'] as String?,
+      json['shareWithDisplayNameUniqe'] as String?,
+    );
 
 Map<String, dynamic> _$AutocompleteResponseObjectToJson(
-  AutocompleteResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'label': instance.label,
-  'icon': instance.icon,
-  'source': instance.source,
-  'status': instance.status,
-  'subline': instance.subline,
-  'shareWithDisplayNameUniqe': instance.shareWithDisplayNameUniqe,
-};
+        AutocompleteResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'label': instance.label,
+      'icon': instance.icon,
+      'source': instance.source,
+      'status': instance.status,
+      'subline': instance.subline,
+      'shareWithDisplayNameUniqe': instance.shareWithDisplayNameUniqe,
+    };

lib/api/marianumcloud/files-sharing/fileSharingApiParams.g.dart

@@ -7,21 +7,21 @@ part of 'fileSharingApiParams.dart';
 // **************************************************************************
 
 FileSharingApiParams _$FileSharingApiParamsFromJson(
-  Map<String, dynamic> json,
-) => FileSharingApiParams(
-  shareType: (json['shareType'] as num).toInt(),
-  shareWith: json['shareWith'] as String,
-  path: json['path'] as String,
-  referenceId: json['referenceId'] as String?,
-  talkMetaData: json['talkMetaData'] as String?,
-);
+        Map<String, dynamic> json) =>
+    FileSharingApiParams(
+      shareType: (json['shareType'] as num).toInt(),
+      shareWith: json['shareWith'] as String,
+      path: json['path'] as String,
+      referenceId: json['referenceId'] as String?,
+      talkMetaData: json['talkMetaData'] as String?,
+    );
 
 Map<String, dynamic> _$FileSharingApiParamsToJson(
-  FileSharingApiParams instance,
-) => <String, dynamic>{
-  'shareType': instance.shareType,
-  'shareWith': instance.shareWith,
-  'path': instance.path,
-  'referenceId': instance.referenceId,
-  'talkMetaData': instance.talkMetaData,
-};
+        FileSharingApiParams instance) =>
+    <String, dynamic>{
+      'shareType': instance.shareType,
+      'shareWith': instance.shareWith,
+      'path': instance.path,
+      'referenceId': instance.referenceId,
+      'talkMetaData': instance.talkMetaData,
+    };

lib/api/marianumcloud/talk/chat/getChatParams.g.dart

@@ -8,35 +8,34 @@ part of 'getChatParams.dart';
 
 GetChatParams _$GetChatParamsFromJson(Map<String, dynamic> json) =>
     GetChatParams(
-      lookIntoFuture: $enumDecode(
-        _$GetChatParamsSwitchEnumMap,
-        json['lookIntoFuture'],
-      ),
+      lookIntoFuture:
+          $enumDecode(_$GetChatParamsSwitchEnumMap, json['lookIntoFuture']),
       limit: (json['limit'] as num?)?.toInt(),
       lastKnownMessageId: (json['lastKnownMessageId'] as num?)?.toInt(),
       lastCommonReadId: (json['lastCommonReadId'] as num?)?.toInt(),
       timeout: (json['timeout'] as num?)?.toInt(),
       setReadMarker: $enumDecodeNullable(
-        _$GetChatParamsSwitchEnumMap,
-        json['setReadMarker'],
-      ),
+          _$GetChatParamsSwitchEnumMap, json['setReadMarker']),
       includeLastKnown: $enumDecodeNullable(
-        _$GetChatParamsSwitchEnumMap,
-        json['includeLastKnown'],
-      ),
+          _$GetChatParamsSwitchEnumMap, json['includeLastKnown']),
     );
 
-Map<String, dynamic> _$GetChatParamsToJson(
-  GetChatParams instance,
-) => <String, dynamic>{
-  'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
-  'limit': ?instance.limit,
-  'lastKnownMessageId': ?instance.lastKnownMessageId,
-  'lastCommonReadId': ?instance.lastCommonReadId,
-  'timeout': ?instance.timeout,
-  'setReadMarker': ?_$GetChatParamsSwitchEnumMap[instance.setReadMarker],
-  'includeLastKnown': ?_$GetChatParamsSwitchEnumMap[instance.includeLastKnown],
-};
+Map<String, dynamic> _$GetChatParamsToJson(GetChatParams instance) =>
+    <String, dynamic>{
+      'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
+      if (instance.limit case final value?) 'limit': value,
+      if (instance.lastKnownMessageId case final value?)
+        'lastKnownMessageId': value,
+      if (instance.lastCommonReadId case final value?)
+        'lastCommonReadId': value,
+      if (instance.timeout case final value?) 'timeout': value,
+      if (_$GetChatParamsSwitchEnumMap[instance.setReadMarker]
+          case final value?)
+        'setReadMarker': value,
+      if (_$GetChatParamsSwitchEnumMap[instance.includeLastKnown]
+          case final value?)
+        'includeLastKnown': value,
+    };
 
 const _$GetChatParamsSwitchEnumMap = {
   GetChatParamsSwitch.on: 1,

lib/api/marianumcloud/talk/chat/getChatResponse.g.dart

@@ -8,72 +8,70 @@ part of 'getChatResponse.dart';
 
 GetChatResponse _$GetChatResponseFromJson(Map<String, dynamic> json) =>
     GetChatResponse(
-        (json['data'] as List<dynamic>)
-            .map(
-              (e) => GetChatResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['data'] as List<dynamic>)
+          .map((e) => GetChatResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) =>
     <String, dynamic>{
-      'headers': ?instance.headers,
+      if (instance.headers case final value?) 'headers': value,
       'data': instance.data.map((e) => e.toJson()).toList(),
     };
 
 GetChatResponseObject _$GetChatResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetChatResponseObject(
-  (json['id'] as num).toInt(),
-  json['token'] as String,
-  $enumDecode(
-    _$GetRoomResponseObjectMessageActorTypeEnumMap,
-    json['actorType'],
-  ),
-  json['actorId'] as String,
-  json['actorDisplayName'] as String,
-  (json['timestamp'] as num).toInt(),
-  json['systemMessage'] as String,
-  $enumDecode(_$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
-  json['isReplyable'] as bool,
-  json['referenceId'] as String,
-  json['message'] as String,
-  _fromJson(json['messageParameters']),
-  (json['reactions'] as Map<String, dynamic>?)?.map(
-    (k, e) => MapEntry(k, (e as num).toInt()),
-  ),
-  (json['reactionsSelf'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  json['parent'] == null
-      ? null
-      : GetChatResponseObject.fromJson(json['parent'] as Map<String, dynamic>),
-);
+        Map<String, dynamic> json) =>
+    GetChatResponseObject(
+      (json['id'] as num).toInt(),
+      json['token'] as String,
+      $enumDecode(
+          _$GetRoomResponseObjectMessageActorTypeEnumMap, json['actorType']),
+      json['actorId'] as String,
+      json['actorDisplayName'] as String,
+      (json['timestamp'] as num).toInt(),
+      json['systemMessage'] as String,
+      $enumDecode(
+          _$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
+      json['isReplyable'] as bool,
+      json['referenceId'] as String,
+      json['message'] as String,
+      _fromJson(json['messageParameters']),
+      (json['reactions'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ),
+      (json['reactionsSelf'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList(),
+      json['parent'] == null
+          ? null
+          : GetChatResponseObject.fromJson(
+              json['parent'] as Map<String, dynamic>),
+    );
 
 Map<String, dynamic> _$GetChatResponseObjectToJson(
-  GetChatResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'token': instance.token,
-  'actorType':
-      _$GetRoomResponseObjectMessageActorTypeEnumMap[instance.actorType]!,
-  'actorId': instance.actorId,
-  'actorDisplayName': instance.actorDisplayName,
-  'timestamp': instance.timestamp,
-  'systemMessage': instance.systemMessage,
-  'messageType':
-      _$GetRoomResponseObjectMessageTypeEnumMap[instance.messageType]!,
-  'isReplyable': instance.isReplyable,
-  'referenceId': instance.referenceId,
-  'message': instance.message,
-  'reactions': instance.reactions,
-  'reactionsSelf': instance.reactionsSelf,
-  'messageParameters': instance.messageParameters?.map(
-    (k, e) => MapEntry(k, e.toJson()),
-  ),
-  'parent': instance.parent?.toJson(),
-};
+        GetChatResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'token': instance.token,
+      'actorType':
+          _$GetRoomResponseObjectMessageActorTypeEnumMap[instance.actorType]!,
+      'actorId': instance.actorId,
+      'actorDisplayName': instance.actorDisplayName,
+      'timestamp': instance.timestamp,
+      'systemMessage': instance.systemMessage,
+      'messageType':
+          _$GetRoomResponseObjectMessageTypeEnumMap[instance.messageType]!,
+      'isReplyable': instance.isReplyable,
+      'referenceId': instance.referenceId,
+      'message': instance.message,
+      'reactions': instance.reactions,
+      'reactionsSelf': instance.reactionsSelf,
+      'messageParameters':
+          instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
+      'parent': instance.parent?.toJson(),
+    };
 
 const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
   GetRoomResponseObjectMessageActorType.deletedUsers: 'deleted_users',
@@ -85,7 +83,6 @@ const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
 
 const _$GetRoomResponseObjectMessageTypeEnumMap = {
   GetRoomResponseObjectMessageType.comment: 'comment',
-  GetRoomResponseObjectMessageType.voiceMessage: 'voice-message',
   GetRoomResponseObjectMessageType.deletedComment: 'comment_deleted',
   GetRoomResponseObjectMessageType.system: 'system',
   GetRoomResponseObjectMessageType.command: 'command',

lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessageParams.g.dart

@@ -7,9 +7,13 @@ part of 'deleteReactMessageParams.dart';
 // **************************************************************************
 
 DeleteReactMessageParams _$DeleteReactMessageParamsFromJson(
-  Map<String, dynamic> json,
-) => DeleteReactMessageParams(json['reaction'] as String);
+        Map<String, dynamic> json) =>
+    DeleteReactMessageParams(
+      json['reaction'] as String,
+    );
 
 Map<String, dynamic> _$DeleteReactMessageParamsToJson(
-  DeleteReactMessageParams instance,
-) => <String, dynamic>{'reaction': instance.reaction};
+        DeleteReactMessageParams instance) =>
+    <String, dynamic>{
+      'reaction': instance.reaction,
+    };

lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.g.dart

@@ -7,77 +7,66 @@ part of 'getParticipantsResponse.dart';
 // **************************************************************************
 
 GetParticipantsResponse _$GetParticipantsResponseFromJson(
-  Map<String, dynamic> json,
-) =>
+        Map<String, dynamic> json) =>
     GetParticipantsResponse(
-        (json['data'] as List<dynamic>)
-            .map(
-              (e) => GetParticipantsResponseObject.fromJson(
-                e as Map<String, dynamic>,
-              ),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['data'] as List<dynamic>)
+          .map((e) =>
+              GetParticipantsResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetParticipantsResponseToJson(
-  GetParticipantsResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'data': instance.data.map((e) => e.toJson()).toList(),
-};
+        GetParticipantsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };
 
 GetParticipantsResponseObject _$GetParticipantsResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetParticipantsResponseObject(
-  (json['attendeeId'] as num).toInt(),
-  json['actorType'] as String,
-  json['actorId'] as String,
-  json['displayName'] as String,
-  $enumDecode(
-    _$GetParticipantsResponseObjectParticipantTypeEnumMap,
-    json['participantType'],
-  ),
-  (json['lastPing'] as num).toInt(),
-  $enumDecode(
-    _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
-    json['inCall'],
-  ),
-  (json['permissions'] as num).toInt(),
-  (json['attendeePermissions'] as num).toInt(),
-  json['sessionId'] as String?,
-  (json['sessionIds'] as List<dynamic>).map((e) => e as String).toList(),
-  json['status'] as String?,
-  json['statusIcon'] as String?,
-  json['statusMessage'] as String?,
-  json['roomToken'] as String?,
-);
+        Map<String, dynamic> json) =>
+    GetParticipantsResponseObject(
+      (json['attendeeId'] as num).toInt(),
+      json['actorType'] as String,
+      json['actorId'] as String,
+      json['displayName'] as String,
+      $enumDecode(_$GetParticipantsResponseObjectParticipantTypeEnumMap,
+          json['participantType']),
+      (json['lastPing'] as num).toInt(),
+      $enumDecode(_$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
+          json['inCall']),
+      (json['permissions'] as num).toInt(),
+      (json['attendeePermissions'] as num).toInt(),
+      json['sessionId'] as String?,
+      (json['sessionIds'] as List<dynamic>).map((e) => e as String).toList(),
+      json['status'] as String?,
+      json['statusIcon'] as String?,
+      json['statusMessage'] as String?,
+      json['roomToken'] as String?,
+    );
 
 Map<String, dynamic> _$GetParticipantsResponseObjectToJson(
-  GetParticipantsResponseObject instance,
-) => <String, dynamic>{
-  'attendeeId': instance.attendeeId,
-  'actorType': instance.actorType,
-  'actorId': instance.actorId,
-  'displayName': instance.displayName,
-  'participantType':
-      _$GetParticipantsResponseObjectParticipantTypeEnumMap[instance
-          .participantType]!,
-  'lastPing': instance.lastPing,
-  'inCall':
-      _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap[instance
-          .inCall]!,
-  'permissions': instance.permissions,
-  'attendeePermissions': instance.attendeePermissions,
-  'sessionId': instance.sessionId,
-  'sessionIds': instance.sessionIds,
-  'status': instance.status,
-  'statusIcon': instance.statusIcon,
-  'statusMessage': instance.statusMessage,
-  'roomToken': instance.roomToken,
-};
+        GetParticipantsResponseObject instance) =>
+    <String, dynamic>{
+      'attendeeId': instance.attendeeId,
+      'actorType': instance.actorType,
+      'actorId': instance.actorId,
+      'displayName': instance.displayName,
+      'participantType': _$GetParticipantsResponseObjectParticipantTypeEnumMap[
+          instance.participantType]!,
+      'lastPing': instance.lastPing,
+      'inCall': _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap[
+          instance.inCall]!,
+      'permissions': instance.permissions,
+      'attendeePermissions': instance.attendeePermissions,
+      'sessionId': instance.sessionId,
+      'sessionIds': instance.sessionIds,
+      'status': instance.status,
+      'statusIcon': instance.statusIcon,
+      'statusMessage': instance.statusMessage,
+      'roomToken': instance.roomToken,
+    };
 
 const _$GetParticipantsResponseObjectParticipantTypeEnumMap = {
   GetParticipantsResponseObjectParticipantType.owner: 1,

lib/api/marianumcloud/talk/getPoll/getPollState.dart

@@ -1,18 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getPollStateResponse.dart';
-
-class GetPollState extends TalkApi<GetPollStateResponse> {
-  String token;
-  int pollId;
-  GetPollState({required this.token, required this.pollId}) : super('v1/poll/$token/$pollId', null);
-
-  @override
-  GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
-}

lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart

@@ -1,50 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../../apiResponse.dart';
-
-part 'getPollStateResponse.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class GetPollStateResponse extends ApiResponse {
-  GetPollStateResponseObject data;
-
-  GetPollStateResponse(this.data);
-
-  factory GetPollStateResponse.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$GetPollStateResponseToJson(this);
-}
-
-@JsonSerializable(explicitToJson: true)
-class GetPollStateResponseObject {
-  int id;
-  String question;
-  List<String> options;
-  dynamic votes;
-  String actorType;
-  String actorId;
-  String actorDisplayName;
-  int status;
-  int resultMode;
-  int maxVotes;
-  List<int> votedSelf;
-  int? numVoters;
-  List<dynamic>? details;
-
-  GetPollStateResponseObject(
-      this.id,
-      this.question,
-      this.options,
-      this.votes,
-      this.actorType,
-      this.actorId,
-      this.actorDisplayName,
-      this.status,
-      this.resultMode,
-      this.maxVotes,
-      this.votedSelf,
-      this.numVoters,
-      this.details);
-
-  factory GetPollStateResponseObject.fromJson(Map<String, dynamic> json) => _$GetPollStateResponseObjectFromJson(json);
-  Map<String, dynamic> toJson() => _$GetPollStateResponseObjectToJson(this);
-}

lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart

@@ -1,62 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getPollStateResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetPollStateResponse _$GetPollStateResponseFromJson(
-  Map<String, dynamic> json,
-) =>
-    GetPollStateResponse(
-        GetPollStateResponseObject.fromJson(
-          json['data'] as Map<String, dynamic>,
-        ),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      );
-
-Map<String, dynamic> _$GetPollStateResponseToJson(
-  GetPollStateResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'data': instance.data.toJson(),
-};
-
-GetPollStateResponseObject _$GetPollStateResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetPollStateResponseObject(
-  (json['id'] as num).toInt(),
-  json['question'] as String,
-  (json['options'] as List<dynamic>).map((e) => e as String).toList(),
-  json['votes'],
-  json['actorType'] as String,
-  json['actorId'] as String,
-  json['actorDisplayName'] as String,
-  (json['status'] as num).toInt(),
-  (json['resultMode'] as num).toInt(),
-  (json['maxVotes'] as num).toInt(),
-  (json['votedSelf'] as List<dynamic>).map((e) => (e as num).toInt()).toList(),
-  (json['numVoters'] as num?)?.toInt(),
-  json['details'] as List<dynamic>?,
-);
-
-Map<String, dynamic> _$GetPollStateResponseObjectToJson(
-  GetPollStateResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'question': instance.question,
-  'options': instance.options,
-  'votes': instance.votes,
-  'actorType': instance.actorType,
-  'actorId': instance.actorId,
-  'actorDisplayName': instance.actorDisplayName,
-  'status': instance.status,
-  'resultMode': instance.resultMode,
-  'maxVotes': instance.maxVotes,
-  'votedSelf': instance.votedSelf,
-  'numVoters': instance.numVoters,
-  'details': instance.details,
-};

lib/api/marianumcloud/talk/getReactions/getReactionsResponse.g.dart

@@ -7,53 +7,47 @@ part of 'getReactionsResponse.dart';
 // **************************************************************************
 
 GetReactionsResponse _$GetReactionsResponseFromJson(
-  Map<String, dynamic> json,
-) =>
+        Map<String, dynamic> json) =>
     GetReactionsResponse(
-        (json['data'] as Map<String, dynamic>).map(
-          (k, e) => MapEntry(
+      (json['data'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
             k,
             (e as List<dynamic>)
-                .map(
-                  (e) => GetReactionsResponseObject.fromJson(
-                    e as Map<String, dynamic>,
-                  ),
-                )
-                .toList(),
-          ),
-        ),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+                .map((e) => GetReactionsResponseObject.fromJson(
+                    e as Map<String, dynamic>))
+                .toList()),
+      ),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetReactionsResponseToJson(
-  GetReactionsResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'data': instance.data.map(
-    (k, e) => MapEntry(k, e.map((e) => e.toJson()).toList()),
-  ),
-};
+        GetReactionsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data
+          .map((k, e) => MapEntry(k, e.map((e) => e.toJson()).toList())),
+    };
 
 GetReactionsResponseObject _$GetReactionsResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetReactionsResponseObject(
-  $enumDecode(_$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
-  json['actorId'] as String,
-  json['actorDisplayName'] as String,
-  (json['timestamp'] as num).toInt(),
-);
+        Map<String, dynamic> json) =>
+    GetReactionsResponseObject(
+      $enumDecode(
+          _$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
+      json['actorId'] as String,
+      json['actorDisplayName'] as String,
+      (json['timestamp'] as num).toInt(),
+    );
 
 Map<String, dynamic> _$GetReactionsResponseObjectToJson(
-  GetReactionsResponseObject instance,
-) => <String, dynamic>{
-  'actorType':
-      _$GetReactionsResponseObjectActorTypeEnumMap[instance.actorType]!,
-  'actorId': instance.actorId,
-  'actorDisplayName': instance.actorDisplayName,
-  'timestamp': instance.timestamp,
-};
+        GetReactionsResponseObject instance) =>
+    <String, dynamic>{
+      'actorType':
+          _$GetReactionsResponseObjectActorTypeEnumMap[instance.actorType]!,
+      'actorId': instance.actorId,
+      'actorDisplayName': instance.actorDisplayName,
+      'timestamp': instance.timestamp,
+    };
 
 const _$GetReactionsResponseObjectActorTypeEnumMap = {
   GetReactionsResponseObjectActorType.guests: 'guests',

lib/api/marianumcloud/talk/reactMessage/reactMessageParams.g.dart

@@ -7,7 +7,11 @@ part of 'reactMessageParams.dart';
 // **************************************************************************
 
 ReactMessageParams _$ReactMessageParamsFromJson(Map<String, dynamic> json) =>
-    ReactMessageParams(json['reaction'] as String);
+    ReactMessageParams(
+      json['reaction'] as String,
+    );
 
 Map<String, dynamic> _$ReactMessageParamsToJson(ReactMessageParams instance) =>
-    <String, dynamic>{'reaction': instance.reaction};
+    <String, dynamic>{
+      'reaction': instance.reaction,
+    };

lib/api/marianumcloud/talk/room/getRoomParams.g.dart

@@ -9,20 +9,18 @@ part of 'getRoomParams.dart';
 GetRoomParams _$GetRoomParamsFromJson(Map<String, dynamic> json) =>
     GetRoomParams(
       noStatusUpdate: $enumDecodeNullable(
-        _$GetRoomParamsStatusUpdateEnumMap,
-        json['noStatusUpdate'],
-      ),
+          _$GetRoomParamsStatusUpdateEnumMap, json['noStatusUpdate']),
       includeStatus: json['includeStatus'] as bool?,
       modifiedSince: (json['modifiedSince'] as num?)?.toInt(),
     );
 
-Map<String, dynamic> _$GetRoomParamsToJson(
-  GetRoomParams instance,
-) => <String, dynamic>{
-  'noStatusUpdate': _$GetRoomParamsStatusUpdateEnumMap[instance.noStatusUpdate],
-  'includeStatus': GetRoomParams._format(instance.includeStatus),
-  'modifiedSince': instance.modifiedSince,
-};
+Map<String, dynamic> _$GetRoomParamsToJson(GetRoomParams instance) =>
+    <String, dynamic>{
+      'noStatusUpdate':
+          _$GetRoomParamsStatusUpdateEnumMap[instance.noStatusUpdate],
+      'includeStatus': GetRoomParams._format(instance.includeStatus),
+      'modifiedSince': instance.modifiedSince,
+    };
 
 const _$GetRoomParamsStatusUpdateEnumMap = {
   GetRoomParamsStatusUpdate.defaults: 0,

lib/api/marianumcloud/talk/room/getRoomResponse.dart

@@ -162,7 +162,6 @@ enum GetRoomResponseObjectMessageActorType {
 
 enum GetRoomResponseObjectMessageType {
   @JsonValue('comment') comment,
-  @JsonValue('voice-message') voiceMessage,
   @JsonValue('comment_deleted') deletedComment,
   @JsonValue('system') system,
   @JsonValue('command') command,

lib/api/marianumcloud/talk/room/getRoomResponse.g.dart

@@ -8,97 +8,93 @@ part of 'getRoomResponse.dart';
 
 GetRoomResponse _$GetRoomResponseFromJson(Map<String, dynamic> json) =>
     GetRoomResponse(
-        (json['data'] as List<dynamic>)
-            .map(
-              (e) => GetRoomResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['data'] as List<dynamic>)
+          .map((e) => GetRoomResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetRoomResponseToJson(GetRoomResponse instance) =>
     <String, dynamic>{
-      'headers': ?instance.headers,
+      if (instance.headers case final value?) 'headers': value,
       'data': instance.data.map((e) => e.toJson()).toList(),
     };
 
 GetRoomResponseObject _$GetRoomResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetRoomResponseObject(
-  (json['id'] as num).toInt(),
-  json['token'] as String,
-  $enumDecode(_$GetRoomResponseObjectConversationTypeEnumMap, json['type']),
-  json['name'] as String,
-  json['displayName'] as String,
-  json['description'] as String,
-  (json['participantType'] as num).toInt(),
-  (json['participantFlags'] as num).toInt(),
-  (json['readOnly'] as num).toInt(),
-  (json['listable'] as num).toInt(),
-  (json['lastPing'] as num).toInt(),
-  json['sessionId'] as String,
-  json['hasPassword'] as bool,
-  json['hasCall'] as bool,
-  (json['callFlag'] as num).toInt(),
-  json['canStartCall'] as bool,
-  json['canDeleteConversation'] as bool,
-  json['canLeaveConversation'] as bool,
-  (json['lastActivity'] as num).toInt(),
-  json['isFavorite'] as bool,
-  $enumDecode(
-    _$GetRoomResponseObjectParticipantNotificationLevelEnumMap,
-    json['notificationLevel'],
-  ),
-  (json['unreadMessages'] as num).toInt(),
-  json['unreadMention'] as bool,
-  json['unreadMentionDirect'] as bool,
-  (json['lastReadMessage'] as num).toInt(),
-  (json['lastCommonReadMessage'] as num).toInt(),
-  GetChatResponseObject.fromJson(json['lastMessage'] as Map<String, dynamic>),
-  json['status'] as String?,
-  json['statusIcon'] as String?,
-  json['statusMessage'] as String?,
-)..sort = json['sort'] as String?;
+        Map<String, dynamic> json) =>
+    GetRoomResponseObject(
+      (json['id'] as num).toInt(),
+      json['token'] as String,
+      $enumDecode(_$GetRoomResponseObjectConversationTypeEnumMap, json['type']),
+      json['name'] as String,
+      json['displayName'] as String,
+      json['description'] as String,
+      (json['participantType'] as num).toInt(),
+      (json['participantFlags'] as num).toInt(),
+      (json['readOnly'] as num).toInt(),
+      (json['listable'] as num).toInt(),
+      (json['lastPing'] as num).toInt(),
+      json['sessionId'] as String,
+      json['hasPassword'] as bool,
+      json['hasCall'] as bool,
+      (json['callFlag'] as num).toInt(),
+      json['canStartCall'] as bool,
+      json['canDeleteConversation'] as bool,
+      json['canLeaveConversation'] as bool,
+      (json['lastActivity'] as num).toInt(),
+      json['isFavorite'] as bool,
+      $enumDecode(_$GetRoomResponseObjectParticipantNotificationLevelEnumMap,
+          json['notificationLevel']),
+      (json['unreadMessages'] as num).toInt(),
+      json['unreadMention'] as bool,
+      json['unreadMentionDirect'] as bool,
+      (json['lastReadMessage'] as num).toInt(),
+      (json['lastCommonReadMessage'] as num).toInt(),
+      GetChatResponseObject.fromJson(
+          json['lastMessage'] as Map<String, dynamic>),
+      json['status'] as String?,
+      json['statusIcon'] as String?,
+      json['statusMessage'] as String?,
+    )..sort = json['sort'] as String?;
 
 Map<String, dynamic> _$GetRoomResponseObjectToJson(
-  GetRoomResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'token': instance.token,
-  'type': _$GetRoomResponseObjectConversationTypeEnumMap[instance.type]!,
-  'name': instance.name,
-  'displayName': instance.displayName,
-  'description': instance.description,
-  'participantType': instance.participantType,
-  'participantFlags': instance.participantFlags,
-  'readOnly': instance.readOnly,
-  'listable': instance.listable,
-  'lastPing': instance.lastPing,
-  'sessionId': instance.sessionId,
-  'hasPassword': instance.hasPassword,
-  'hasCall': instance.hasCall,
-  'callFlag': instance.callFlag,
-  'canStartCall': instance.canStartCall,
-  'canDeleteConversation': instance.canDeleteConversation,
-  'canLeaveConversation': instance.canLeaveConversation,
-  'lastActivity': instance.lastActivity,
-  'isFavorite': instance.isFavorite,
-  'notificationLevel':
-      _$GetRoomResponseObjectParticipantNotificationLevelEnumMap[instance
-          .notificationLevel]!,
-  'unreadMessages': instance.unreadMessages,
-  'unreadMention': instance.unreadMention,
-  'unreadMentionDirect': instance.unreadMentionDirect,
-  'lastReadMessage': instance.lastReadMessage,
-  'lastCommonReadMessage': instance.lastCommonReadMessage,
-  'lastMessage': instance.lastMessage.toJson(),
-  'status': instance.status,
-  'statusIcon': instance.statusIcon,
-  'statusMessage': instance.statusMessage,
-  'sort': instance.sort,
-};
+        GetRoomResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'token': instance.token,
+      'type': _$GetRoomResponseObjectConversationTypeEnumMap[instance.type]!,
+      'name': instance.name,
+      'displayName': instance.displayName,
+      'description': instance.description,
+      'participantType': instance.participantType,
+      'participantFlags': instance.participantFlags,
+      'readOnly': instance.readOnly,
+      'listable': instance.listable,
+      'lastPing': instance.lastPing,
+      'sessionId': instance.sessionId,
+      'hasPassword': instance.hasPassword,
+      'hasCall': instance.hasCall,
+      'callFlag': instance.callFlag,
+      'canStartCall': instance.canStartCall,
+      'canDeleteConversation': instance.canDeleteConversation,
+      'canLeaveConversation': instance.canLeaveConversation,
+      'lastActivity': instance.lastActivity,
+      'isFavorite': instance.isFavorite,
+      'notificationLevel':
+          _$GetRoomResponseObjectParticipantNotificationLevelEnumMap[
+              instance.notificationLevel]!,
+      'unreadMessages': instance.unreadMessages,
+      'unreadMention': instance.unreadMention,
+      'unreadMentionDirect': instance.unreadMentionDirect,
+      'lastReadMessage': instance.lastReadMessage,
+      'lastCommonReadMessage': instance.lastCommonReadMessage,
+      'lastMessage': instance.lastMessage.toJson(),
+      'status': instance.status,
+      'statusIcon': instance.statusIcon,
+      'statusMessage': instance.statusMessage,
+      'sort': instance.sort,
+    };
 
 const _$GetRoomResponseObjectConversationTypeEnumMap = {
   GetRoomResponseObjectConversationType.oneToOne: 1,

lib/api/marianumcloud/talk/sendMessage/sendMessageParams.g.dart

@@ -15,5 +15,5 @@ SendMessageParams _$SendMessageParamsFromJson(Map<String, dynamic> json) =>
 Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) =>
     <String, dynamic>{
       'message': instance.message,
-      'replyTo': ?instance.replyTo,
+      if (instance.replyTo case final value?) 'replyTo': value,
     };

lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.g.dart

@@ -12,5 +12,7 @@ SetReadMarkerParams _$SetReadMarkerParamsFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$SetReadMarkerParamsToJson(
-  SetReadMarkerParams instance,
-) => <String, dynamic>{'lastReadMessage': instance.lastReadMessage};
+        SetReadMarkerParams instance) =>
+    <String, dynamic>{
+      'lastReadMessage': instance.lastReadMessage,
+    };

lib/api/marianumcloud/talk/votePoll/votePoll.dart

@@ -1,26 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../getPoll/getPollStateResponse.dart';
-import '../talkApi.dart';
-import 'votePollParams.dart';
-
-@Deprecated('VotePoll is broken')
-class VotePoll extends TalkApi {
-  String token;
-  int pollId;
-  VotePoll({required this.token, required this.pollId, required VotePollParams params}) : super('v1/poll/$token/$pollId', params);
-
-  @override
-  GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
-
-  @override
-  Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(body is VotePollParams) {
-      return http.post(uri, headers: headers, body: body.toJson().toString());
-    }
-    return null;
-  }
-}

lib/api/marianumcloud/talk/votePoll/votePollParams.dart

@@ -1,15 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-import '../../../apiParams.dart';
-
-part 'votePollParams.g.dart';
-
-@JsonSerializable()
-@Deprecated('VotePoll is broken')
-class VotePollParams extends ApiParams {
-  List<int> optionIds;
-
-  VotePollParams({required this.optionIds});
-  factory VotePollParams.fromJson(Map<String, dynamic> json) => _$VotePollParamsFromJson(json);
-  Map<String, dynamic> toJson() => _$VotePollParamsToJson(this);
-}

lib/api/marianumcloud/talk/votePoll/votePollParams.g.dart

@@ -1,17 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'votePollParams.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-VotePollParams _$VotePollParamsFromJson(Map<String, dynamic> json) =>
-    VotePollParams(
-      optionIds: (json['optionIds'] as List<dynamic>)
-          .map((e) => (e as num).toInt())
-          .toList(),
-    );
-
-Map<String, dynamic> _$VotePollParamsToJson(VotePollParams instance) =>
-    <String, dynamic>{'optionIds': instance.optionIds};

lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileResponse.g.dart

@@ -7,9 +7,13 @@ part of 'downloadFileResponse.dart';
 // **************************************************************************
 
 DownloadFileResponse _$DownloadFileResponseFromJson(
-  Map<String, dynamic> json,
-) => DownloadFileResponse(json['path'] as String);
+        Map<String, dynamic> json) =>
+    DownloadFileResponse(
+      json['path'] as String,
+    );
 
 Map<String, dynamic> _$DownloadFileResponseToJson(
-  DownloadFileResponse instance,
-) => <String, dynamic>{'path': instance.path};
+        DownloadFileResponse instance) =>
+    <String, dynamic>{
+      'path': instance.path,
+    };

lib/api/marianumcloud/webdav/queries/listFiles/listFilesParams.g.dart

@@ -7,7 +7,11 @@ part of 'listFilesParams.dart';
 // **************************************************************************
 
 ListFilesParams _$ListFilesParamsFromJson(Map<String, dynamic> json) =>
-    ListFilesParams(json['path'] as String);
+    ListFilesParams(
+      json['path'] as String,
+    );
 
 Map<String, dynamic> _$ListFilesParamsToJson(ListFilesParams instance) =>
-    <String, dynamic>{'path': instance.path};
+    <String, dynamic>{
+      'path': instance.path,
+    };

lib/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.g.dart

@@ -8,16 +8,15 @@ part of 'listFilesResponse.dart';
 
 ListFilesResponse _$ListFilesResponseFromJson(Map<String, dynamic> json) =>
     ListFilesResponse(
-        (json['files'] as List<dynamic>)
-            .map((e) => CacheableFile.fromJson(e as Map<String, dynamic>))
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['files'] as List<dynamic>)
+          .map((e) => CacheableFile.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$ListFilesResponseToJson(ListFilesResponse instance) =>
     <String, dynamic>{
-      'headers': ?instance.headers,
+      if (instance.headers case final value?) 'headers': value,
       'files': instance.files.map((e) => e.toJson()).toList(),
     };

lib/api/mhsl/breaker/getBreakers/getBreakersResponse.g.dart

@@ -8,43 +8,38 @@ part of 'getBreakersResponse.dart';
 
 GetBreakersResponse _$GetBreakersResponseFromJson(Map<String, dynamic> json) =>
     GetBreakersResponse(
-        GetBreakersReponseObject.fromJson(
-          json['global'] as Map<String, dynamic>,
-        ),
-        (json['regional'] as Map<String, dynamic>).map(
-          (k, e) => MapEntry(
-            k,
-            GetBreakersReponseObject.fromJson(e as Map<String, dynamic>),
-          ),
-        ),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      GetBreakersReponseObject.fromJson(json['global'] as Map<String, dynamic>),
+      (json['regional'] as Map<String, dynamic>).map(
+        (k, e) => MapEntry(
+            k, GetBreakersReponseObject.fromJson(e as Map<String, dynamic>)),
+      ),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetBreakersResponseToJson(
-  GetBreakersResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'global': instance.global.toJson(),
-  'regional': instance.regional.map((k, e) => MapEntry(k, e.toJson())),
-};
+        GetBreakersResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'global': instance.global.toJson(),
+      'regional': instance.regional.map((k, e) => MapEntry(k, e.toJson())),
+    };
 
 GetBreakersReponseObject _$GetBreakersReponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetBreakersReponseObject(
-  (json['areas'] as List<dynamic>)
-      .map((e) => $enumDecode(_$BreakerAreaEnumMap, e))
-      .toList(),
-  json['message'] as String,
-);
+        Map<String, dynamic> json) =>
+    GetBreakersReponseObject(
+      (json['areas'] as List<dynamic>)
+          .map((e) => $enumDecode(_$BreakerAreaEnumMap, e))
+          .toList(),
+      json['message'] as String,
+    );
 
 Map<String, dynamic> _$GetBreakersReponseObjectToJson(
-  GetBreakersReponseObject instance,
-) => <String, dynamic>{
-  'areas': instance.areas.map((e) => _$BreakerAreaEnumMap[e]!).toList(),
-  'message': instance.message,
-};
+        GetBreakersReponseObject instance) =>
+    <String, dynamic>{
+      'areas': instance.areas.map((e) => _$BreakerAreaEnumMap[e]!).toList(),
+      'message': instance.message,
+    };
 
 const _$BreakerAreaEnumMap = {
   BreakerArea.global: 'GLOBAL',

lib/api/mhsl/customTimetableEvent/add/addCustomTimetableEventParams.g.dart

@@ -7,12 +7,15 @@ part of 'addCustomTimetableEventParams.dart';
 // **************************************************************************
 
 AddCustomTimetableEventParams _$AddCustomTimetableEventParamsFromJson(
-  Map<String, dynamic> json,
-) => AddCustomTimetableEventParams(
-  json['user'] as String,
-  CustomTimetableEvent.fromJson(json['event'] as Map<String, dynamic>),
-);
+        Map<String, dynamic> json) =>
+    AddCustomTimetableEventParams(
+      json['user'] as String,
+      CustomTimetableEvent.fromJson(json['event'] as Map<String, dynamic>),
+    );
 
 Map<String, dynamic> _$AddCustomTimetableEventParamsToJson(
-  AddCustomTimetableEventParams instance,
-) => <String, dynamic>{'user': instance.user, 'event': instance.event.toJson()};
+        AddCustomTimetableEventParams instance) =>
+    <String, dynamic>{
+      'user': instance.user,
+      'event': instance.event.toJson(),
+    };

lib/api/mhsl/customTimetableEvent/customTimetableEvent.g.dart

@@ -7,29 +7,29 @@ part of 'customTimetableEvent.dart';
 // **************************************************************************
 
 CustomTimetableEvent _$CustomTimetableEventFromJson(
-  Map<String, dynamic> json,
-) => CustomTimetableEvent(
-  id: json['id'] as String,
-  title: json['title'] as String,
-  description: json['description'] as String,
-  startDate: MhslApi.dateTimeFromJson(json['startDate'] as String),
-  endDate: MhslApi.dateTimeFromJson(json['endDate'] as String),
-  color: json['color'] as String?,
-  rrule: json['rrule'] as String,
-  createdAt: MhslApi.dateTimeFromJson(json['createdAt'] as String),
-  updatedAt: MhslApi.dateTimeFromJson(json['updatedAt'] as String),
-);
+        Map<String, dynamic> json) =>
+    CustomTimetableEvent(
+      id: json['id'] as String,
+      title: json['title'] as String,
+      description: json['description'] as String,
+      startDate: MhslApi.dateTimeFromJson(json['startDate'] as String),
+      endDate: MhslApi.dateTimeFromJson(json['endDate'] as String),
+      color: json['color'] as String?,
+      rrule: json['rrule'] as String,
+      createdAt: MhslApi.dateTimeFromJson(json['createdAt'] as String),
+      updatedAt: MhslApi.dateTimeFromJson(json['updatedAt'] as String),
+    );
 
 Map<String, dynamic> _$CustomTimetableEventToJson(
-  CustomTimetableEvent instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'title': instance.title,
-  'description': instance.description,
-  'startDate': MhslApi.dateTimeToJson(instance.startDate),
-  'endDate': MhslApi.dateTimeToJson(instance.endDate),
-  'color': instance.color,
-  'rrule': instance.rrule,
-  'createdAt': MhslApi.dateTimeToJson(instance.createdAt),
-  'updatedAt': MhslApi.dateTimeToJson(instance.updatedAt),
-};
+        CustomTimetableEvent instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'title': instance.title,
+      'description': instance.description,
+      'startDate': MhslApi.dateTimeToJson(instance.startDate),
+      'endDate': MhslApi.dateTimeToJson(instance.endDate),
+      'color': instance.color,
+      'rrule': instance.rrule,
+      'createdAt': MhslApi.dateTimeToJson(instance.createdAt),
+      'updatedAt': MhslApi.dateTimeToJson(instance.updatedAt),
+    };

lib/api/mhsl/customTimetableEvent/get/getCustomTimetableEventParams.g.dart

@@ -7,9 +7,13 @@ part of 'getCustomTimetableEventParams.dart';
 // **************************************************************************
 
 GetCustomTimetableEventParams _$GetCustomTimetableEventParamsFromJson(
-  Map<String, dynamic> json,
-) => GetCustomTimetableEventParams(json['user'] as String);
+        Map<String, dynamic> json) =>
+    GetCustomTimetableEventParams(
+      json['user'] as String,
+    );
 
 Map<String, dynamic> _$GetCustomTimetableEventParamsToJson(
-  GetCustomTimetableEventParams instance,
-) => <String, dynamic>{'user': instance.user};
+        GetCustomTimetableEventParams instance) =>
+    <String, dynamic>{
+      'user': instance.user,
+    };

lib/api/mhsl/customTimetableEvent/get/getCustomTimetableEventResponse.g.dart

@@ -7,19 +7,18 @@ part of 'getCustomTimetableEventResponse.dart';
 // **************************************************************************
 
 GetCustomTimetableEventResponse _$GetCustomTimetableEventResponseFromJson(
-  Map<String, dynamic> json,
-) =>
+        Map<String, dynamic> json) =>
     GetCustomTimetableEventResponse(
-        (json['events'] as List<dynamic>)
-            .map(
-              (e) => CustomTimetableEvent.fromJson(e as Map<String, dynamic>),
-            )
-            .toList(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['events'] as List<dynamic>)
+          .map((e) => CustomTimetableEvent.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetCustomTimetableEventResponseToJson(
-  GetCustomTimetableEventResponse instance,
-) => <String, dynamic>{'headers': ?instance.headers, 'events': instance.events};
+        GetCustomTimetableEventResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'events': instance.events,
+    };

lib/api/mhsl/customTimetableEvent/remove/removeCustomTimetableEventParams.g.dart

@@ -7,9 +7,13 @@ part of 'removeCustomTimetableEventParams.dart';
 // **************************************************************************
 
 RemoveCustomTimetableEventParams _$RemoveCustomTimetableEventParamsFromJson(
-  Map<String, dynamic> json,
-) => RemoveCustomTimetableEventParams(json['id'] as String);
+        Map<String, dynamic> json) =>
+    RemoveCustomTimetableEventParams(
+      json['id'] as String,
+    );
 
 Map<String, dynamic> _$RemoveCustomTimetableEventParamsToJson(
-  RemoveCustomTimetableEventParams instance,
-) => <String, dynamic>{'id': instance.id};
+        RemoveCustomTimetableEventParams instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+    };

lib/api/mhsl/customTimetableEvent/update/updateCustomTimetableEventParams.g.dart

@@ -7,12 +7,15 @@ part of 'updateCustomTimetableEventParams.dart';
 // **************************************************************************
 
 UpdateCustomTimetableEventParams _$UpdateCustomTimetableEventParamsFromJson(
-  Map<String, dynamic> json,
-) => UpdateCustomTimetableEventParams(
-  json['id'] as String,
-  CustomTimetableEvent.fromJson(json['event'] as Map<String, dynamic>),
-);
+        Map<String, dynamic> json) =>
+    UpdateCustomTimetableEventParams(
+      json['id'] as String,
+      CustomTimetableEvent.fromJson(json['event'] as Map<String, dynamic>),
+    );
 
 Map<String, dynamic> _$UpdateCustomTimetableEventParamsToJson(
-  UpdateCustomTimetableEventParams instance,
-) => <String, dynamic>{'id': instance.id, 'event': instance.event.toJson()};
+        UpdateCustomTimetableEventParams instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'event': instance.event.toJson(),
+    };

lib/api/mhsl/notify/register/notifyRegisterParams.g.dart

@@ -7,17 +7,17 @@ part of 'notifyRegisterParams.dart';
 // **************************************************************************
 
 NotifyRegisterParams _$NotifyRegisterParamsFromJson(
-  Map<String, dynamic> json,
-) => NotifyRegisterParams(
-  username: json['username'] as String,
-  password: json['password'] as String,
-  fcmToken: json['fcmToken'] as String,
-);
+        Map<String, dynamic> json) =>
+    NotifyRegisterParams(
+      username: json['username'] as String,
+      password: json['password'] as String,
+      fcmToken: json['fcmToken'] as String,
+    );
 
 Map<String, dynamic> _$NotifyRegisterParamsToJson(
-  NotifyRegisterParams instance,
-) => <String, dynamic>{
-  'username': instance.username,
-  'password': instance.password,
-  'fcmToken': instance.fcmToken,
-};
+        NotifyRegisterParams instance) =>
+    <String, dynamic>{
+      'username': instance.username,
+      'password': instance.password,
+      'fcmToken': instance.fcmToken,
+    };

lib/api/mhsl/server/userIndex/update/updateUserIndexParams.g.dart

@@ -7,21 +7,21 @@ part of 'updateUserIndexParams.dart';
 // **************************************************************************
 
 UpdateUserIndexParams _$UpdateUserIndexParamsFromJson(
-  Map<String, dynamic> json,
-) => UpdateUserIndexParams(
-  user: json['user'] as String,
-  username: json['username'] as String,
-  device: json['device'] as String,
-  appVersion: (json['appVersion'] as num).toInt(),
-  deviceInfo: json['deviceInfo'] as String,
-);
+        Map<String, dynamic> json) =>
+    UpdateUserIndexParams(
+      user: json['user'] as String,
+      username: json['username'] as String,
+      device: json['device'] as String,
+      appVersion: (json['appVersion'] as num).toInt(),
+      deviceInfo: json['deviceInfo'] as String,
+    );
 
 Map<String, dynamic> _$UpdateUserIndexParamsToJson(
-  UpdateUserIndexParams instance,
-) => <String, dynamic>{
-  'user': instance.user,
-  'username': instance.username,
-  'device': instance.device,
-  'appVersion': instance.appVersion,
-  'deviceInfo': instance.deviceInfo,
-};
+        UpdateUserIndexParams instance) =>
+    <String, dynamic>{
+      'user': instance.user,
+      'username': instance.username,
+      'device': instance.device,
+      'appVersion': instance.appVersion,
+      'deviceInfo': instance.deviceInfo,
+    };

lib/api/webuntis/queries/authenticate/authenticateParams.g.dart

@@ -13,4 +13,7 @@ AuthenticateParams _$AuthenticateParamsFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$AuthenticateParamsToJson(AuthenticateParams instance) =>
-    <String, dynamic>{'user': instance.user, 'password': instance.password};
+    <String, dynamic>{
+      'user': instance.user,
+      'password': instance.password,
+    };

lib/api/webuntis/queries/authenticate/authenticateResponse.g.dart

@@ -7,24 +7,22 @@ part of 'authenticateResponse.dart';
 // **************************************************************************
 
 AuthenticateResponse _$AuthenticateResponseFromJson(
-  Map<String, dynamic> json,
-) =>
+        Map<String, dynamic> json) =>
     AuthenticateResponse(
-        json['sessionId'] as String,
-        (json['personType'] as num).toInt(),
-        (json['personId'] as num).toInt(),
-        (json['klasseId'] as num).toInt(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      json['sessionId'] as String,
+      (json['personType'] as num).toInt(),
+      (json['personId'] as num).toInt(),
+      (json['klasseId'] as num).toInt(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$AuthenticateResponseToJson(
-  AuthenticateResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'sessionId': instance.sessionId,
-  'personType': instance.personType,
-  'personId': instance.personId,
-  'klasseId': instance.klasseId,
-};
+        AuthenticateResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'sessionId': instance.sessionId,
+      'personType': instance.personType,
+      'personId': instance.personId,
+      'klasseId': instance.klasseId,
+    };

lib/api/webuntis/queries/getHolidays/getHolidaysResponse.g.dart

@@ -8,40 +8,37 @@ part of 'getHolidaysResponse.dart';
 
 GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
     GetHolidaysResponse(
-        (json['result'] as List<dynamic>)
-            .map(
-              (e) =>
-                  GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['result'] as List<dynamic>)
+          .map((e) =>
+              GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetHolidaysResponseToJson(
-  GetHolidaysResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'result': instance.result.map((e) => e.toJson()).toList(),
-};
+        GetHolidaysResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };
 
 GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetHolidaysResponseObject(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longName'] as String,
-  (json['startDate'] as num).toInt(),
-  (json['endDate'] as num).toInt(),
-);
+        Map<String, dynamic> json) =>
+    GetHolidaysResponseObject(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longName'] as String,
+      (json['startDate'] as num).toInt(),
+      (json['endDate'] as num).toInt(),
+    );
 
 Map<String, dynamic> _$GetHolidaysResponseObjectToJson(
-  GetHolidaysResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longName': instance.longName,
-  'startDate': instance.startDate,
-  'endDate': instance.endDate,
-};
+        GetHolidaysResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longName': instance.longName,
+      'startDate': instance.startDate,
+      'endDate': instance.endDate,
+    };

lib/api/webuntis/queries/getRooms/getRoomsResponse.g.dart

@@ -8,38 +8,36 @@ part of 'getRoomsResponse.dart';
 
 GetRoomsResponse _$GetRoomsResponseFromJson(Map<String, dynamic> json) =>
     GetRoomsResponse(
-        (json['result'] as List<dynamic>)
-            .map(
-              (e) => GetRoomsResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['result'] as List<dynamic>)
+          .map(
+              (e) => GetRoomsResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetRoomsResponseToJson(GetRoomsResponse instance) =>
     <String, dynamic>{
-      'headers': ?instance.headers,
+      if (instance.headers case final value?) 'headers': value,
       'result': instance.result.map((e) => e.toJson()).toList(),
     };
 
 GetRoomsResponseObject _$GetRoomsResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetRoomsResponseObject(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longName'] as String,
-  json['active'] as bool,
-  json['building'] as String,
-);
+        Map<String, dynamic> json) =>
+    GetRoomsResponseObject(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longName'] as String,
+      json['active'] as bool,
+      json['building'] as String,
+    );
 
 Map<String, dynamic> _$GetRoomsResponseObjectToJson(
-  GetRoomsResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longName': instance.longName,
-  'active': instance.active,
-  'building': instance.building,
-};
+        GetRoomsResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longName': instance.longName,
+      'active': instance.active,
+      'building': instance.building,
+    };

lib/api/webuntis/queries/getSubjects/getSubjectsResponse.g.dart

@@ -8,40 +8,37 @@ part of 'getSubjectsResponse.dart';
 
 GetSubjectsResponse _$GetSubjectsResponseFromJson(Map<String, dynamic> json) =>
     GetSubjectsResponse(
-        (json['result'] as List<dynamic>)
-            .map(
-              (e) =>
-                  GetSubjectsResponseObject.fromJson(e as Map<String, dynamic>),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['result'] as List<dynamic>)
+          .map((e) =>
+              GetSubjectsResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetSubjectsResponseToJson(
-  GetSubjectsResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'result': instance.result.map((e) => e.toJson()).toList(),
-};
+        GetSubjectsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };
 
 GetSubjectsResponseObject _$GetSubjectsResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetSubjectsResponseObject(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longName'] as String,
-  json['alternateName'] as String,
-  json['active'] as bool,
-);
+        Map<String, dynamic> json) =>
+    GetSubjectsResponseObject(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longName'] as String,
+      json['alternateName'] as String,
+      json['active'] as bool,
+    );
 
 Map<String, dynamic> _$GetSubjectsResponseObjectToJson(
-  GetSubjectsResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longName': instance.longName,
-  'alternateName': instance.alternateName,
-  'active': instance.active,
-};
+        GetSubjectsResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longName': instance.longName,
+      'alternateName': instance.alternateName,
+      'active': instance.active,
+    };

lib/api/webuntis/queries/getTimetable/getTimetableParams.g.dart

@@ -9,68 +9,78 @@ part of 'getTimetableParams.dart';
 GetTimetableParams _$GetTimetableParamsFromJson(Map<String, dynamic> json) =>
     GetTimetableParams(
       options: GetTimetableParamsOptions.fromJson(
-        json['options'] as Map<String, dynamic>,
-      ),
+          json['options'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$GetTimetableParamsToJson(GetTimetableParams instance) =>
-    <String, dynamic>{'options': instance.options.toJson()};
+    <String, dynamic>{
+      'options': instance.options.toJson(),
+    };
 
 GetTimetableParamsOptions _$GetTimetableParamsOptionsFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableParamsOptions(
-  element: GetTimetableParamsOptionsElement.fromJson(
-    json['element'] as Map<String, dynamic>,
-  ),
-  startDate: (json['startDate'] as num?)?.toInt(),
-  endDate: (json['endDate'] as num?)?.toInt(),
-  onlyBaseTimetable: json['onlyBaseTimetable'] as bool?,
-  showBooking: json['showBooking'] as bool?,
-  showInfo: json['showInfo'] as bool?,
-  showSubstText: json['showSubstText'] as bool?,
-  showLsText: json['showLsText'] as bool?,
-  showLsNumber: json['showLsNumber'] as bool?,
-  showStudentgroup: json['showStudentgroup'] as bool?,
-  klasseFields: (json['klasseFields'] as List<dynamic>?)
-      ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
-      .toList(),
-  roomFields: (json['roomFields'] as List<dynamic>?)
-      ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
-      .toList(),
-  subjectFields: (json['subjectFields'] as List<dynamic>?)
-      ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
-      .toList(),
-  teacherFields: (json['teacherFields'] as List<dynamic>?)
-      ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
-      .toList(),
-);
+        Map<String, dynamic> json) =>
+    GetTimetableParamsOptions(
+      element: GetTimetableParamsOptionsElement.fromJson(
+          json['element'] as Map<String, dynamic>),
+      startDate: (json['startDate'] as num?)?.toInt(),
+      endDate: (json['endDate'] as num?)?.toInt(),
+      onlyBaseTimetable: json['onlyBaseTimetable'] as bool?,
+      showBooking: json['showBooking'] as bool?,
+      showInfo: json['showInfo'] as bool?,
+      showSubstText: json['showSubstText'] as bool?,
+      showLsText: json['showLsText'] as bool?,
+      showLsNumber: json['showLsNumber'] as bool?,
+      showStudentgroup: json['showStudentgroup'] as bool?,
+      klasseFields: (json['klasseFields'] as List<dynamic>?)
+          ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
+          .toList(),
+      roomFields: (json['roomFields'] as List<dynamic>?)
+          ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
+          .toList(),
+      subjectFields: (json['subjectFields'] as List<dynamic>?)
+          ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
+          .toList(),
+      teacherFields: (json['teacherFields'] as List<dynamic>?)
+          ?.map((e) => $enumDecode(_$GetTimetableParamsOptionsFieldsEnumMap, e))
+          .toList(),
+    );
 
 Map<String, dynamic> _$GetTimetableParamsOptionsToJson(
-  GetTimetableParamsOptions instance,
-) => <String, dynamic>{
-  'element': instance.element.toJson(),
-  'startDate': ?instance.startDate,
-  'endDate': ?instance.endDate,
-  'onlyBaseTimetable': ?instance.onlyBaseTimetable,
-  'showBooking': ?instance.showBooking,
-  'showInfo': ?instance.showInfo,
-  'showSubstText': ?instance.showSubstText,
-  'showLsText': ?instance.showLsText,
-  'showLsNumber': ?instance.showLsNumber,
-  'showStudentgroup': ?instance.showStudentgroup,
-  'klasseFields': ?instance.klasseFields
-      ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-      .toList(),
-  'roomFields': ?instance.roomFields
-      ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-      .toList(),
-  'subjectFields': ?instance.subjectFields
-      ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-      .toList(),
-  'teacherFields': ?instance.teacherFields
-      ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-      .toList(),
-};
+        GetTimetableParamsOptions instance) =>
+    <String, dynamic>{
+      'element': instance.element.toJson(),
+      if (instance.startDate case final value?) 'startDate': value,
+      if (instance.endDate case final value?) 'endDate': value,
+      if (instance.onlyBaseTimetable case final value?)
+        'onlyBaseTimetable': value,
+      if (instance.showBooking case final value?) 'showBooking': value,
+      if (instance.showInfo case final value?) 'showInfo': value,
+      if (instance.showSubstText case final value?) 'showSubstText': value,
+      if (instance.showLsText case final value?) 'showLsText': value,
+      if (instance.showLsNumber case final value?) 'showLsNumber': value,
+      if (instance.showStudentgroup case final value?)
+        'showStudentgroup': value,
+      if (instance.klasseFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'klasseFields': value,
+      if (instance.roomFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'roomFields': value,
+      if (instance.subjectFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'subjectFields': value,
+      if (instance.teacherFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'teacherFields': value,
+    };
 
 const _$GetTimetableParamsOptionsFieldsEnumMap = {
   GetTimetableParamsOptionsFields.id: 'id',
@@ -80,24 +90,23 @@ const _$GetTimetableParamsOptionsFieldsEnumMap = {
 };
 
 GetTimetableParamsOptionsElement _$GetTimetableParamsOptionsElementFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableParamsOptionsElement(
-  id: (json['id'] as num).toInt(),
-  type: (json['type'] as num).toInt(),
-  keyType: $enumDecodeNullable(
-    _$GetTimetableParamsOptionsElementKeyTypeEnumMap,
-    json['keyType'],
-  ),
-);
+        Map<String, dynamic> json) =>
+    GetTimetableParamsOptionsElement(
+      id: (json['id'] as num).toInt(),
+      type: (json['type'] as num).toInt(),
+      keyType: $enumDecodeNullable(
+          _$GetTimetableParamsOptionsElementKeyTypeEnumMap, json['keyType']),
+    );
 
 Map<String, dynamic> _$GetTimetableParamsOptionsElementToJson(
-  GetTimetableParamsOptionsElement instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'type': instance.type,
-  'keyType':
-      ?_$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType],
-};
+        GetTimetableParamsOptionsElement instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'type': instance.type,
+      if (_$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType]
+          case final value?)
+        'keyType': value,
+    };
 
 const _$GetTimetableParamsOptionsElementKeyTypeEnumMap = {
   GetTimetableParamsOptionsElementKeyType.id: 'id',

lib/api/webuntis/queries/getTimetable/getTimetableResponse.g.dart

@@ -7,199 +7,184 @@ part of 'getTimetableResponse.dart';
 // **************************************************************************
 
 GetTimetableResponse _$GetTimetableResponseFromJson(
-  Map<String, dynamic> json,
-) =>
+        Map<String, dynamic> json) =>
     GetTimetableResponse(
-        (json['result'] as List<dynamic>)
-            .map(
-              (e) => GetTimetableResponseObject.fromJson(
-                e as Map<String, dynamic>,
-              ),
-            )
-            .toSet(),
-      )
-      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      (json['result'] as List<dynamic>)
+          .map((e) =>
+              GetTimetableResponseObject.fromJson(e as Map<String, dynamic>))
+          .toSet(),
+    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetTimetableResponseToJson(
-  GetTimetableResponse instance,
-) => <String, dynamic>{
-  'headers': ?instance.headers,
-  'result': instance.result.map((e) => e.toJson()).toList(),
-};
+        GetTimetableResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };
 
 GetTimetableResponseObject _$GetTimetableResponseObjectFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObject(
-  id: (json['id'] as num).toInt(),
-  date: (json['date'] as num).toInt(),
-  startTime: (json['startTime'] as num).toInt(),
-  endTime: (json['endTime'] as num).toInt(),
-  lstype: json['lstype'] as String?,
-  code: json['code'] as String?,
-  info: json['info'] as String?,
-  substText: json['substText'] as String?,
-  lstext: json['lstext'] as String?,
-  lsnumber: (json['lsnumber'] as num?)?.toInt(),
-  statflags: json['statflags'] as String?,
-  activityType: json['activityType'] as String?,
-  sg: json['sg'] as String?,
-  bkRemark: json['bkRemark'] as String?,
-  kl: (json['kl'] as List<dynamic>)
-      .map(
-        (e) =>
-            GetTimetableResponseObjectClass.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
-  te: (json['te'] as List<dynamic>)
-      .map(
-        (e) => GetTimetableResponseObjectTeacher.fromJson(
-          e as Map<String, dynamic>,
-        ),
-      )
-      .toList(),
-  su: (json['su'] as List<dynamic>)
-      .map(
-        (e) => GetTimetableResponseObjectSubject.fromJson(
-          e as Map<String, dynamic>,
-        ),
-      )
-      .toList(),
-  ro: (json['ro'] as List<dynamic>)
-      .map(
-        (e) =>
-            GetTimetableResponseObjectRoom.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
-)..bkText = json['bkText'] as String?;
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObject(
+      id: (json['id'] as num).toInt(),
+      date: (json['date'] as num).toInt(),
+      startTime: (json['startTime'] as num).toInt(),
+      endTime: (json['endTime'] as num).toInt(),
+      lstype: json['lstype'] as String?,
+      code: json['code'] as String?,
+      info: json['info'] as String?,
+      substText: json['substText'] as String?,
+      lstext: json['lstext'] as String?,
+      lsnumber: (json['lsnumber'] as num?)?.toInt(),
+      statflags: json['statflags'] as String?,
+      activityType: json['activityType'] as String?,
+      sg: json['sg'] as String?,
+      bkRemark: json['bkRemark'] as String?,
+      kl: (json['kl'] as List<dynamic>)
+          .map((e) => GetTimetableResponseObjectClass.fromJson(
+              e as Map<String, dynamic>))
+          .toList(),
+      te: (json['te'] as List<dynamic>)
+          .map((e) => GetTimetableResponseObjectTeacher.fromJson(
+              e as Map<String, dynamic>))
+          .toList(),
+      su: (json['su'] as List<dynamic>)
+          .map((e) => GetTimetableResponseObjectSubject.fromJson(
+              e as Map<String, dynamic>))
+          .toList(),
+      ro: (json['ro'] as List<dynamic>)
+          .map((e) => GetTimetableResponseObjectRoom.fromJson(
+              e as Map<String, dynamic>))
+          .toList(),
+    )..bkText = json['bkText'] as String?;
 
 Map<String, dynamic> _$GetTimetableResponseObjectToJson(
-  GetTimetableResponseObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'date': instance.date,
-  'startTime': instance.startTime,
-  'endTime': instance.endTime,
-  'lstype': instance.lstype,
-  'code': instance.code,
-  'info': instance.info,
-  'substText': instance.substText,
-  'lstext': instance.lstext,
-  'lsnumber': instance.lsnumber,
-  'statflags': instance.statflags,
-  'activityType': instance.activityType,
-  'sg': instance.sg,
-  'bkRemark': instance.bkRemark,
-  'bkText': instance.bkText,
-  'kl': instance.kl.map((e) => e.toJson()).toList(),
-  'te': instance.te.map((e) => e.toJson()).toList(),
-  'su': instance.su.map((e) => e.toJson()).toList(),
-  'ro': instance.ro.map((e) => e.toJson()).toList(),
-};
+        GetTimetableResponseObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'date': instance.date,
+      'startTime': instance.startTime,
+      'endTime': instance.endTime,
+      'lstype': instance.lstype,
+      'code': instance.code,
+      'info': instance.info,
+      'substText': instance.substText,
+      'lstext': instance.lstext,
+      'lsnumber': instance.lsnumber,
+      'statflags': instance.statflags,
+      'activityType': instance.activityType,
+      'sg': instance.sg,
+      'bkRemark': instance.bkRemark,
+      'bkText': instance.bkText,
+      'kl': instance.kl.map((e) => e.toJson()).toList(),
+      'te': instance.te.map((e) => e.toJson()).toList(),
+      'su': instance.su.map((e) => e.toJson()).toList(),
+      'ro': instance.ro.map((e) => e.toJson()).toList(),
+    };
 
 GetTimetableResponseObjectFields _$GetTimetableResponseObjectFieldsFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObjectFields(
-  (json['te'] as List<dynamic>?)
-      ?.map(
-        (e) => GetTimetableResponseObjectFieldsObject.fromJson(
-          e as Map<String, dynamic>,
-        ),
-      )
-      .toList(),
-);
-
-Map<String, dynamic> _$GetTimetableResponseObjectFieldsToJson(
-  GetTimetableResponseObjectFields instance,
-) => <String, dynamic>{'te': instance.te?.map((e) => e.toJson()).toList()};
-
-GetTimetableResponseObjectFieldsObject
-_$GetTimetableResponseObjectFieldsObjectFromJson(Map<String, dynamic> json) =>
-    GetTimetableResponseObjectFieldsObject(
-      id: (json['id'] as num?)?.toInt(),
-      name: json['name'] as String?,
-      longname: json['longname'] as String?,
-      externalkey: json['externalkey'] as String?,
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObjectFields(
+      (json['te'] as List<dynamic>?)
+          ?.map((e) => GetTimetableResponseObjectFieldsObject.fromJson(
+              e as Map<String, dynamic>))
+          .toList(),
     );
 
+Map<String, dynamic> _$GetTimetableResponseObjectFieldsToJson(
+        GetTimetableResponseObjectFields instance) =>
+    <String, dynamic>{
+      'te': instance.te?.map((e) => e.toJson()).toList(),
+    };
+
+GetTimetableResponseObjectFieldsObject
+    _$GetTimetableResponseObjectFieldsObjectFromJson(
+            Map<String, dynamic> json) =>
+        GetTimetableResponseObjectFieldsObject(
+          id: (json['id'] as num?)?.toInt(),
+          name: json['name'] as String?,
+          longname: json['longname'] as String?,
+          externalkey: json['externalkey'] as String?,
+        );
+
 Map<String, dynamic> _$GetTimetableResponseObjectFieldsObjectToJson(
-  GetTimetableResponseObjectFieldsObject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longname': instance.longname,
-  'externalkey': instance.externalkey,
-};
+        GetTimetableResponseObjectFieldsObject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longname': instance.longname,
+      'externalkey': instance.externalkey,
+    };
 
 GetTimetableResponseObjectClass _$GetTimetableResponseObjectClassFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObjectClass(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longname'] as String,
-  json['externalkey'] as String?,
-);
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObjectClass(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longname'] as String,
+      json['externalkey'] as String?,
+    );
 
 Map<String, dynamic> _$GetTimetableResponseObjectClassToJson(
-  GetTimetableResponseObjectClass instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longname': instance.longname,
-  'externalkey': instance.externalkey,
-};
+        GetTimetableResponseObjectClass instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longname': instance.longname,
+      'externalkey': instance.externalkey,
+    };
 
 GetTimetableResponseObjectTeacher _$GetTimetableResponseObjectTeacherFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObjectTeacher(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longname'] as String,
-  (json['orgid'] as num?)?.toInt(),
-  json['orgname'] as String?,
-  json['externalkey'] as String?,
-);
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObjectTeacher(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longname'] as String,
+      (json['orgid'] as num?)?.toInt(),
+      json['orgname'] as String?,
+      json['externalkey'] as String?,
+    );
 
 Map<String, dynamic> _$GetTimetableResponseObjectTeacherToJson(
-  GetTimetableResponseObjectTeacher instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longname': instance.longname,
-  'orgid': instance.orgid,
-  'orgname': instance.orgname,
-  'externalkey': instance.externalkey,
-};
+        GetTimetableResponseObjectTeacher instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longname': instance.longname,
+      'orgid': instance.orgid,
+      'orgname': instance.orgname,
+      'externalkey': instance.externalkey,
+    };
 
 GetTimetableResponseObjectSubject _$GetTimetableResponseObjectSubjectFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObjectSubject(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longname'] as String,
-);
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObjectSubject(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longname'] as String,
+    );
 
 Map<String, dynamic> _$GetTimetableResponseObjectSubjectToJson(
-  GetTimetableResponseObjectSubject instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longname': instance.longname,
-};
+        GetTimetableResponseObjectSubject instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longname': instance.longname,
+    };
 
 GetTimetableResponseObjectRoom _$GetTimetableResponseObjectRoomFromJson(
-  Map<String, dynamic> json,
-) => GetTimetableResponseObjectRoom(
-  (json['id'] as num).toInt(),
-  json['name'] as String,
-  json['longname'] as String,
-);
+        Map<String, dynamic> json) =>
+    GetTimetableResponseObjectRoom(
+      (json['id'] as num).toInt(),
+      json['name'] as String,
+      json['longname'] as String,
+    );
 
 Map<String, dynamic> _$GetTimetableResponseObjectRoomToJson(
-  GetTimetableResponseObjectRoom instance,
-) => <String, dynamic>{
-  'id': instance.id,
-  'name': instance.name,
-  'longname': instance.longname,
-};
+        GetTimetableResponseObjectRoom instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'name': instance.name,
+      'longname': instance.longname,
+    };

lib/app.dart

@@ -24,6 +24,7 @@ import 'storage/base/settingsProvider.dart';
 import 'view/pages/overhang.dart';
 
 class App extends StatefulWidget {
+  static GlobalKey appContext = GlobalKey();
   const App({super.key});
 
   @override
@@ -31,7 +32,6 @@ class App extends StatefulWidget {
 }
 
 class _AppState extends State<App> with WidgetsBindingObserver {
-
   late Timer refetchChats;
   late Timer updateTimings;
 

lib/background_tasks/scheduledTask.dart

@@ -0,0 +1,64 @@
+import 'dart:developer';
+
+import 'package:background_fetch/background_fetch.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../app.dart';
+import '../homescreen_widgets/timetable/timetableHomeWidget.dart';
+
+class ScheduledTask {
+  static final String fetchApiLastRunTimestampKey = 'fetchApiLastRunTimestamp';
+
+  static Future<void> configure() async {
+    var status = await BackgroundFetch.configure(BackgroundFetchConfig(
+        minimumFetchInterval: 15,
+        stopOnTerminate: false,
+        enableHeadless: true,
+        requiresBatteryNotLow: false,
+        requiresCharging: false,
+        requiresStorageNotLow: false,
+        requiresDeviceIdle: false,
+        requiredNetworkType: NetworkType.ANY,
+        startOnBoot: true,
+    ), (String taskId) async {
+      log('Background fetch started with id $taskId');
+      await ScheduledTask.backgroundFetch();
+      BackgroundFetch.finish(taskId);
+    }, (String taskId) async {
+      log('Background fetch stopped because of an timeout with id $taskId');
+      BackgroundFetch.finish(taskId);
+    });
+
+    log('Background Fetch-API status: $status');
+  }
+
+  // called periodically, iOS and Android
+  static Future<void> backgroundFetch() async {
+    var sp = await SharedPreferences.getInstance();
+    var history = sp.getStringList(fetchApiLastRunTimestampKey) ?? List.empty(growable: true);
+    history.add(DateTime.now().toIso8601String());
+    try {
+      TimetableHomeWidget.update(App.appContext.currentContext!);
+    } on Exception catch(e) {
+      history.add('Got Error:');
+      history.add(e.toString());
+      history.add('--- EXCEPTION END ---');
+    }
+    sp.setStringList(fetchApiLastRunTimestampKey, history.take(100).toList());
+  }
+
+  // only Android, starts when app is terminated
+  @pragma('vm:entry-point')
+  static Future<void> headless(HeadlessTask task) async {
+    var taskId = task.taskId;
+    var isTimeout = task.timeout;
+    if (isTimeout) {
+      log('Background fetch headless task timed-out: $taskId');
+      BackgroundFetch.finish(taskId);
+      return;
+    }
+    log('Background fetch headless event received.');
+    await backgroundFetch();
+    BackgroundFetch.finish(taskId);
+  }
+}

lib/homescreen_widgets/timetable/timetableHomeWidget.dart

@@ -0,0 +1,87 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:home_widget/home_widget.dart';
+import 'package:screenshot/screenshot.dart';
+import 'package:syncfusion_flutter_calendar/calendar.dart';
+
+import '../../model/accountData.dart';
+import '../../model/timetable/timetableProps.dart';
+import '../../storage/base/settingsProvider.dart';
+import '../../theming/darkAppTheme.dart';
+import '../../theming/lightAppTheme.dart';
+import '../../view/pages/timetable/calendar.dart';
+
+class TimetableHomeWidget {
+  static Future<void> update(BuildContext context) async {
+    await AccountData().waitForPopulation();
+    var data = TimetableProps();
+    var settings = SettingsProvider();
+    settings.waitForPopulation();
+    var completer = Completer();
+
+    data.addListener(() async {
+      if(completer.isCompleted) return;
+      if(data.primaryLoading()) return;
+      await _generate(data, settings);
+      if(completer.isCompleted) return;
+      completer.complete();
+    });
+
+    data.run();
+    await completer.future;
+  }
+
+  static Future<void> _generate(TimetableProps data, SettingsProvider settings) async {
+    log('Generating widget screen...');
+    var screenshotController = ScreenshotController();
+    var calendarController = CalendarController();
+    calendarController.displayDate = DateTime.now().copyWith(hour: 07, minute: 00);
+
+    var imageData = await screenshotController.captureFromWidget(
+      SizedBox(
+        height: 700,
+        width: 300,
+        child: Directionality(
+          textDirection: TextDirection.ltr,
+          child: MediaQuery(
+            data: MediaQueryData(),
+            child: MaterialApp(
+              localizationsDelegates: const [
+                ...GlobalMaterialLocalizations.delegates,
+                GlobalWidgetsLocalizations.delegate,
+              ],
+              supportedLocales: const [
+                Locale('de'),
+                Locale('en'),
+              ],
+              locale: const Locale('de'),
+              darkTheme: DarkAppTheme.theme,
+              theme: LightAppTheme.theme,
+              themeMode: settings.val().appTheme,
+              home: ClipRRect(
+                borderRadius: BorderRadius.circular(20),
+                child: Scaffold(
+                  body: Calendar(
+                    controller: calendarController,
+                    timetableProps: data,
+                    settings: settings,
+                    isHomeWidget: true,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+      delay: Duration(seconds: 5),
+    );
+
+    HomeWidget.saveWidgetData<String>('screen', base64.encode(imageData));
+    HomeWidget.updateWidget(name: 'TimetableWidget');
+    log('Widget screen successfully updated! (${imageData.length})');
+  }
+}

lib/main.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
 
+import 'package:background_fetch/background_fetch.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
@@ -17,6 +18,7 @@ import 'package:provider/provider.dart';
 
 import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import 'app.dart';
+import 'background_tasks/scheduledTask.dart';
 import 'firebase_options.dart';
 import 'model/accountData.dart';
 import 'model/accountModel.dart';
@@ -85,6 +87,8 @@ Future<void> main() async {
         child: const Main(),
       )
   );
+
+  BackgroundFetch.registerHeadlessTask(ScheduledTask.headless);
 }
 
 class Main extends StatefulWidget {
@@ -112,6 +116,7 @@ class _MainState extends State<Main> {
       Provider.of<BreakerProps>(context, listen: false).run();
     });
 
+    ScheduledTask.configure();
     super.initState();
   }
 
@@ -126,7 +131,6 @@ class _MainState extends State<Main> {
             checkerboardOffscreenLayers: devToolsSettings.checkerboardOffscreenLayers,
             checkerboardRasterCacheImages: devToolsSettings.checkerboardRasterCacheImages,
 
-            debugShowCheckedModeBanner: false,
             localizationsDelegates: const [
               ...GlobalMaterialLocalizations.delegates,
               GlobalWidgetsLocalizations.delegate,
@@ -148,7 +152,7 @@ class _MainState extends State<Main> {
                   child: Consumer<AccountModel>(
                     builder: (context, accountModel, child) {
                       switch(accountModel.state) {
-                        case AccountModelState.loggedIn: return const App();
+                        case AccountModelState.loggedIn: return App(key: App.appContext);
                         case AccountModelState.loggedOut: return const Login();
                         case AccountModelState.undefined: return const PlaceholderView(icon: Icons.timer, text: 'Daten werden geladen');
                       }

lib/state/app/infrastructure/loadableState/bloc/loadable_state_state.dart

@@ -4,7 +4,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'loadable_state_state.freezed.dart';
 
 @freezed
-abstract class LoadableStateState with _$LoadableStateState {
+class LoadableStateState with _$LoadableStateState {
   const factory LoadableStateState({
     required List<ConnectivityResult>? connections,
   }) = _LoadableStateState;

lib/state/app/infrastructure/loadableState/bloc/loadable_state_state.freezed.dart

@@ -1,5 +1,5 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,271 +9,150 @@ part of 'loadable_state_state.dart';
 // FreezedGenerator
 // **************************************************************************
 
-// dart format off
 T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
 /// @nodoc
 mixin _$LoadableStateState {
+  List<ConnectivityResult>? get connections =>
+      throw _privateConstructorUsedError;
 
- List<ConnectivityResult>? get connections;
-/// Create a copy of LoadableStateState
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$LoadableStateStateCopyWith<LoadableStateState> get copyWith => _$LoadableStateStateCopyWithImpl<LoadableStateState>(this as LoadableStateState, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoadableStateState&&const DeepCollectionEquality().equals(other.connections, connections));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(connections));
-
-@override
-String toString() {
-  return 'LoadableStateState(connections: $connections)';
-}
-
-
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $LoadableStateStateCopyWith<LoadableStateState> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract mixin class $LoadableStateStateCopyWith<$Res>  {
-  factory $LoadableStateStateCopyWith(LoadableStateState value, $Res Function(LoadableStateState) _then) = _$LoadableStateStateCopyWithImpl;
-@useResult
-$Res call({
- List<ConnectivityResult>? connections
-});
-
-
-
-
+abstract class $LoadableStateStateCopyWith<$Res> {
+  factory $LoadableStateStateCopyWith(
+          LoadableStateState value, $Res Function(LoadableStateState) then) =
+      _$LoadableStateStateCopyWithImpl<$Res, LoadableStateState>;
+  @useResult
+  $Res call({List<ConnectivityResult>? connections});
 }
+
 /// @nodoc
-class _$LoadableStateStateCopyWithImpl<$Res>
+class _$LoadableStateStateCopyWithImpl<$Res, $Val extends LoadableStateState>
     implements $LoadableStateStateCopyWith<$Res> {
-  _$LoadableStateStateCopyWithImpl(this._self, this._then);
+  _$LoadableStateStateCopyWithImpl(this._value, this._then);
 
-  final LoadableStateState _self;
-  final $Res Function(LoadableStateState) _then;
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
-/// Create a copy of LoadableStateState
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? connections = freezed,}) {
-  return _then(_self.copyWith(
-connections: freezed == connections ? _self.connections : connections // ignore: cast_nullable_to_non_nullable
-as List<ConnectivityResult>?,
-  ));
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? connections = freezed,
+  }) {
+    return _then(_value.copyWith(
+      connections: freezed == connections
+          ? _value.connections
+          : connections // ignore: cast_nullable_to_non_nullable
+              as List<ConnectivityResult>?,
+    ) as $Val);
+  }
 }
 
+/// @nodoc
+abstract class _$$LoadableStateStateImplCopyWith<$Res>
+    implements $LoadableStateStateCopyWith<$Res> {
+  factory _$$LoadableStateStateImplCopyWith(_$LoadableStateStateImpl value,
+          $Res Function(_$LoadableStateStateImpl) then) =
+      __$$LoadableStateStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({List<ConnectivityResult>? connections});
 }
 
+/// @nodoc
+class __$$LoadableStateStateImplCopyWithImpl<$Res>
+    extends _$LoadableStateStateCopyWithImpl<$Res, _$LoadableStateStateImpl>
+    implements _$$LoadableStateStateImplCopyWith<$Res> {
+  __$$LoadableStateStateImplCopyWithImpl(_$LoadableStateStateImpl _value,
+      $Res Function(_$LoadableStateStateImpl) _then)
+      : super(_value, _then);
 
-/// Adds pattern-matching-related methods to [LoadableStateState].
-extension LoadableStateStatePatterns on LoadableStateState {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _LoadableStateState value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _LoadableStateState() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _LoadableStateState value)  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableStateState():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _LoadableStateState value)?  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableStateState() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( List<ConnectivityResult>? connections)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _LoadableStateState() when $default != null:
-return $default(_that.connections);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( List<ConnectivityResult>? connections)  $default,) {final _that = this;
-switch (_that) {
-case _LoadableStateState():
-return $default(_that.connections);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( List<ConnectivityResult>? connections)?  $default,) {final _that = this;
-switch (_that) {
-case _LoadableStateState() when $default != null:
-return $default(_that.connections);case _:
-  return null;
-
-}
-}
-
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? connections = freezed,
+  }) {
+    return _then(_$LoadableStateStateImpl(
+      connections: freezed == connections
+          ? _value._connections
+          : connections // ignore: cast_nullable_to_non_nullable
+              as List<ConnectivityResult>?,
+    ));
+  }
 }
 
 /// @nodoc
 
+class _$LoadableStateStateImpl implements _LoadableStateState {
+  const _$LoadableStateStateImpl(
+      {required final List<ConnectivityResult>? connections})
+      : _connections = connections;
 
-class _LoadableStateState implements LoadableStateState {
-  const _LoadableStateState({required final  List<ConnectivityResult>? connections}): _connections = connections;
-  
+  final List<ConnectivityResult>? _connections;
+  @override
+  List<ConnectivityResult>? get connections {
+    final value = _connections;
+    if (value == null) return null;
+    if (_connections is EqualUnmodifiableListView) return _connections;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
 
- final  List<ConnectivityResult>? _connections;
-@override List<ConnectivityResult>? get connections {
-  final value = _connections;
-  if (value == null) return null;
-  if (_connections is EqualUnmodifiableListView) return _connections;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(value);
+  @override
+  String toString() {
+    return 'LoadableStateState(connections: $connections)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$LoadableStateStateImpl &&
+            const DeepCollectionEquality()
+                .equals(other._connections, _connections));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(_connections));
+
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadableStateStateImplCopyWith<_$LoadableStateStateImpl> get copyWith =>
+      __$$LoadableStateStateImplCopyWithImpl<_$LoadableStateStateImpl>(
+          this, _$identity);
 }
 
+abstract class _LoadableStateState implements LoadableStateState {
+  const factory _LoadableStateState(
+          {required final List<ConnectivityResult>? connections}) =
+      _$LoadableStateStateImpl;
 
-/// Create a copy of LoadableStateState
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$LoadableStateStateCopyWith<_LoadableStateState> get copyWith => __$LoadableStateStateCopyWithImpl<_LoadableStateState>(this, _$identity);
+  @override
+  List<ConnectivityResult>? get connections;
 
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoadableStateState&&const DeepCollectionEquality().equals(other._connections, _connections));
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadableStateStateImplCopyWith<_$LoadableStateStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
-
-
-@override
-int get hashCode => Object.hash(runtimeType,const DeepCollectionEquality().hash(_connections));
-
-@override
-String toString() {
-  return 'LoadableStateState(connections: $connections)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$LoadableStateStateCopyWith<$Res> implements $LoadableStateStateCopyWith<$Res> {
-  factory _$LoadableStateStateCopyWith(_LoadableStateState value, $Res Function(_LoadableStateState) _then) = __$LoadableStateStateCopyWithImpl;
-@override @useResult
-$Res call({
- List<ConnectivityResult>? connections
-});
-
-
-
-
-}
-/// @nodoc
-class __$LoadableStateStateCopyWithImpl<$Res>
-    implements _$LoadableStateStateCopyWith<$Res> {
-  __$LoadableStateStateCopyWithImpl(this._self, this._then);
-
-  final _LoadableStateState _self;
-  final $Res Function(_LoadableStateState) _then;
-
-/// Create a copy of LoadableStateState
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? connections = freezed,}) {
-  return _then(_LoadableStateState(
-connections: freezed == connections ? _self._connections : connections // ignore: cast_nullable_to_non_nullable
-as List<ConnectivityResult>?,
-  ));
-}
-
-
-}
-
-// dart format on

lib/state/app/infrastructure/loadableState/loadable_state.dart

@@ -5,7 +5,7 @@ import 'loading_error.dart';
 part 'loadable_state.freezed.dart';
 
 @freezed
-abstract class LoadableState<TState> with _$LoadableState<TState> {
+class LoadableState<TState> with _$LoadableState {
   const LoadableState._();
 
   const factory LoadableState({
@@ -14,7 +14,7 @@ abstract class LoadableState<TState> with _$LoadableState<TState> {
     required int? lastFetch,
     required void Function()? reFetch,
     required LoadingError? error,
-  }) = _LoadableState<TState>;
+  }) = _LoadableState;
 
   bool _hasError() => error != null;
   bool _hasData() => data != null;

lib/state/app/infrastructure/loadableState/loadable_state.freezed.dart

@@ -1,5 +1,5 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,299 +9,246 @@ part of 'loadable_state.dart';
 // FreezedGenerator
 // **************************************************************************
 
-// dart format off
 T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
 /// @nodoc
 mixin _$LoadableState<TState> {
+  bool get isLoading => throw _privateConstructorUsedError;
+  TState? get data => throw _privateConstructorUsedError;
+  int? get lastFetch => throw _privateConstructorUsedError;
+  void Function()? get reFetch => throw _privateConstructorUsedError;
+  LoadingError? get error => throw _privateConstructorUsedError;
 
- bool get isLoading; TState? get data; int? get lastFetch; void Function()? get reFetch; LoadingError? get error;
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$LoadableStateCopyWith<TState, LoadableState<TState>> get copyWith => _$LoadableStateCopyWithImpl<TState, LoadableState<TState>>(this as LoadableState<TState>, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoadableState<TState>&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.lastFetch, lastFetch) || other.lastFetch == lastFetch)&&(identical(other.reFetch, reFetch) || other.reFetch == reFetch)&&(identical(other.error, error) || other.error == error));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,isLoading,const DeepCollectionEquality().hash(data),lastFetch,reFetch,error);
-
-@override
-String toString() {
-  return 'LoadableState<$TState>(isLoading: $isLoading, data: $data, lastFetch: $lastFetch, reFetch: $reFetch, error: $error)';
-}
-
-
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $LoadableStateCopyWith<TState, LoadableState<TState>> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract mixin class $LoadableStateCopyWith<TState,$Res>  {
-  factory $LoadableStateCopyWith(LoadableState<TState> value, $Res Function(LoadableState<TState>) _then) = _$LoadableStateCopyWithImpl;
-@useResult
-$Res call({
- bool isLoading, TState? data, int? lastFetch, void Function()? reFetch, LoadingError? error
-});
-
-
-$LoadingErrorCopyWith<$Res>? get error;
+abstract class $LoadableStateCopyWith<TState, $Res> {
+  factory $LoadableStateCopyWith(LoadableState<TState> value,
+          $Res Function(LoadableState<TState>) then) =
+      _$LoadableStateCopyWithImpl<TState, $Res, LoadableState<TState>>;
+  @useResult
+  $Res call(
+      {bool isLoading,
+      TState? data,
+      int? lastFetch,
+      void Function()? reFetch,
+      LoadingError? error});
 
+  $LoadingErrorCopyWith<$Res>? get error;
 }
+
 /// @nodoc
-class _$LoadableStateCopyWithImpl<TState,$Res>
+class _$LoadableStateCopyWithImpl<TState, $Res,
+        $Val extends LoadableState<TState>>
     implements $LoadableStateCopyWith<TState, $Res> {
-  _$LoadableStateCopyWithImpl(this._self, this._then);
+  _$LoadableStateCopyWithImpl(this._value, this._then);
 
-  final LoadableState<TState> _self;
-  final $Res Function(LoadableState<TState>) _then;
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? data = freezed,Object? lastFetch = freezed,Object? reFetch = freezed,Object? error = freezed,}) {
-  return _then(_self.copyWith(
-isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
-as bool,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
-as TState?,lastFetch: freezed == lastFetch ? _self.lastFetch : lastFetch // ignore: cast_nullable_to_non_nullable
-as int?,reFetch: freezed == reFetch ? _self.reFetch : reFetch // ignore: cast_nullable_to_non_nullable
-as void Function()?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
-as LoadingError?,
-  ));
-}
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$LoadingErrorCopyWith<$Res>? get error {
-    if (_self.error == null) {
-    return null;
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isLoading = null,
+    Object? data = freezed,
+    Object? lastFetch = freezed,
+    Object? reFetch = freezed,
+    Object? error = freezed,
+  }) {
+    return _then(_value.copyWith(
+      isLoading: null == isLoading
+          ? _value.isLoading
+          : isLoading // ignore: cast_nullable_to_non_nullable
+              as bool,
+      data: freezed == data
+          ? _value.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as TState?,
+      lastFetch: freezed == lastFetch
+          ? _value.lastFetch
+          : lastFetch // ignore: cast_nullable_to_non_nullable
+              as int?,
+      reFetch: freezed == reFetch
+          ? _value.reFetch
+          : reFetch // ignore: cast_nullable_to_non_nullable
+              as void Function()?,
+      error: freezed == error
+          ? _value.error
+          : error // ignore: cast_nullable_to_non_nullable
+              as LoadingError?,
+    ) as $Val);
   }
 
-  return $LoadingErrorCopyWith<$Res>(_self.error!, (value) {
-    return _then(_self.copyWith(error: value));
-  });
-}
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $LoadingErrorCopyWith<$Res>? get error {
+    if (_value.error == null) {
+      return null;
+    }
+
+    return $LoadingErrorCopyWith<$Res>(_value.error!, (value) {
+      return _then(_value.copyWith(error: value) as $Val);
+    });
+  }
 }
 
+/// @nodoc
+abstract class _$$LoadableStateImplCopyWith<TState, $Res>
+    implements $LoadableStateCopyWith<TState, $Res> {
+  factory _$$LoadableStateImplCopyWith(_$LoadableStateImpl<TState> value,
+          $Res Function(_$LoadableStateImpl<TState>) then) =
+      __$$LoadableStateImplCopyWithImpl<TState, $Res>;
+  @override
+  @useResult
+  $Res call(
+      {bool isLoading,
+      TState? data,
+      int? lastFetch,
+      void Function()? reFetch,
+      LoadingError? error});
 
-/// Adds pattern-matching-related methods to [LoadableState].
-extension LoadableStatePatterns<TState> on LoadableState<TState> {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _LoadableState<TState> value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _LoadableState() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _LoadableState<TState> value)  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableState():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _LoadableState<TState> value)?  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableState() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool isLoading,  TState? data,  int? lastFetch,  void Function()? reFetch,  LoadingError? error)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _LoadableState() when $default != null:
-return $default(_that.isLoading,_that.data,_that.lastFetch,_that.reFetch,_that.error);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool isLoading,  TState? data,  int? lastFetch,  void Function()? reFetch,  LoadingError? error)  $default,) {final _that = this;
-switch (_that) {
-case _LoadableState():
-return $default(_that.isLoading,_that.data,_that.lastFetch,_that.reFetch,_that.error);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool isLoading,  TState? data,  int? lastFetch,  void Function()? reFetch,  LoadingError? error)?  $default,) {final _that = this;
-switch (_that) {
-case _LoadableState() when $default != null:
-return $default(_that.isLoading,_that.data,_that.lastFetch,_that.reFetch,_that.error);case _:
-  return null;
-
-}
+  @override
+  $LoadingErrorCopyWith<$Res>? get error;
 }
 
+/// @nodoc
+class __$$LoadableStateImplCopyWithImpl<TState, $Res>
+    extends _$LoadableStateCopyWithImpl<TState, $Res,
+        _$LoadableStateImpl<TState>>
+    implements _$$LoadableStateImplCopyWith<TState, $Res> {
+  __$$LoadableStateImplCopyWithImpl(_$LoadableStateImpl<TState> _value,
+      $Res Function(_$LoadableStateImpl<TState>) _then)
+      : super(_value, _then);
+
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? isLoading = null,
+    Object? data = freezed,
+    Object? lastFetch = freezed,
+    Object? reFetch = freezed,
+    Object? error = freezed,
+  }) {
+    return _then(_$LoadableStateImpl<TState>(
+      isLoading: null == isLoading
+          ? _value.isLoading
+          : isLoading // ignore: cast_nullable_to_non_nullable
+              as bool,
+      data: freezed == data
+          ? _value.data
+          : data // ignore: cast_nullable_to_non_nullable
+              as TState?,
+      lastFetch: freezed == lastFetch
+          ? _value.lastFetch
+          : lastFetch // ignore: cast_nullable_to_non_nullable
+              as int?,
+      reFetch: freezed == reFetch
+          ? _value.reFetch
+          : reFetch // ignore: cast_nullable_to_non_nullable
+              as void Function()?,
+      error: freezed == error
+          ? _value.error
+          : error // ignore: cast_nullable_to_non_nullable
+              as LoadingError?,
+    ));
+  }
 }
 
 /// @nodoc
 
+class _$LoadableStateImpl<TState> extends _LoadableState<TState> {
+  const _$LoadableStateImpl(
+      {required this.isLoading,
+      required this.data,
+      required this.lastFetch,
+      required this.reFetch,
+      required this.error})
+      : super._();
 
-class _LoadableState<TState> extends LoadableState<TState> {
-  const _LoadableState({required this.isLoading, required this.data, required this.lastFetch, required this.reFetch, required this.error}): super._();
-  
+  @override
+  final bool isLoading;
+  @override
+  final TState? data;
+  @override
+  final int? lastFetch;
+  @override
+  final void Function()? reFetch;
+  @override
+  final LoadingError? error;
 
-@override final  bool isLoading;
-@override final  TState? data;
-@override final  int? lastFetch;
-@override final  void Function()? reFetch;
-@override final  LoadingError? error;
-
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$LoadableStateCopyWith<TState, _LoadableState<TState>> get copyWith => __$LoadableStateCopyWithImpl<TState, _LoadableState<TState>>(this, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoadableState<TState>&&(identical(other.isLoading, isLoading) || other.isLoading == isLoading)&&const DeepCollectionEquality().equals(other.data, data)&&(identical(other.lastFetch, lastFetch) || other.lastFetch == lastFetch)&&(identical(other.reFetch, reFetch) || other.reFetch == reFetch)&&(identical(other.error, error) || other.error == error));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,isLoading,const DeepCollectionEquality().hash(data),lastFetch,reFetch,error);
-
-@override
-String toString() {
-  return 'LoadableState<$TState>(isLoading: $isLoading, data: $data, lastFetch: $lastFetch, reFetch: $reFetch, error: $error)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$LoadableStateCopyWith<TState,$Res> implements $LoadableStateCopyWith<TState, $Res> {
-  factory _$LoadableStateCopyWith(_LoadableState<TState> value, $Res Function(_LoadableState<TState>) _then) = __$LoadableStateCopyWithImpl;
-@override @useResult
-$Res call({
- bool isLoading, TState? data, int? lastFetch, void Function()? reFetch, LoadingError? error
-});
-
-
-@override $LoadingErrorCopyWith<$Res>? get error;
-
-}
-/// @nodoc
-class __$LoadableStateCopyWithImpl<TState,$Res>
-    implements _$LoadableStateCopyWith<TState, $Res> {
-  __$LoadableStateCopyWithImpl(this._self, this._then);
-
-  final _LoadableState<TState> _self;
-  final $Res Function(_LoadableState<TState>) _then;
-
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? isLoading = null,Object? data = freezed,Object? lastFetch = freezed,Object? reFetch = freezed,Object? error = freezed,}) {
-  return _then(_LoadableState<TState>(
-isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
-as bool,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
-as TState?,lastFetch: freezed == lastFetch ? _self.lastFetch : lastFetch // ignore: cast_nullable_to_non_nullable
-as int?,reFetch: freezed == reFetch ? _self.reFetch : reFetch // ignore: cast_nullable_to_non_nullable
-as void Function()?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
-as LoadingError?,
-  ));
-}
-
-/// Create a copy of LoadableState
-/// with the given fields replaced by the non-null parameter values.
-@override
-@pragma('vm:prefer-inline')
-$LoadingErrorCopyWith<$Res>? get error {
-    if (_self.error == null) {
-    return null;
+  @override
+  String toString() {
+    return 'LoadableState<$TState>(isLoading: $isLoading, data: $data, lastFetch: $lastFetch, reFetch: $reFetch, error: $error)';
   }
 
-  return $LoadingErrorCopyWith<$Res>(_self.error!, (value) {
-    return _then(_self.copyWith(error: value));
-  });
-}
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$LoadableStateImpl<TState> &&
+            (identical(other.isLoading, isLoading) ||
+                other.isLoading == isLoading) &&
+            const DeepCollectionEquality().equals(other.data, data) &&
+            (identical(other.lastFetch, lastFetch) ||
+                other.lastFetch == lastFetch) &&
+            (identical(other.reFetch, reFetch) || other.reFetch == reFetch) &&
+            (identical(other.error, error) || other.error == error));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, isLoading,
+      const DeepCollectionEquality().hash(data), lastFetch, reFetch, error);
+
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadableStateImplCopyWith<TState, _$LoadableStateImpl<TState>>
+      get copyWith => __$$LoadableStateImplCopyWithImpl<TState,
+          _$LoadableStateImpl<TState>>(this, _$identity);
 }
 
-// dart format on
+abstract class _LoadableState<TState> extends LoadableState<TState> {
+  const factory _LoadableState(
+      {required final bool isLoading,
+      required final TState? data,
+      required final int? lastFetch,
+      required final void Function()? reFetch,
+      required final LoadingError? error}) = _$LoadableStateImpl<TState>;
+  const _LoadableState._() : super._();
+
+  @override
+  bool get isLoading;
+  @override
+  TState? get data;
+  @override
+  int? get lastFetch;
+  @override
+  void Function()? get reFetch;
+  @override
+  LoadingError? get error;
+
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadableStateImplCopyWith<TState, _$LoadableStateImpl<TState>>
+      get copyWith => throw _privateConstructorUsedError;
+}

lib/state/app/infrastructure/loadableState/loading_error.dart

@@ -3,7 +3,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'loading_error.freezed.dart';
 
 @freezed
-abstract class LoadingError with _$LoadingError {
+class LoadingError with _$LoadingError {
   const factory LoadingError({
     required String message,
     @Default(false) bool allowRetry,

lib/state/app/infrastructure/loadableState/loading_error.freezed.dart

@@ -1,5 +1,5 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,266 +9,155 @@ part of 'loading_error.dart';
 // FreezedGenerator
 // **************************************************************************
 
-// dart format off
 T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
 /// @nodoc
 mixin _$LoadingError {
+  String get message => throw _privateConstructorUsedError;
+  bool get allowRetry => throw _privateConstructorUsedError;
 
- String get message; bool get allowRetry;
-/// Create a copy of LoadingError
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$LoadingErrorCopyWith<LoadingError> get copyWith => _$LoadingErrorCopyWithImpl<LoadingError>(this as LoadingError, _$identity);
-
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoadingError&&(identical(other.message, message) || other.message == message)&&(identical(other.allowRetry, allowRetry) || other.allowRetry == allowRetry));
-}
-
-
-@override
-int get hashCode => Object.hash(runtimeType,message,allowRetry);
-
-@override
-String toString() {
-  return 'LoadingError(message: $message, allowRetry: $allowRetry)';
-}
-
-
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $LoadingErrorCopyWith<LoadingError> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract mixin class $LoadingErrorCopyWith<$Res>  {
-  factory $LoadingErrorCopyWith(LoadingError value, $Res Function(LoadingError) _then) = _$LoadingErrorCopyWithImpl;
-@useResult
-$Res call({
- String message, bool allowRetry
-});
-
-
-
-
+abstract class $LoadingErrorCopyWith<$Res> {
+  factory $LoadingErrorCopyWith(
+          LoadingError value, $Res Function(LoadingError) then) =
+      _$LoadingErrorCopyWithImpl<$Res, LoadingError>;
+  @useResult
+  $Res call({String message, bool allowRetry});
 }
+
 /// @nodoc
-class _$LoadingErrorCopyWithImpl<$Res>
+class _$LoadingErrorCopyWithImpl<$Res, $Val extends LoadingError>
     implements $LoadingErrorCopyWith<$Res> {
-  _$LoadingErrorCopyWithImpl(this._self, this._then);
+  _$LoadingErrorCopyWithImpl(this._value, this._then);
 
-  final LoadingError _self;
-  final $Res Function(LoadingError) _then;
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
-/// Create a copy of LoadingError
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? message = null,Object? allowRetry = null,}) {
-  return _then(_self.copyWith(
-message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as String,allowRetry: null == allowRetry ? _self.allowRetry : allowRetry // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? message = null,
+    Object? allowRetry = null,
+  }) {
+    return _then(_value.copyWith(
+      message: null == message
+          ? _value.message
+          : message // ignore: cast_nullable_to_non_nullable
+              as String,
+      allowRetry: null == allowRetry
+          ? _value.allowRetry
+          : allowRetry // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ) as $Val);
+  }
 }
 
+/// @nodoc
+abstract class _$$LoadingErrorImplCopyWith<$Res>
+    implements $LoadingErrorCopyWith<$Res> {
+  factory _$$LoadingErrorImplCopyWith(
+          _$LoadingErrorImpl value, $Res Function(_$LoadingErrorImpl) then) =
+      __$$LoadingErrorImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String message, bool allowRetry});
 }
 
+/// @nodoc
+class __$$LoadingErrorImplCopyWithImpl<$Res>
+    extends _$LoadingErrorCopyWithImpl<$Res, _$LoadingErrorImpl>
+    implements _$$LoadingErrorImplCopyWith<$Res> {
+  __$$LoadingErrorImplCopyWithImpl(
+      _$LoadingErrorImpl _value, $Res Function(_$LoadingErrorImpl) _then)
+      : super(_value, _then);
 
-/// Adds pattern-matching-related methods to [LoadingError].
-extension LoadingErrorPatterns on LoadingError {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _LoadingError value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _LoadingError() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _LoadingError value)  $default,){
-final _that = this;
-switch (_that) {
-case _LoadingError():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _LoadingError value)?  $default,){
-final _that = this;
-switch (_that) {
-case _LoadingError() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( String message,  bool allowRetry)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _LoadingError() when $default != null:
-return $default(_that.message,_that.allowRetry);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( String message,  bool allowRetry)  $default,) {final _that = this;
-switch (_that) {
-case _LoadingError():
-return $default(_that.message,_that.allowRetry);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( String message,  bool allowRetry)?  $default,) {final _that = this;
-switch (_that) {
-case _LoadingError() when $default != null:
-return $default(_that.message,_that.allowRetry);case _:
-  return null;
-
-}
-}
-
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? message = null,
+    Object? allowRetry = null,
+  }) {
+    return _then(_$LoadingErrorImpl(
+      message: null == message
+          ? _value.message
+          : message // ignore: cast_nullable_to_non_nullable
+              as String,
+      allowRetry: null == allowRetry
+          ? _value.allowRetry
+          : allowRetry // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ));
+  }
 }
 
 /// @nodoc
 
+class _$LoadingErrorImpl implements _LoadingError {
+  const _$LoadingErrorImpl({required this.message, this.allowRetry = false});
 
-class _LoadingError implements LoadingError {
-  const _LoadingError({required this.message, this.allowRetry = false});
-  
+  @override
+  final String message;
+  @override
+  @JsonKey()
+  final bool allowRetry;
 
-@override final  String message;
-@override@JsonKey() final  bool allowRetry;
+  @override
+  String toString() {
+    return 'LoadingError(message: $message, allowRetry: $allowRetry)';
+  }
 
-/// Create a copy of LoadingError
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$LoadingErrorCopyWith<_LoadingError> get copyWith => __$LoadingErrorCopyWithImpl<_LoadingError>(this, _$identity);
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$LoadingErrorImpl &&
+            (identical(other.message, message) || other.message == message) &&
+            (identical(other.allowRetry, allowRetry) ||
+                other.allowRetry == allowRetry));
+  }
 
+  @override
+  int get hashCode => Object.hash(runtimeType, message, allowRetry);
 
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoadingError&&(identical(other.message, message) || other.message == message)&&(identical(other.allowRetry, allowRetry) || other.allowRetry == allowRetry));
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
+      __$$LoadingErrorImplCopyWithImpl<_$LoadingErrorImpl>(this, _$identity);
 }
 
+abstract class _LoadingError implements LoadingError {
+  const factory _LoadingError(
+      {required final String message,
+      final bool allowRetry}) = _$LoadingErrorImpl;
 
-@override
-int get hashCode => Object.hash(runtimeType,message,allowRetry);
+  @override
+  String get message;
+  @override
+  bool get allowRetry;
 
-@override
-String toString() {
-  return 'LoadingError(message: $message, allowRetry: $allowRetry)';
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
-
-
-}
-
-/// @nodoc
-abstract mixin class _$LoadingErrorCopyWith<$Res> implements $LoadingErrorCopyWith<$Res> {
-  factory _$LoadingErrorCopyWith(_LoadingError value, $Res Function(_LoadingError) _then) = __$LoadingErrorCopyWithImpl;
-@override @useResult
-$Res call({
- String message, bool allowRetry
-});
-
-
-
-
-}
-/// @nodoc
-class __$LoadingErrorCopyWithImpl<$Res>
-    implements _$LoadingErrorCopyWith<$Res> {
-  __$LoadingErrorCopyWithImpl(this._self, this._then);
-
-  final _LoadingError _self;
-  final $Res Function(_LoadingError) _then;
-
-/// Create a copy of LoadingError
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? message = null,Object? allowRetry = null,}) {
-  return _then(_LoadingError(
-message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-as String,allowRetry: null == allowRetry ? _self.allowRetry : allowRetry // ignore: cast_nullable_to_non_nullable
-as bool,
-  ));
-}
-
-
-}
-
-// dart format on

lib/state/app/infrastructure/loadableState/view/loadable_state_consumer.dart

@@ -26,7 +26,7 @@ class LoadableStateConsumer<TController extends Bloc<LoadableHydratedBlocEvent<T
     var loadableState = context.watch<TController>().state;
 
     if(!loadableState.isLoading && onLoad != null) {
-      WidgetsBinding.instance.addPostFrameCallback((timeStamp) => onLoad!(loadableState.data!));
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) => onLoad!(loadableState.data));
     }
 
     var childWidget = ConditionalWrapper(
@@ -48,7 +48,7 @@ class LoadableStateConsumer<TController extends Bloc<LoadableHydratedBlocEvent<T
       child: SizedBox(
         height: MediaQuery.of(context).size.height,
         child: loadableState.showContent()
-          ? child(loadableState.data!, loadableState.isLoading)
+          ? child(loadableState.data, loadableState.isLoading)
           : const SizedBox.shrink(),
       ),
     );

lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc.dart

@@ -103,7 +103,7 @@ abstract class LoadableHydratedBloc<
   Map<String, dynamic>? toJson(LoadableState<TState> state) {
     Map<String, dynamic>? data;
     try {
-      data = state.data == null ? null : toStorage(state.data!);
+      data = state.data == null ? null : toStorage(state.data);
     } catch(e) {
       log('Failed to save state ${TState.toString()}: ${e.toString()}');
     }

lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.dart

@@ -4,7 +4,7 @@ part 'loadable_save_context.freezed.dart';
 part 'loadable_save_context.g.dart';
 
 @freezed
-abstract class LoadableSaveContext with _$LoadableSaveContext {
+class LoadableSaveContext with _$LoadableSaveContext {
   const LoadableSaveContext._();
   const factory LoadableSaveContext({
     required int timestamp,

lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.freezed.dart

@@ -1,5 +1,5 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,269 +9,160 @@ part of 'loadable_save_context.dart';
 // FreezedGenerator
 // **************************************************************************
 
-// dart format off
 T _$identity<T>(T value) => value;
 
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+LoadableSaveContext _$LoadableSaveContextFromJson(Map<String, dynamic> json) {
+  return _LoadableSaveContext.fromJson(json);
+}
+
 /// @nodoc
 mixin _$LoadableSaveContext {
-
- int get timestamp;
-/// Create a copy of LoadableSaveContext
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$LoadableSaveContextCopyWith<LoadableSaveContext> get copyWith => _$LoadableSaveContextCopyWithImpl<LoadableSaveContext>(this as LoadableSaveContext, _$identity);
+  int get timestamp => throw _privateConstructorUsedError;
 
   /// Serializes this LoadableSaveContext to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoadableSaveContext&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,timestamp);
-
-@override
-String toString() {
-  return 'LoadableSaveContext(timestamp: $timestamp)';
-}
-
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $LoadableSaveContextCopyWith<LoadableSaveContext> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract mixin class $LoadableSaveContextCopyWith<$Res>  {
-  factory $LoadableSaveContextCopyWith(LoadableSaveContext value, $Res Function(LoadableSaveContext) _then) = _$LoadableSaveContextCopyWithImpl;
-@useResult
-$Res call({
- int timestamp
-});
-
-
-
-
+abstract class $LoadableSaveContextCopyWith<$Res> {
+  factory $LoadableSaveContextCopyWith(
+          LoadableSaveContext value, $Res Function(LoadableSaveContext) then) =
+      _$LoadableSaveContextCopyWithImpl<$Res, LoadableSaveContext>;
+  @useResult
+  $Res call({int timestamp});
 }
+
 /// @nodoc
-class _$LoadableSaveContextCopyWithImpl<$Res>
+class _$LoadableSaveContextCopyWithImpl<$Res, $Val extends LoadableSaveContext>
     implements $LoadableSaveContextCopyWith<$Res> {
-  _$LoadableSaveContextCopyWithImpl(this._self, this._then);
+  _$LoadableSaveContextCopyWithImpl(this._value, this._then);
 
-  final LoadableSaveContext _self;
-  final $Res Function(LoadableSaveContext) _then;
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
-/// Create a copy of LoadableSaveContext
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? timestamp = null,}) {
-  return _then(_self.copyWith(
-timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as int,
-  ));
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? timestamp = null,
+  }) {
+    return _then(_value.copyWith(
+      timestamp: null == timestamp
+          ? _value.timestamp
+          : timestamp // ignore: cast_nullable_to_non_nullable
+              as int,
+    ) as $Val);
+  }
 }
 
+/// @nodoc
+abstract class _$$LoadableSaveContextImplCopyWith<$Res>
+    implements $LoadableSaveContextCopyWith<$Res> {
+  factory _$$LoadableSaveContextImplCopyWith(_$LoadableSaveContextImpl value,
+          $Res Function(_$LoadableSaveContextImpl) then) =
+      __$$LoadableSaveContextImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({int timestamp});
 }
 
+/// @nodoc
+class __$$LoadableSaveContextImplCopyWithImpl<$Res>
+    extends _$LoadableSaveContextCopyWithImpl<$Res, _$LoadableSaveContextImpl>
+    implements _$$LoadableSaveContextImplCopyWith<$Res> {
+  __$$LoadableSaveContextImplCopyWithImpl(_$LoadableSaveContextImpl _value,
+      $Res Function(_$LoadableSaveContextImpl) _then)
+      : super(_value, _then);
 
-/// Adds pattern-matching-related methods to [LoadableSaveContext].
-extension LoadableSaveContextPatterns on LoadableSaveContext {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _LoadableSaveContext value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _LoadableSaveContext() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _LoadableSaveContext value)  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableSaveContext():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _LoadableSaveContext value)?  $default,){
-final _that = this;
-switch (_that) {
-case _LoadableSaveContext() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( int timestamp)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _LoadableSaveContext() when $default != null:
-return $default(_that.timestamp);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( int timestamp)  $default,) {final _that = this;
-switch (_that) {
-case _LoadableSaveContext():
-return $default(_that.timestamp);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( int timestamp)?  $default,) {final _that = this;
-switch (_that) {
-case _LoadableSaveContext() when $default != null:
-return $default(_that.timestamp);case _:
-  return null;
-
-}
-}
-
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? timestamp = null,
+  }) {
+    return _then(_$LoadableSaveContextImpl(
+      timestamp: null == timestamp
+          ? _value.timestamp
+          : timestamp // ignore: cast_nullable_to_non_nullable
+              as int,
+    ));
+  }
 }
 
 /// @nodoc
 @JsonSerializable()
+class _$LoadableSaveContextImpl extends _LoadableSaveContext {
+  const _$LoadableSaveContextImpl({required this.timestamp}) : super._();
 
-class _LoadableSaveContext extends LoadableSaveContext {
-  const _LoadableSaveContext({required this.timestamp}): super._();
-  factory _LoadableSaveContext.fromJson(Map<String, dynamic> json) => _$LoadableSaveContextFromJson(json);
+  factory _$LoadableSaveContextImpl.fromJson(Map<String, dynamic> json) =>
+      _$$LoadableSaveContextImplFromJson(json);
 
-@override final  int timestamp;
+  @override
+  final int timestamp;
 
-/// Create a copy of LoadableSaveContext
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$LoadableSaveContextCopyWith<_LoadableSaveContext> get copyWith => __$LoadableSaveContextCopyWithImpl<_LoadableSaveContext>(this, _$identity);
+  @override
+  String toString() {
+    return 'LoadableSaveContext(timestamp: $timestamp)';
+  }
 
-@override
-Map<String, dynamic> toJson() {
-  return _$LoadableSaveContextToJson(this, );
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$LoadableSaveContextImpl &&
+            (identical(other.timestamp, timestamp) ||
+                other.timestamp == timestamp));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, timestamp);
+
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
+      __$$LoadableSaveContextImplCopyWithImpl<_$LoadableSaveContextImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$LoadableSaveContextImplToJson(
+      this,
+    );
+  }
 }
 
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoadableSaveContext&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
+abstract class _LoadableSaveContext extends LoadableSaveContext {
+  const factory _LoadableSaveContext({required final int timestamp}) =
+      _$LoadableSaveContextImpl;
+  const _LoadableSaveContext._() : super._();
+
+  factory _LoadableSaveContext.fromJson(Map<String, dynamic> json) =
+      _$LoadableSaveContextImpl.fromJson;
+
+  @override
+  int get timestamp;
+
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,timestamp);
-
-@override
-String toString() {
-  return 'LoadableSaveContext(timestamp: $timestamp)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$LoadableSaveContextCopyWith<$Res> implements $LoadableSaveContextCopyWith<$Res> {
-  factory _$LoadableSaveContextCopyWith(_LoadableSaveContext value, $Res Function(_LoadableSaveContext) _then) = __$LoadableSaveContextCopyWithImpl;
-@override @useResult
-$Res call({
- int timestamp
-});
-
-
-
-
-}
-/// @nodoc
-class __$LoadableSaveContextCopyWithImpl<$Res>
-    implements _$LoadableSaveContextCopyWith<$Res> {
-  __$LoadableSaveContextCopyWithImpl(this._self, this._then);
-
-  final _LoadableSaveContext _self;
-  final $Res Function(_LoadableSaveContext) _then;
-
-/// Create a copy of LoadableSaveContext
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? timestamp = null,}) {
-  return _then(_LoadableSaveContext(
-timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-as int,
-  ));
-}
-
-
-}
-
-// dart format on

lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.g.dart

@@ -6,9 +6,14 @@ part of 'loadable_save_context.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_LoadableSaveContext _$LoadableSaveContextFromJson(Map<String, dynamic> json) =>
-    _LoadableSaveContext(timestamp: (json['timestamp'] as num).toInt());
+_$LoadableSaveContextImpl _$$LoadableSaveContextImplFromJson(
+        Map<String, dynamic> json) =>
+    _$LoadableSaveContextImpl(
+      timestamp: (json['timestamp'] as num).toInt(),
+    );
 
-Map<String, dynamic> _$LoadableSaveContextToJson(
-  _LoadableSaveContext instance,
-) => <String, dynamic>{'timestamp': instance.timestamp};
+Map<String, dynamic> _$$LoadableSaveContextImplToJson(
+        _$LoadableSaveContextImpl instance) =>
+    <String, dynamic>{
+      'timestamp': instance.timestamp,
+    };

lib/state/app/modules/gradeAverages/bloc/grade_averages_state.dart

@@ -4,7 +4,7 @@ part 'grade_averages_state.freezed.dart';
 part 'grade_averages_state.g.dart';
 
 @freezed
-abstract class GradeAveragesState with _$GradeAveragesState {
+class GradeAveragesState with _$GradeAveragesState {
   const factory GradeAveragesState({
     required GradeAveragesGradingSystem gradingSystem,
     required List<int> grades,

lib/state/app/modules/gradeAverages/bloc/grade_averages_state.freezed.dart

@@ -1,5 +1,5 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
 // coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
@@ -9,278 +9,185 @@ part of 'grade_averages_state.dart';
 // FreezedGenerator
 // **************************************************************************
 
-// dart format off
 T _$identity<T>(T value) => value;
 
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+GradeAveragesState _$GradeAveragesStateFromJson(Map<String, dynamic> json) {
+  return _GradeAveragesState.fromJson(json);
+}
+
 /// @nodoc
 mixin _$GradeAveragesState {
-
- GradeAveragesGradingSystem get gradingSystem; List<int> get grades;
-/// Create a copy of GradeAveragesState
-/// with the given fields replaced by the non-null parameter values.
-@JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-$GradeAveragesStateCopyWith<GradeAveragesState> get copyWith => _$GradeAveragesStateCopyWithImpl<GradeAveragesState>(this as GradeAveragesState, _$identity);
+  GradeAveragesGradingSystem get gradingSystem =>
+      throw _privateConstructorUsedError;
+  List<int> get grades => throw _privateConstructorUsedError;
 
   /// Serializes this GradeAveragesState to a JSON map.
-  Map<String, dynamic> toJson();
-
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is GradeAveragesState&&(identical(other.gradingSystem, gradingSystem) || other.gradingSystem == gradingSystem)&&const DeepCollectionEquality().equals(other.grades, grades));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,gradingSystem,const DeepCollectionEquality().hash(grades));
-
-@override
-String toString() {
-  return 'GradeAveragesState(gradingSystem: $gradingSystem, grades: $grades)';
-}
-
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $GradeAveragesStateCopyWith<GradeAveragesState> get copyWith =>
+      throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract mixin class $GradeAveragesStateCopyWith<$Res>  {
-  factory $GradeAveragesStateCopyWith(GradeAveragesState value, $Res Function(GradeAveragesState) _then) = _$GradeAveragesStateCopyWithImpl;
-@useResult
-$Res call({
- GradeAveragesGradingSystem gradingSystem, List<int> grades
-});
-
-
-
-
+abstract class $GradeAveragesStateCopyWith<$Res> {
+  factory $GradeAveragesStateCopyWith(
+          GradeAveragesState value, $Res Function(GradeAveragesState) then) =
+      _$GradeAveragesStateCopyWithImpl<$Res, GradeAveragesState>;
+  @useResult
+  $Res call({GradeAveragesGradingSystem gradingSystem, List<int> grades});
 }
+
 /// @nodoc
-class _$GradeAveragesStateCopyWithImpl<$Res>
+class _$GradeAveragesStateCopyWithImpl<$Res, $Val extends GradeAveragesState>
     implements $GradeAveragesStateCopyWith<$Res> {
-  _$GradeAveragesStateCopyWithImpl(this._self, this._then);
+  _$GradeAveragesStateCopyWithImpl(this._value, this._then);
 
-  final GradeAveragesState _self;
-  final $Res Function(GradeAveragesState) _then;
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
-/// Create a copy of GradeAveragesState
-/// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? gradingSystem = null,Object? grades = null,}) {
-  return _then(_self.copyWith(
-gradingSystem: null == gradingSystem ? _self.gradingSystem : gradingSystem // ignore: cast_nullable_to_non_nullable
-as GradeAveragesGradingSystem,grades: null == grades ? _self.grades : grades // ignore: cast_nullable_to_non_nullable
-as List<int>,
-  ));
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? gradingSystem = null,
+    Object? grades = null,
+  }) {
+    return _then(_value.copyWith(
+      gradingSystem: null == gradingSystem
+          ? _value.gradingSystem
+          : gradingSystem // ignore: cast_nullable_to_non_nullable
+              as GradeAveragesGradingSystem,
+      grades: null == grades
+          ? _value.grades
+          : grades // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+    ) as $Val);
+  }
 }
 
+/// @nodoc
+abstract class _$$GradeAveragesStateImplCopyWith<$Res>
+    implements $GradeAveragesStateCopyWith<$Res> {
+  factory _$$GradeAveragesStateImplCopyWith(_$GradeAveragesStateImpl value,
+          $Res Function(_$GradeAveragesStateImpl) then) =
+      __$$GradeAveragesStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({GradeAveragesGradingSystem gradingSystem, List<int> grades});
 }
 
+/// @nodoc
+class __$$GradeAveragesStateImplCopyWithImpl<$Res>
+    extends _$GradeAveragesStateCopyWithImpl<$Res, _$GradeAveragesStateImpl>
+    implements _$$GradeAveragesStateImplCopyWith<$Res> {
+  __$$GradeAveragesStateImplCopyWithImpl(_$GradeAveragesStateImpl _value,
+      $Res Function(_$GradeAveragesStateImpl) _then)
+      : super(_value, _then);
 
-/// Adds pattern-matching-related methods to [GradeAveragesState].
-extension GradeAveragesStatePatterns on GradeAveragesState {
-/// A variant of `map` that fallback to returning `orElse`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeMap<TResult extends Object?>(TResult Function( _GradeAveragesState value)?  $default,{required TResult orElse(),}){
-final _that = this;
-switch (_that) {
-case _GradeAveragesState() when $default != null:
-return $default(_that);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// Callbacks receives the raw object, upcasted.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case final Subclass2 value:
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult map<TResult extends Object?>(TResult Function( _GradeAveragesState value)  $default,){
-final _that = this;
-switch (_that) {
-case _GradeAveragesState():
-return $default(_that);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `map` that fallback to returning `null`.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case final Subclass value:
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? mapOrNull<TResult extends Object?>(TResult? Function( _GradeAveragesState value)?  $default,){
-final _that = this;
-switch (_that) {
-case _GradeAveragesState() when $default != null:
-return $default(_that);case _:
-  return null;
-
-}
-}
-/// A variant of `when` that fallback to an `orElse` callback.
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return orElse();
-/// }
-/// ```
-
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( GradeAveragesGradingSystem gradingSystem,  List<int> grades)?  $default,{required TResult orElse(),}) {final _that = this;
-switch (_that) {
-case _GradeAveragesState() when $default != null:
-return $default(_that.gradingSystem,_that.grades);case _:
-  return orElse();
-
-}
-}
-/// A `switch`-like method, using callbacks.
-///
-/// As opposed to `map`, this offers destructuring.
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case Subclass2(:final field2):
-///     return ...;
-/// }
-/// ```
-
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( GradeAveragesGradingSystem gradingSystem,  List<int> grades)  $default,) {final _that = this;
-switch (_that) {
-case _GradeAveragesState():
-return $default(_that.gradingSystem,_that.grades);case _:
-  throw StateError('Unexpected subclass');
-
-}
-}
-/// A variant of `when` that fallback to returning `null`
-///
-/// It is equivalent to doing:
-/// ```dart
-/// switch (sealedClass) {
-///   case Subclass(:final field):
-///     return ...;
-///   case _:
-///     return null;
-/// }
-/// ```
-
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( GradeAveragesGradingSystem gradingSystem,  List<int> grades)?  $default,) {final _that = this;
-switch (_that) {
-case _GradeAveragesState() when $default != null:
-return $default(_that.gradingSystem,_that.grades);case _:
-  return null;
-
-}
-}
-
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? gradingSystem = null,
+    Object? grades = null,
+  }) {
+    return _then(_$GradeAveragesStateImpl(
+      gradingSystem: null == gradingSystem
+          ? _value.gradingSystem
+          : gradingSystem // ignore: cast_nullable_to_non_nullable
+              as GradeAveragesGradingSystem,
+      grades: null == grades
+          ? _value._grades
+          : grades // ignore: cast_nullable_to_non_nullable
+              as List<int>,
+    ));
+  }
 }
 
 /// @nodoc
 @JsonSerializable()
+class _$GradeAveragesStateImpl implements _GradeAveragesState {
+  const _$GradeAveragesStateImpl(
+      {required this.gradingSystem, required final List<int> grades})
+      : _grades = grades;
 
-class _GradeAveragesState implements GradeAveragesState {
-  const _GradeAveragesState({required this.gradingSystem, required final  List<int> grades}): _grades = grades;
-  factory _GradeAveragesState.fromJson(Map<String, dynamic> json) => _$GradeAveragesStateFromJson(json);
+  factory _$GradeAveragesStateImpl.fromJson(Map<String, dynamic> json) =>
+      _$$GradeAveragesStateImplFromJson(json);
 
-@override final  GradeAveragesGradingSystem gradingSystem;
- final  List<int> _grades;
-@override List<int> get grades {
-  if (_grades is EqualUnmodifiableListView) return _grades;
-  // ignore: implicit_dynamic_type
-  return EqualUnmodifiableListView(_grades);
+  @override
+  final GradeAveragesGradingSystem gradingSystem;
+  final List<int> _grades;
+  @override
+  List<int> get grades {
+    if (_grades is EqualUnmodifiableListView) return _grades;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_grades);
+  }
+
+  @override
+  String toString() {
+    return 'GradeAveragesState(gradingSystem: $gradingSystem, grades: $grades)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$GradeAveragesStateImpl &&
+            (identical(other.gradingSystem, gradingSystem) ||
+                other.gradingSystem == gradingSystem) &&
+            const DeepCollectionEquality().equals(other._grades, _grades));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, gradingSystem, const DeepCollectionEquality().hash(_grades));
+
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
+      __$$GradeAveragesStateImplCopyWithImpl<_$GradeAveragesStateImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$GradeAveragesStateImplToJson(
+      this,
+    );
+  }
 }
 
+abstract class _GradeAveragesState implements GradeAveragesState {
+  const factory _GradeAveragesState(
+      {required final GradeAveragesGradingSystem gradingSystem,
+      required final List<int> grades}) = _$GradeAveragesStateImpl;
 
-/// Create a copy of GradeAveragesState
-/// with the given fields replaced by the non-null parameter values.
-@override @JsonKey(includeFromJson: false, includeToJson: false)
-@pragma('vm:prefer-inline')
-_$GradeAveragesStateCopyWith<_GradeAveragesState> get copyWith => __$GradeAveragesStateCopyWithImpl<_GradeAveragesState>(this, _$identity);
+  factory _GradeAveragesState.fromJson(Map<String, dynamic> json) =
+      _$GradeAveragesStateImpl.fromJson;
 
-@override
-Map<String, dynamic> toJson() {
-  return _$GradeAveragesStateToJson(this, );
+  @override
+  GradeAveragesGradingSystem get gradingSystem;
+  @override
+  List<int> get grades;
+
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
 }
-
-@override
-bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _GradeAveragesState&&(identical(other.gradingSystem, gradingSystem) || other.gradingSystem == gradingSystem)&&const DeepCollectionEquality().equals(other._grades, _grades));
-}
-
-@JsonKey(includeFromJson: false, includeToJson: false)
-@override
-int get hashCode => Object.hash(runtimeType,gradingSystem,const DeepCollectionEquality().hash(_grades));
-
-@override
-String toString() {
-  return 'GradeAveragesState(gradingSystem: $gradingSystem, grades: $grades)';
-}
-
-
-}
-
-/// @nodoc
-abstract mixin class _$GradeAveragesStateCopyWith<$Res> implements $GradeAveragesStateCopyWith<$Res> {
-  factory _$GradeAveragesStateCopyWith(_GradeAveragesState value, $Res Function(_GradeAveragesState) _then) = __$GradeAveragesStateCopyWithImpl;
-@override @useResult
-$Res call({
- GradeAveragesGradingSystem gradingSystem, List<int> grades
-});
-
-
-
-
-}
-/// @nodoc
-class __$GradeAveragesStateCopyWithImpl<$Res>
-    implements _$GradeAveragesStateCopyWith<$Res> {
-  __$GradeAveragesStateCopyWithImpl(this._self, this._then);
-
-  final _GradeAveragesState _self;
-  final $Res Function(_GradeAveragesState) _then;
-
-/// Create a copy of GradeAveragesState
-/// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? gradingSystem = null,Object? grades = null,}) {
-  return _then(_GradeAveragesState(
-gradingSystem: null == gradingSystem ? _self.gradingSystem : gradingSystem // ignore: cast_nullable_to_non_nullable
-as GradeAveragesGradingSystem,grades: null == grades ? _self._grades : grades // ignore: cast_nullable_to_non_nullable
-as List<int>,
-  ));
-}
-
-
-}
-
-// dart format on

lib/state/app/modules/gradeAverages/bloc/grade_averages_state.g.dart

@@ -6,23 +6,23 @@ part of 'grade_averages_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_GradeAveragesState _$GradeAveragesStateFromJson(Map<String, dynamic> json) =>
-    _GradeAveragesState(
+_$GradeAveragesStateImpl _$$GradeAveragesStateImplFromJson(
+        Map<String, dynamic> json) =>
+    _$GradeAveragesStateImpl(
       gradingSystem: $enumDecode(
-        _$GradeAveragesGradingSystemEnumMap,
-        json['gradingSystem'],
-      ),
+          _$GradeAveragesGradingSystemEnumMap, json['gradingSystem']),
       grades: (json['grades'] as List<dynamic>)
           .map((e) => (e as num).toInt())
           .toList(),
     );
 
-Map<String, dynamic> _$GradeAveragesStateToJson(
-  _GradeAveragesState instance,
-) => <String, dynamic>{
-  'gradingSystem': _$GradeAveragesGradingSystemEnumMap[instance.gradingSystem]!,
-  'grades': instance.grades,
-};
+Map<String, dynamic> _$$GradeAveragesStateImplToJson(
+        _$GradeAveragesStateImpl instance) =>
+    <String, dynamic>{
+      'gradingSystem':
+          _$GradeAveragesGradingSystemEnumMap[instance.gradingSystem]!,
+      'grades': instance.grades,
+    };
 
 const _$GradeAveragesGradingSystemEnumMap = {
   GradeAveragesGradingSystem.highSchool: 'highSchool',

lib/state/app/modules/gradeAverages/view/grade_averages_view.dart

@@ -51,7 +51,7 @@ class GradeAveragesView extends StatelessWidget {
                           color: Theme.of(context).colorScheme.onSurface
                       ),
                       const SizedBox(width: 15),
-                      Text(isMiddleSchool ? 'Realschule' : 'Oberstufe'),
+                      Text(isMiddleSchool ? 'Notensystem' : 'Punktesystem'),
                     ],
                   ),
                 )).toList(),
@@ -80,19 +80,11 @@ class GradeAveragesView extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               const SizedBox(height: 30),
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Text('Ø', style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
-                  SizedBox(width: 5),
-                  Text(bloc.average().toStringAsFixed(2), style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold))
-                ],
-              ),
+              Text(bloc.average().toStringAsFixed(2), style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
               const SizedBox(height: 10),
               const Divider(),
               const SizedBox(height: 10),
-              Text(bloc.isMiddleSchool() ? 'Wähle die Anzahl deiner jeweiligen Noten aus' : 'Wähle die Anzahl deiner jeweiligen Punkte aus'),
+              Text(bloc.isMiddleSchool() ? 'Wähle unten die Anzahl deiner jeweiligen Noten aus' : 'Wähle unten die Anzahl deiner jeweiligen Punkte aus'),
               const SizedBox(height: 10),
               const Expanded(
                 child: GradeAveragesListView()

lib/state/app/modules/holidays/bloc/holidays_state.dart

@@ -5,7 +5,7 @@ part 'holidays_state.freezed.dart';
 part 'holidays_state.g.dart';
 
 @freezed
-abstract class HolidaysState with _$HolidaysState {
+class HolidaysState with _$HolidaysState {
   const factory HolidaysState({
     required bool showPastHolidays,
     required bool showDisclaimer,
@@ -16,7 +16,7 @@ abstract class HolidaysState with _$HolidaysState {
 }
 
 @freezed
-abstract class Holiday with _$Holiday {
+class Holiday with _$Holiday {
   const factory Holiday({
     required String start,
     required String end,

lib/state/app/modules/holidays/bloc/holidays_state.g.dart

@@ -6,8 +6,8 @@ part of 'holidays_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_HolidaysState _$HolidaysStateFromJson(Map<String, dynamic> json) =>
-    _HolidaysState(
+_$HolidaysStateImpl _$$HolidaysStateImplFromJson(Map<String, dynamic> json) =>
+    _$HolidaysStateImpl(
       showPastHolidays: json['showPastHolidays'] as bool,
       showDisclaimer: json['showDisclaimer'] as bool,
       holidays: (json['holidays'] as List<dynamic>)
@@ -15,27 +15,29 @@ _HolidaysState _$HolidaysStateFromJson(Map<String, dynamic> json) =>
           .toList(),
     );
 
-Map<String, dynamic> _$HolidaysStateToJson(_HolidaysState instance) =>
+Map<String, dynamic> _$$HolidaysStateImplToJson(_$HolidaysStateImpl instance) =>
     <String, dynamic>{
       'showPastHolidays': instance.showPastHolidays,
       'showDisclaimer': instance.showDisclaimer,
       'holidays': instance.holidays,
     };
 
-_Holiday _$HolidayFromJson(Map<String, dynamic> json) => _Holiday(
-  start: json['start'] as String,
-  end: json['end'] as String,
-  year: (json['year'] as num).toInt(),
-  stateCode: json['stateCode'] as String,
-  name: json['name'] as String,
-  slug: json['slug'] as String,
-);
+_$HolidayImpl _$$HolidayImplFromJson(Map<String, dynamic> json) =>
+    _$HolidayImpl(
+      start: json['start'] as String,
+      end: json['end'] as String,
+      year: (json['year'] as num).toInt(),
+      stateCode: json['stateCode'] as String,
+      name: json['name'] as String,
+      slug: json['slug'] as String,
+    );
 
-Map<String, dynamic> _$HolidayToJson(_Holiday instance) => <String, dynamic>{
-  'start': instance.start,
-  'end': instance.end,
-  'year': instance.year,
-  'stateCode': instance.stateCode,
-  'name': instance.name,
-  'slug': instance.slug,
-};
+Map<String, dynamic> _$$HolidayImplToJson(_$HolidayImpl instance) =>
+    <String, dynamic>{
+      'start': instance.start,
+      'end': instance.end,
+      'year': instance.year,
+      'stateCode': instance.stateCode,
+      'name': instance.name,
+      'slug': instance.slug,
+    };

lib/state/app/modules/marianumMessage/bloc/marianum_message_state.dart

@@ -5,7 +5,7 @@ part 'marianum_message_state.g.dart';
 
 
 @freezed
-abstract class MarianumMessageState with _$MarianumMessageState {
+class MarianumMessageState with _$MarianumMessageState {
   const factory MarianumMessageState({
     required MarianumMessageList messageList,
   }) = _MarianumMessageState;
@@ -14,7 +14,7 @@ abstract class MarianumMessageState with _$MarianumMessageState {
 }
 
 @freezed
-abstract class MarianumMessageList with _$MarianumMessageList {
+class MarianumMessageList with _$MarianumMessageList {
   const factory MarianumMessageList({
     required String base,
     required List<MarianumMessage> messages,
@@ -24,7 +24,7 @@ abstract class MarianumMessageList with _$MarianumMessageList {
 }
 
 @freezed
-abstract class MarianumMessage with _$MarianumMessage {
+class MarianumMessage with _$MarianumMessage {
   const factory MarianumMessage({
     required String name,
     required String date,

lib/state/app/modules/marianumMessage/bloc/marianum_message_state.g.dart

@@ -6,38 +6,45 @@ part of 'marianum_message_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_MarianumMessageState _$MarianumMessageStateFromJson(
-  Map<String, dynamic> json,
-) => _MarianumMessageState(
-  messageList: MarianumMessageList.fromJson(
-    json['messageList'] as Map<String, dynamic>,
-  ),
-);
+_$MarianumMessageStateImpl _$$MarianumMessageStateImplFromJson(
+        Map<String, dynamic> json) =>
+    _$MarianumMessageStateImpl(
+      messageList: MarianumMessageList.fromJson(
+          json['messageList'] as Map<String, dynamic>),
+    );
 
-Map<String, dynamic> _$MarianumMessageStateToJson(
-  _MarianumMessageState instance,
-) => <String, dynamic>{'messageList': instance.messageList};
+Map<String, dynamic> _$$MarianumMessageStateImplToJson(
+        _$MarianumMessageStateImpl instance) =>
+    <String, dynamic>{
+      'messageList': instance.messageList,
+    };
 
-_MarianumMessageList _$MarianumMessageListFromJson(Map<String, dynamic> json) =>
-    _MarianumMessageList(
+_$MarianumMessageListImpl _$$MarianumMessageListImplFromJson(
+        Map<String, dynamic> json) =>
+    _$MarianumMessageListImpl(
       base: json['base'] as String,
       messages: (json['messages'] as List<dynamic>)
           .map((e) => MarianumMessage.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
 
-Map<String, dynamic> _$MarianumMessageListToJson(
-  _MarianumMessageList instance,
-) => <String, dynamic>{'base': instance.base, 'messages': instance.messages};
+Map<String, dynamic> _$$MarianumMessageListImplToJson(
+        _$MarianumMessageListImpl instance) =>
+    <String, dynamic>{
+      'base': instance.base,
+      'messages': instance.messages,
+    };
 
-_MarianumMessage _$MarianumMessageFromJson(Map<String, dynamic> json) =>
-    _MarianumMessage(
+_$MarianumMessageImpl _$$MarianumMessageImplFromJson(
+        Map<String, dynamic> json) =>
+    _$MarianumMessageImpl(
       name: json['name'] as String,
       date: json['date'] as String,
       url: json['url'] as String,
     );
 
-Map<String, dynamic> _$MarianumMessageToJson(_MarianumMessage instance) =>
+Map<String, dynamic> _$$MarianumMessageImplToJson(
+        _$MarianumMessageImpl instance) =>
     <String, dynamic>{
       'name': instance.name,
       'date': instance.date,

lib/storage/base/settings.g.dart

@@ -7,43 +7,35 @@ part of 'settings.dart';
 // **************************************************************************
 
 Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
-  appTheme: Settings._themeFromJson(json['appTheme'] as String),
-  devToolsEnabled: json['devToolsEnabled'] as bool,
-  modulesSettings: ModulesSettings.fromJson(
-    json['modulesSettings'] as Map<String, dynamic>,
-  ),
-  timetableSettings: TimetableSettings.fromJson(
-    json['timetableSettings'] as Map<String, dynamic>,
-  ),
-  talkSettings: TalkSettings.fromJson(
-    json['talkSettings'] as Map<String, dynamic>,
-  ),
-  fileSettings: FileSettings.fromJson(
-    json['fileSettings'] as Map<String, dynamic>,
-  ),
-  holidaysSettings: HolidaysSettings.fromJson(
-    json['holidaysSettings'] as Map<String, dynamic>,
-  ),
-  fileViewSettings: FileViewSettings.fromJson(
-    json['fileViewSettings'] as Map<String, dynamic>,
-  ),
-  notificationSettings: NotificationSettings.fromJson(
-    json['notificationSettings'] as Map<String, dynamic>,
-  ),
-  devToolsSettings: DevToolsSettings.fromJson(
-    json['devToolsSettings'] as Map<String, dynamic>,
-  ),
-);
+      appTheme: Settings._themeFromJson(json['appTheme'] as String),
+      devToolsEnabled: json['devToolsEnabled'] as bool,
+      modulesSettings: ModulesSettings.fromJson(
+          json['modulesSettings'] as Map<String, dynamic>),
+      timetableSettings: TimetableSettings.fromJson(
+          json['timetableSettings'] as Map<String, dynamic>),
+      talkSettings:
+          TalkSettings.fromJson(json['talkSettings'] as Map<String, dynamic>),
+      fileSettings:
+          FileSettings.fromJson(json['fileSettings'] as Map<String, dynamic>),
+      holidaysSettings: HolidaysSettings.fromJson(
+          json['holidaysSettings'] as Map<String, dynamic>),
+      fileViewSettings: FileViewSettings.fromJson(
+          json['fileViewSettings'] as Map<String, dynamic>),
+      notificationSettings: NotificationSettings.fromJson(
+          json['notificationSettings'] as Map<String, dynamic>),
+      devToolsSettings: DevToolsSettings.fromJson(
+          json['devToolsSettings'] as Map<String, dynamic>),
+    );
 
 Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{
-  'appTheme': Settings._themeToJson(instance.appTheme),
-  'devToolsEnabled': instance.devToolsEnabled,
-  'modulesSettings': instance.modulesSettings.toJson(),
-  'timetableSettings': instance.timetableSettings.toJson(),
-  'talkSettings': instance.talkSettings.toJson(),
-  'fileSettings': instance.fileSettings.toJson(),
-  'holidaysSettings': instance.holidaysSettings.toJson(),
-  'fileViewSettings': instance.fileViewSettings.toJson(),
-  'notificationSettings': instance.notificationSettings.toJson(),
-  'devToolsSettings': instance.devToolsSettings.toJson(),
-};
+      'appTheme': Settings._themeToJson(instance.appTheme),
+      'devToolsEnabled': instance.devToolsEnabled,
+      'modulesSettings': instance.modulesSettings.toJson(),
+      'timetableSettings': instance.timetableSettings.toJson(),
+      'talkSettings': instance.talkSettings.toJson(),
+      'fileSettings': instance.fileSettings.toJson(),
+      'holidaysSettings': instance.holidaysSettings.toJson(),
+      'fileViewSettings': instance.fileViewSettings.toJson(),
+      'notificationSettings': instance.notificationSettings.toJson(),
+      'devToolsSettings': instance.devToolsSettings.toJson(),
+    };

lib/storage/base/settingsProvider.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
 import 'package:easy_debounce/easy_debounce.dart';
@@ -13,6 +14,8 @@ class SettingsProvider extends ChangeNotifier {
   late SharedPreferences _storage;
   late Settings _settings = DefaultSettings.get();
 
+  final Completer<void> _populated = Completer();
+
   Settings val({bool write = false}) {
     if(write) {
       notifyListeners();
@@ -56,6 +59,7 @@ class SettingsProvider extends ChangeNotifier {
     }
 
     notifyListeners();
+    _populated.complete();
   }
 
   Future<void> update() async {
@@ -77,4 +81,8 @@ class SettingsProvider extends ChangeNotifier {
 
     return mergedMap;
   }
+
+  Future<void> waitForPopulation() async {
+    await _populated.future;
+  }
 }

lib/storage/file/fileSettings.g.dart

@@ -7,10 +7,10 @@ part of 'fileSettings.dart';
 // **************************************************************************
 
 FileSettings _$FileSettingsFromJson(Map<String, dynamic> json) => FileSettings(
-  sortFoldersToTop: json['sortFoldersToTop'] as bool,
-  ascending: json['ascending'] as bool,
-  sortBy: $enumDecode(_$SortOptionEnumMap, json['sortBy']),
-);
+      sortFoldersToTop: json['sortFoldersToTop'] as bool,
+      ascending: json['ascending'] as bool,
+      sortBy: $enumDecode(_$SortOptionEnumMap, json['sortBy']),
+    );
 
 Map<String, dynamic> _$FileSettingsToJson(FileSettings instance) =>
     <String, dynamic>{

lib/storage/fileView/fileViewSettings.g.dart

@@ -12,4 +12,6 @@ FileViewSettings _$FileViewSettingsFromJson(Map<String, dynamic> json) =>
     );
 
 Map<String, dynamic> _$FileViewSettingsToJson(FileViewSettings instance) =>
-    <String, dynamic>{'alwaysOpenExternally': instance.alwaysOpenExternally};
+    <String, dynamic>{
+      'alwaysOpenExternally': instance.alwaysOpenExternally,
+    };

lib/storage/general/modulesSettings.g.dart

@@ -16,14 +16,13 @@ ModulesSettings _$ModulesSettingsFromJson(Map<String, dynamic> json) =>
           .toList(),
     );
 
-Map<String, dynamic> _$ModulesSettingsToJson(
-  ModulesSettings instance,
-) => <String, dynamic>{
-  'moduleOrder': instance.moduleOrder.map((e) => _$ModulesEnumMap[e]!).toList(),
-  'hiddenModules': instance.hiddenModules
-      .map((e) => _$ModulesEnumMap[e]!)
-      .toList(),
-};
+Map<String, dynamic> _$ModulesSettingsToJson(ModulesSettings instance) =>
+    <String, dynamic>{
+      'moduleOrder':
+          instance.moduleOrder.map((e) => _$ModulesEnumMap[e]!).toList(),
+      'hiddenModules':
+          instance.hiddenModules.map((e) => _$ModulesEnumMap[e]!).toList(),
+    };
 
 const _$ModulesEnumMap = {
   Modules.timetable: 'timetable',

lib/storage/notification/notificationSettings.g.dart

@@ -7,15 +7,15 @@ part of 'notificationSettings.dart';
 // **************************************************************************
 
 NotificationSettings _$NotificationSettingsFromJson(
-  Map<String, dynamic> json,
-) => NotificationSettings(
-  askUsageDismissed: json['askUsageDismissed'] as bool,
-  enabled: json['enabled'] as bool,
-);
+        Map<String, dynamic> json) =>
+    NotificationSettings(
+      askUsageDismissed: json['askUsageDismissed'] as bool,
+      enabled: json['enabled'] as bool,
+    );
 
 Map<String, dynamic> _$NotificationSettingsToJson(
-  NotificationSettings instance,
-) => <String, dynamic>{
-  'askUsageDismissed': instance.askUsageDismissed,
-  'enabled': instance.enabled,
-};
+        NotificationSettings instance) =>
+    <String, dynamic>{
+      'askUsageDismissed': instance.askUsageDismissed,
+      'enabled': instance.enabled,
+    };

lib/storage/talk/talkSettings.g.dart

@@ -7,11 +7,11 @@ part of 'talkSettings.dart';
 // **************************************************************************
 
 TalkSettings _$TalkSettingsFromJson(Map<String, dynamic> json) => TalkSettings(
-  sortFavoritesToTop: json['sortFavoritesToTop'] as bool,
-  sortUnreadToTop: json['sortUnreadToTop'] as bool,
-  drafts: Map<String, String>.from(json['drafts'] as Map),
-  draftReplies: Map<String, int>.from(json['draftReplies'] as Map),
-);
+      sortFavoritesToTop: json['sortFavoritesToTop'] as bool,
+      sortUnreadToTop: json['sortUnreadToTop'] as bool,
+      drafts: Map<String, String>.from(json['drafts'] as Map),
+      draftReplies: Map<String, int>.from(json['draftReplies'] as Map),
+    );
 
 Map<String, dynamic> _$TalkSettingsToJson(TalkSettings instance) =>
     <String, dynamic>{

lib/storage/timetable/timetableSettings.g.dart

@@ -9,18 +9,16 @@ part of 'timetableSettings.dart';
 TimetableSettings _$TimetableSettingsFromJson(Map<String, dynamic> json) =>
     TimetableSettings(
       connectDoubleLessons: json['connectDoubleLessons'] as bool,
-      timetableNameMode: $enumDecode(
-        _$TimetableNameModeEnumMap,
-        json['timetableNameMode'],
-      ),
+      timetableNameMode:
+          $enumDecode(_$TimetableNameModeEnumMap, json['timetableNameMode']),
     );
 
-Map<String, dynamic> _$TimetableSettingsToJson(
-  TimetableSettings instance,
-) => <String, dynamic>{
-  'connectDoubleLessons': instance.connectDoubleLessons,
-  'timetableNameMode': _$TimetableNameModeEnumMap[instance.timetableNameMode]!,
-};
+Map<String, dynamic> _$TimetableSettingsToJson(TimetableSettings instance) =>
+    <String, dynamic>{
+      'connectDoubleLessons': instance.connectDoubleLessons,
+      'timetableNameMode':
+          _$TimetableNameModeEnumMap[instance.timetableNameMode]!,
+    };
 
 const _$TimetableNameModeEnumMap = {
   TimetableNameMode.name: 'name',

lib/utils/FileSaver.dart

@@ -1,23 +0,0 @@
-import 'dart:io';
-
-import 'package:permission_handler/permission_handler.dart';
-
-// only tested on android!
-class FileSaver {
-  static Future<String> getExternalDocumentPath() async {
-    var permission = await Permission.storage.status;
-    if(!permission.isGranted) {
-      await Permission.storage.request();
-    }
-    var directory = Directory('/storage/emulated/0/Download');
-    final externalPath = directory.path;
-    await Directory(externalPath).create(recursive: true);
-    return externalPath;
-  }
-
-  static Future<File> writeBytes(List<int> bytes, String name) async {
-    final path = await getExternalDocumentPath();
-    var file = File('$path/$name');
-    return file.writeAsBytes(bytes);
-  }
-}

lib/utils/UrlOpener.dart

@@ -1,10 +0,0 @@
-import 'package:flutter_linkify/flutter_linkify.dart';
-import 'package:url_launcher/url_launcher_string.dart';
-
-class UrlOpener {
-  static Future<void> onOpen(LinkableElement link) async {
-    if(await canLaunchUrlString(link.url)) {
-      await launchUrlString(link.url);
-    }
-  }
-}

lib/view/pages/more/share/qrShareView.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:screen_brightness/screen_brightness.dart';
 
 import 'appSharePlatformView.dart';
 
@@ -11,18 +10,6 @@ class QrShareView extends StatefulWidget {
 }
 
 class _QrShareViewState extends State<QrShareView> {
-  @override
-  void initState() {
-    ScreenBrightness.instance.setApplicationScreenBrightness(1.0);
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    ScreenBrightness.instance.resetApplicationScreenBrightness();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) => DefaultTabController(
       length: 2,

lib/view/pages/talk/chatView.dart

@@ -51,7 +51,6 @@ class _ChatViewState extends State<ChatView> {
             var elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000);
 
             if(element.systemMessage.contains('reaction')) return;
-            if(element.systemMessage.contains('poll_voted')) return;
             var commonRead = int.parse(data.getChatResponse.headers?['x-chat-last-common-read'] ?? '0');
 
             if(!elementDate.isSameDay(lastDate)) {
@@ -129,7 +128,7 @@ class _ChatViewState extends State<ChatView> {
                   ),
                 ),
                 Container(
-                  color: Theme.of(context).colorScheme.surface,
+                  color: Theme.of(context).colorScheme.background,
                   child: TalkNavigator.isSecondaryVisible(context)
                       ? ChatTextfield(widget.room.token, selfId: widget.selfId)
                       : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)