fixed list view breaking layout

Reviewed-on: #93
Reviewed-by: Elias Müller <elias@elias-mueller.com>

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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android/settings.gradle

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

assets/ca/lets-encrypt-r13.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBTCCAu2gAwIBAgIQWgDyEtjUtIDzkkFX6imDBTANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
+Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
+bmNyeXB0MQwwCgYDVQQDEwNSMTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQClZ3CN0FaBZBUXYc25BtStGZCMJlA3mBZjklTb2cyEBZPs0+wIG6BgUUNI
+fSvHSJaetC3ancgnO1ehn6vw1g7UDjDKb5ux0daknTI+WE41b0VYaHEX/D7YXYKg
+L7JRbLAaXbhZzjVlyIuhrxA3/+OcXcJJFzT/jCuLjfC8cSyTDB0FxLrHzarJXnzR
+yQH3nAP2/Apd9Np75tt2QnDr9E0i2gB3b9bJXxf92nUupVcM9upctuBzpWjPoXTi
+dYJ+EJ/B9aLrAek4sQpEzNPCifVJNYIKNLMc6YjCR06CDgo28EdPivEpBHXazeGa
+XP9enZiVuppD0EqiFwUBBDDTMrOPAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdDgQWBBTnq58PLDOgU9NeT3jIsoQOO9aSMzAfBgNVHSMEGDAWgBR5
+tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG
+Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD
+VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B
+AQsFAAOCAgEAUTdYUqEimzW7TbrOypLqCfL7VOwYf/Q79OH5cHLCZeggfQhDconl
+k7Kgh8b0vi+/XuWu7CN8n/UPeg1vo3G+taXirrytthQinAHGwc/UdbOygJa9zuBc
+VyqoH3CXTXDInT+8a+c3aEVMJ2St+pSn4ed+WkDp8ijsijvEyFwE47hulW0Ltzjg
+9fOV5Pmrg/zxWbRuL+k0DBDHEJennCsAen7c35Pmx7jpmJ/HtgRhcnz0yjSBvyIw
+6L1QIupkCv2SBODT/xDD3gfQQyKv6roV4G2EhfEyAsWpmojxjCUCGiyg97FvDtm/
+NK2LSc9lybKxB73I2+P2G3CaWpvvpAiHCVu30jW8GCxKdfhsXtnIy2imskQqVZ2m
+0Pmxobb28Tucr7xBK7CtwvPrb79os7u2XP3O5f9b/H66GNyRrglRXlrYjI1oGYL/
+f4I1n/Sgusda6WvA6C190kxjU15Y12mHU4+BxyR9cx2hhGS9fAjMZKJss28qxvz6
+Axu4CaDmRNZpK/pQrXF17yXCXkmEWgvSOEZy6Z9pcbLIVEGckV/iVeq0AOo2pkg9
+p4QRIy0tK2diRENLSF2KysFwbY6B26BFeFs3v1sYVRhFW9nLkOrQVporCS0KyZmf
+wVD89qSTlnctLcZnIavjKsKUu1nA1iU0yYMdYepKR7lWbnwhdx3ewok=
+-----END CERTIFICATE-----

devtools_options.yaml

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

flutter_launcher_icons.yaml

@@ -0,0 +1,9 @@
+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

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -31,6 +31,8 @@ target 'Runner' do
   use_frameworks!
   use_modular_headers!
 
+  pod 'PhoneNumberKit', '~> 3.7.6'
+
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 #  target 'RunnerTests' do
 #    inherit! :search_paths

ios/Podfile.lock

@@ -1,185 +1,190 @@
 PODS:
-  - better_open_file (0.0.1):
+  - connectivity_plus (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
     - Flutter
-  - DKImagePickerController/Core (4.3.4):
+  - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.4)
+  - DKImagePickerController/ImageDataManager (4.3.9)
-  - DKImagePickerController/PhotoGallery (4.3.4):
+  - DKImagePickerController/PhotoGallery (4.3.9):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
+  - DKImagePickerController/Resource (4.3.9)
-  - DKPhotoGallery (0.0.17):
+  - DKPhotoGallery (0.0.19):
-    - DKPhotoGallery/Core (= 0.0.17)
+    - DKPhotoGallery/Core (= 0.0.19)
-    - DKPhotoGallery/Model (= 0.0.17)
+    - DKPhotoGallery/Model (= 0.0.19)
-    - DKPhotoGallery/Preview (= 0.0.17)
+    - DKPhotoGallery/Preview (= 0.0.19)
-    - DKPhotoGallery/Resource (= 0.0.17)
+    - DKPhotoGallery/Resource (= 0.0.19)
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
+  - DKPhotoGallery/Core (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Preview
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
+  - DKPhotoGallery/Model (0.0.19):
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
+  - DKPhotoGallery/Preview (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Resource
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
+  - DKPhotoGallery/Resource (0.0.19):
     - SDWebImage
     - SwiftyGif
-  - fast_rsa (0.6.0):
+  - emoji_picker_flutter (0.0.1):
+    - Flutter
+  - fast_rsa (0.7.0):
     - Flutter
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
-  - Firebase/CoreOnly (10.12.0):
+  - Firebase/CoreOnly (12.4.0):
-    - FirebaseCore (= 10.12.0)
+    - FirebaseCore (~> 12.4.0)
-  - Firebase/InAppMessaging (10.12.0):
+  - Firebase/InAppMessaging (12.4.0):
     - Firebase/CoreOnly
-    - FirebaseInAppMessaging (~> 10.12.0-beta)
+    - FirebaseInAppMessaging (~> 12.4.0-beta)
-  - Firebase/Messaging (10.12.0):
+  - Firebase/Messaging (12.4.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.12.0)
+    - FirebaseMessaging (~> 12.4.0)
-  - firebase_core (2.15.1):
+  - firebase_core (4.2.1):
-    - Firebase/CoreOnly (= 10.12.0)
+    - Firebase/CoreOnly (= 12.4.0)
     - Flutter
-  - firebase_in_app_messaging (0.7.3-5):
+  - firebase_in_app_messaging (0.9.0-4):
-    - Firebase/InAppMessaging (= 10.12.0)
+    - Firebase/InAppMessaging (= 12.4.0)
     - firebase_core
     - Flutter
-  - firebase_messaging (14.6.6):
+  - firebase_messaging (16.0.4):
-    - Firebase/Messaging (= 10.12.0)
+    - Firebase/Messaging (= 12.4.0)
     - firebase_core
     - Flutter
-  - FirebaseABTesting (10.13.0):
+  - FirebaseABTesting (12.4.0):
-    - FirebaseCore (~> 10.0)
+    - FirebaseCore (~> 12.4.0)
-  - FirebaseCore (10.12.0):
+  - FirebaseCore (12.4.0):
-    - FirebaseCoreInternal (~> 10.0)
+    - FirebaseCoreInternal (~> 12.4.0)
-    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 7.8)
+    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreInternal (10.13.0):
+  - FirebaseCoreInternal (12.4.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseInAppMessaging (10.12.0-beta):
+  - FirebaseInAppMessaging (12.4.0-beta):
-    - FirebaseABTesting (~> 10.0)
+    - FirebaseABTesting (~> 12.4.0)
-    - FirebaseCore (~> 10.0)
+    - FirebaseCore (~> 12.4.0)
-    - FirebaseInstallations (~> 10.0)
+    - FirebaseInstallations (~> 12.4.0)
-    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Environment (~> 8.1)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - GoogleUtilities/UserDefaults (~> 8.1)
-  - FirebaseInstallations (10.13.0):
+    - nanopb (~> 3.30910.0)
-    - FirebaseCore (~> 10.0)
+  - FirebaseInstallations (12.4.0):
-    - GoogleUtilities/Environment (~> 7.8)
+    - FirebaseCore (~> 12.4.0)
-    - GoogleUtilities/UserDefaults (~> 7.8)
+    - GoogleUtilities/Environment (~> 8.1)
-    - PromisesObjC (~> 2.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
-  - FirebaseMessaging (10.12.0):
+    - PromisesObjC (~> 2.4)
-    - FirebaseCore (~> 10.0)
+  - FirebaseMessaging (12.4.0):
-    - FirebaseInstallations (~> 10.0)
+    - FirebaseCore (~> 12.4.0)
-    - GoogleDataTransport (~> 9.2)
+    - FirebaseInstallations (~> 12.4.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleDataTransport (~> 10.1)
-    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 7.8)
+    - GoogleUtilities/Reachability (~> 8.1)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
   - Flutter (1.0.0)
-  - flutter_app_badger (1.3.0):
+  - flutter_app_badge (2.0.0):
     - Flutter
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_native_splash (0.0.1):
+  - flutter_native_splash (2.4.3):
     - Flutter
-  - fluttertoast (0.0.2):
+  - GoogleDataTransport (10.1.0):
-    - Flutter
+    - nanopb (~> 3.30910.0)
-    - Toast
+    - PromisesObjC (~> 2.4)
-  - FMDB (2.7.5):
+  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
-  - GoogleDataTransport (9.2.5):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.5):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.5):
+    - GoogleUtilities/Privacy
-    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Environment (8.1.0):
-  - GoogleUtilities/Logger (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.1.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.5)"
+  - "GoogleUtilities/NSData+zlib (8.1.0)":
-  - GoogleUtilities/Reachability (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/Reachability (8.1.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.1.0):
     - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
   - image_picker_ios (0.0.1):
     - Flutter
-  - libphonenumber_plugin (0.0.1):
+  - in_app_review (2.0.0):
     - Flutter
-    - PhoneNumberKit
+  - nanopb (3.30910.0):
-  - nanopb (2.30909.0):
+    - nanopb/decode (= 3.30910.0)
-    - nanopb/decode (= 2.30909.0)
+    - nanopb/encode (= 3.30910.0)
-    - nanopb/encode (= 2.30909.0)
+  - nanopb/decode (3.30910.0)
-  - nanopb/decode (2.30909.0)
+  - nanopb/encode (3.30910.0)
-  - nanopb/encode (2.30909.0)
+  - open_filex (0.0.2):
-  - package_info (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - PhoneNumberKit (3.6.7):
+  - PhoneNumberKit (3.7.11):
-    - PhoneNumberKit/PhoneNumberKitCore (= 3.6.7)
+    - PhoneNumberKit/PhoneNumberKitCore (= 3.7.11)
-    - PhoneNumberKit/UIKit (= 3.6.7)
+    - PhoneNumberKit/UIKit (= 3.7.11)
-  - PhoneNumberKit/PhoneNumberKitCore (3.6.7)
+  - PhoneNumberKit/PhoneNumberKitCore (3.7.11)
-  - PhoneNumberKit/UIKit (3.6.7):
+  - PhoneNumberKit/UIKit (3.7.11):
     - PhoneNumberKit/PhoneNumberKitCore
-  - PromisesObjC (2.3.1)
+  - PromisesObjC (2.4.0)
-  - SDWebImage (5.17.0):
+  - SDWebImage (5.21.2):
-    - SDWebImage/Core (= 5.17.0)
+    - SDWebImage/Core (= 5.21.2)
-  - SDWebImage/Core (5.17.0)
+  - SDWebImage/Core (5.21.2)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
-  - SwiftyGif (5.4.4)
+  - SwiftyGif (5.4.5)
   - syncfusion_flutter_pdfviewer (0.0.1):
     - Flutter
-  - Toast (4.0.0)
   - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
-  - better_open_file (from `.symlinks/plugins/better_open_file/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`)
   - fast_rsa (from `.symlinks/plugins/fast_rsa/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_in_app_messaging (from `.symlinks/plugins/firebase_in_app_messaging/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
   - Flutter (from `Flutter`)
-  - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
+  - flutter_app_badge (from `.symlinks/plugins/flutter_app_badge/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
-  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - libphonenumber_plugin (from `.symlinks/plugins/libphonenumber_plugin/ios`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
-  - package_info (from `.symlinks/plugins/package_info/ios`)
+  - open_filex (from `.symlinks/plugins/open_filex/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
+  - PhoneNumberKit (~> 3.7.6)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - syncfusion_flutter_pdfviewer (from `.symlinks/plugins/syncfusion_flutter_pdfviewer/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
@@ -194,7 +199,6 @@ SPEC REPOS:
     - FirebaseInAppMessaging
     - FirebaseInstallations
     - FirebaseMessaging
-    - FMDB
     - GoogleDataTransport
     - GoogleUtilities
     - nanopb
@@ -202,13 +206,14 @@ SPEC REPOS:
     - PromisesObjC
     - SDWebImage
     - SwiftyGif
-    - Toast
 
 EXTERNAL SOURCES:
-  better_open_file:
+  connectivity_plus:
-    :path: ".symlinks/plugins/better_open_file/ios"
+    :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
+  emoji_picker_flutter:
+    :path: ".symlinks/plugins/emoji_picker_flutter/ios"
   fast_rsa:
     :path: ".symlinks/plugins/fast_rsa/ios"
   file_picker:
@@ -221,74 +226,73 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_messaging/ios"
   Flutter:
     :path: Flutter
-  flutter_app_badger:
+  flutter_app_badge:
-    :path: ".symlinks/plugins/flutter_app_badger/ios"
+    :path: ".symlinks/plugins/flutter_app_badge/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
-  fluttertoast:
-    :path: ".symlinks/plugins/fluttertoast/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
-  libphonenumber_plugin:
+  in_app_review:
-    :path: ".symlinks/plugins/libphonenumber_plugin/ios"
+    :path: ".symlinks/plugins/in_app_review/ios"
-  package_info:
+  open_filex:
-    :path: ".symlinks/plugins/package_info/ios"
+    :path: ".symlinks/plugins/open_filex/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
+  sqflite_darwin:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   syncfusion_flutter_pdfviewer:
     :path: ".symlinks/plugins/syncfusion_flutter_pdfviewer/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  better_open_file: 03cf320415d4d3f46b6e00adc4a567d76c1a399d
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  fast_rsa: f696740d492d562e76f17b0a81dfc8ec3e635374
+  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  fast_rsa: fb70897d51040b094c780d5f1d7358614738b879
-  Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
+  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
-  firebase_core: 4a3246a02f828a01c74a2c26427037786d90f17f
+  Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
-  firebase_in_app_messaging: aebdbc10109a0ce44a3294f4ea57ed89ebe1d8bd
+  firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
-  firebase_messaging: 13b378c8449cae7ec96c79570170943dd73d4738
+  firebase_in_app_messaging: 04dfc07ab81578ef83bf0c0229be258ddf287c4f
-  FirebaseABTesting: 86ac5a4fc749088bb4d55a1cbfb2c4cb42c6d5de
+  firebase_messaging: c17a29984eafce4b2997fe078bb0a9e0b06f5dde
-  FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
+  FirebaseABTesting: c05b5ec9f1d9f21a65909525de301d375032d9a4
-  FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
+  FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
-  FirebaseInAppMessaging: dc24f50aebaf81a377f0b8abf360778f94208931
+  FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
-  FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
+  FirebaseInAppMessaging: 606dd4d4d5590a3d8229f363fdebb485235985b2
-  FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316
+  FirebaseInstallations: ae9f4902cb5bf1d0c5eaa31ec1f4e5495a0714e2
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  FirebaseMessaging: d33971b7bb252745ea6cd31ab190d1a1df4b8ed5
-  flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
+  flutter_app_badge: ca742dd659a157c1090ef7cd881cb78f48f3bcdf
-  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
-  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
-  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
+  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  in_app_review: 7dd1ea365263f834b8464673f9df72c80c17c937
-  libphonenumber_plugin: e8a7d64a6624a7c25f2c4ab0b7ead2a8e341e35e
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
+  open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
-  PhoneNumberKit: 43b5169526cc417398c8f13f77c97552c1c6ed76
+  PhoneNumberKit: ced55861269312a5e3bc2ef82a58d6255b1c976a
-  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  syncfusion_flutter_pdfviewer: bb9998884b864cfedf72628df3503bdf57e397c0
+  syncfusion_flutter_pdfviewer: 90dc48305d2e33d4aa20681d1e98ddeda891bc14
-  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
+  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
-PODFILE CHECKSUM: 3d89a90682e2cd438911ad748b8ba5992f8b6a0e
+PODFILE CHECKSUM: e21c9d4c7b9623c73c6784ddc132fd50a603ad93
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -8,8 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		33FDB0982EE9ABDC000B2391 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 33FDB0972EE9ABDC000B2391 /* GoogleService-Info.plist */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		6483E4432A911EA00063B51E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6483E4422A911EA00063B51E /* GoogleService-Info.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -33,10 +33,10 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		33FDB0972EE9ABDC000B2391 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		4509EC31CB08BA9BF367AF6C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		64801C012A9112D500E8B558 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
-		6483E4422A911EA00063B51E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -115,12 +115,12 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				33FDB0972EE9ABDC000B2391 /* GoogleService-Info.plist */,
 				64801C012A9112D500E8B558 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
 				97C147021CF9000F007C117D /* Info.plist */,
-				6483E4422A911EA00063B51E /* GoogleService-Info.plist */,
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
@@ -144,6 +144,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				174B54D80220E5F588BD9737 /* [CP] Embed Pods Frameworks */,
+				859FAB4E05FAC31B7B1A62D7 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -161,7 +162,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -195,7 +196,7 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				6483E4432A911EA00063B51E /* GoogleService-Info.plist in Resources */,
+				33FDB0982EE9ABDC000B2391 /* GoogleService-Info.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 			);
@@ -212,10 +213,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -237,6 +242,27 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		859FAB4E05FAC31B7B1A62D7 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -349,7 +375,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -434,7 +460,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -483,7 +509,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,11 +44,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

lib/api/holidays/getHolidaysResponse.g.dart

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

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

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

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

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

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

@@ -8,33 +8,34 @@ part of 'getChatParams.dart';
 
 GetChatParams _$GetChatParamsFromJson(Map<String, dynamic> json) =>
     GetChatParams(
-      lookIntoFuture:
+      lookIntoFuture: $enumDecode(
-          $enumDecode(_$GetChatParamsSwitchEnumMap, json['lookIntoFuture']),
+        _$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) =>
+Map<String, dynamic> _$GetChatParamsToJson(
-    <String, dynamic>{
+  GetChatParams instance,
+) => <String, dynamic>{
   'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
-      if (instance.limit case final value?) 'limit': value,
+  'limit': ?instance.limit,
-      if (instance.lastKnownMessageId case final value?)
+  'lastKnownMessageId': ?instance.lastKnownMessageId,
-        'lastKnownMessageId': value,
+  'lastCommonReadId': ?instance.lastCommonReadId,
-      if (instance.lastCommonReadId case final value?)
+  'timeout': ?instance.timeout,
-        'lastCommonReadId': value,
+  'setReadMarker': ?_$GetChatParamsSwitchEnumMap[instance.setReadMarker],
-      if (instance.timeout case final value?) 'timeout': value,
+  'includeLastKnown': ?_$GetChatParamsSwitchEnumMap[instance.includeLastKnown],
-      if (_$GetChatParamsSwitchEnumMap[instance.setReadMarker]
-          case final value?)
-        'setReadMarker': value,
-      if (_$GetChatParamsSwitchEnumMap[instance.includeLastKnown]
-          case final value?)
-        'includeLastKnown': value,
 };
 
 const _$GetChatParamsSwitchEnumMap = {

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

@@ -120,4 +120,5 @@ enum RichObjectStringObjectType {
   @JsonValue('guest') guest,
   @JsonValue('highlight') highlight,
   @JsonValue('talk-poll') talkPoll,
+  @JsonValue('geo-location') geoLocation,
 }

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

@@ -9,31 +9,35 @@ 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>))
+            .map(
+              (e) => GetChatResponseObject.fromJson(e as Map<String, dynamic>),
+            )
             .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) =>
     <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+      'headers': ?instance.headers,
       'data': instance.data.map((e) => e.toJson()).toList(),
     };
 
 GetChatResponseObject _$GetChatResponseObjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetChatResponseObject(
+) => GetChatResponseObject(
   (json['id'] as num).toInt(),
   json['token'] as String,
   $enumDecode(
-          _$GetRoomResponseObjectMessageActorTypeEnumMap, json['actorType']),
+    _$GetRoomResponseObjectMessageActorTypeEnumMap,
+    json['actorType'],
+  ),
   json['actorId'] as String,
   json['actorDisplayName'] as String,
   (json['timestamp'] as num).toInt(),
   json['systemMessage'] as String,
-      $enumDecode(
+  $enumDecode(_$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
-          _$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
   json['isReplyable'] as bool,
   json['referenceId'] as String,
   json['message'] as String,
@@ -41,18 +45,15 @@ GetChatResponseObject _$GetChatResponseObjectFromJson(
   (json['reactions'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, (e as num).toInt()),
   ),
-      (json['reactionsSelf'] as List<dynamic>?)
+  (json['reactionsSelf'] as List<dynamic>?)?.map((e) => e as String).toList(),
-          ?.map((e) => e as String)
-          .toList(),
   json['parent'] == null
       ? null
-          : GetChatResponseObject.fromJson(
+      : GetChatResponseObject.fromJson(json['parent'] as Map<String, dynamic>),
-              json['parent'] as Map<String, dynamic>),
 );
 
 Map<String, dynamic> _$GetChatResponseObjectToJson(
-        GetChatResponseObject instance) =>
+  GetChatResponseObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'token': instance.token,
   'actorType':
@@ -68,8 +69,9 @@ Map<String, dynamic> _$GetChatResponseObjectToJson(
   'message': instance.message,
   'reactions': instance.reactions,
   'reactionsSelf': instance.reactionsSelf,
-      'messageParameters':
+  'messageParameters': instance.messageParameters?.map(
-          instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
+    (k, e) => MapEntry(k, e.toJson()),
+  ),
   'parent': instance.parent?.toJson(),
 };
 
@@ -83,6 +85,7 @@ const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
 
 const _$GetRoomResponseObjectMessageTypeEnumMap = {
   GetRoomResponseObjectMessageType.comment: 'comment',
+  GetRoomResponseObjectMessageType.voiceMessage: 'voice-message',
   GetRoomResponseObjectMessageType.deletedComment: 'comment_deleted',
   GetRoomResponseObjectMessageType.system: 'system',
   GetRoomResponseObjectMessageType.command: 'command',
@@ -113,4 +116,5 @@ const _$RichObjectStringObjectTypeEnumMap = {
   RichObjectStringObjectType.guest: 'guest',
   RichObjectStringObjectType.highlight: 'highlight',
   RichObjectStringObjectType.talkPoll: 'talk-poll',
+  RichObjectStringObjectType.geoLocation: 'geo-location',
 };

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

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

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

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

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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,62 @@
+// 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,41 +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(
             k,
             (e as List<dynamic>)
-                .map((e) => GetReactionsResponseObject.fromJson(
+                .map(
-                    e as Map<String, dynamic>))
+                  (e) => GetReactionsResponseObject.fromJson(
-                .toList()),
+                    e as Map<String, dynamic>,
                   ),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+                )
+                .toList(),
+          ),
+        ),
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetReactionsResponseToJson(
-        GetReactionsResponse instance) =>
+  GetReactionsResponse instance,
-    <String, dynamic>{
+) => <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+  'headers': ?instance.headers,
-      'data': instance.data
+  'data': instance.data.map(
-          .map((k, e) => MapEntry(k, e.map((e) => e.toJson()).toList())),
+    (k, e) => MapEntry(k, e.map((e) => e.toJson()).toList()),
+  ),
 };
 
 GetReactionsResponseObject _$GetReactionsResponseObjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetReactionsResponseObject(
+) => GetReactionsResponseObject(
-      $enumDecode(
+  $enumDecode(_$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
-          _$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
   json['actorId'] as String,
   json['actorDisplayName'] as String,
   (json['timestamp'] as num).toInt(),
 );
 
 Map<String, dynamic> _$GetReactionsResponseObjectToJson(
-        GetReactionsResponseObject instance) =>
+  GetReactionsResponseObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'actorType':
       _$GetReactionsResponseObjectActorTypeEnumMap[instance.actorType]!,
   'actorId': instance.actorId,

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

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

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

@@ -9,15 +9,17 @@ 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) =>
+Map<String, dynamic> _$GetRoomParamsToJson(
-    <String, dynamic>{
+  GetRoomParams instance,
-      'noStatusUpdate':
+) => <String, dynamic>{
-          _$GetRoomParamsStatusUpdateEnumMap[instance.noStatusUpdate],
+  'noStatusUpdate': _$GetRoomParamsStatusUpdateEnumMap[instance.noStatusUpdate],
   'includeStatus': GetRoomParams._format(instance.includeStatus),
   'modifiedSince': instance.modifiedSince,
 };

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

@@ -162,6 +162,7 @@ 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

@@ -9,21 +9,24 @@ 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>))
+            .map(
+              (e) => GetRoomResponseObject.fromJson(e as Map<String, dynamic>),
+            )
             .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetRoomResponseToJson(GetRoomResponse instance) =>
     <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+      'headers': ?instance.headers,
       'data': instance.data.map((e) => e.toJson()).toList(),
     };
 
 GetRoomResponseObject _$GetRoomResponseObjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetRoomResponseObject(
+) => GetRoomResponseObject(
   (json['id'] as num).toInt(),
   json['token'] as String,
   $enumDecode(_$GetRoomResponseObjectConversationTypeEnumMap, json['type']),
@@ -44,23 +47,24 @@ GetRoomResponseObject _$GetRoomResponseObjectFromJson(
   json['canLeaveConversation'] as bool,
   (json['lastActivity'] as num).toInt(),
   json['isFavorite'] as bool,
-      $enumDecode(_$GetRoomResponseObjectParticipantNotificationLevelEnumMap,
+  $enumDecode(
-          json['notificationLevel']),
+    _$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(
+  GetChatResponseObject.fromJson(json['lastMessage'] as Map<String, dynamic>),
-          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) =>
+  GetRoomResponseObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'token': instance.token,
   'type': _$GetRoomResponseObjectConversationTypeEnumMap[instance.type]!,
@@ -82,8 +86,8 @@ Map<String, dynamic> _$GetRoomResponseObjectToJson(
   'lastActivity': instance.lastActivity,
   'isFavorite': instance.isFavorite,
   'notificationLevel':
-          _$GetRoomResponseObjectParticipantNotificationLevelEnumMap[
+      _$GetRoomResponseObjectParticipantNotificationLevelEnumMap[instance
-              instance.notificationLevel]!,
+          .notificationLevel]!,
   'unreadMessages': instance.unreadMessages,
   'unreadMention': instance.unreadMention,
   'unreadMentionDirect': instance.unreadMentionDirect,

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,
-      if (instance.replyTo case final value?) 'replyTo': value,
+      'replyTo': ?instance.replyTo,
     };

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

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

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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,15 @@
+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

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

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

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

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

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

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

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

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

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

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

@@ -7,8 +7,8 @@ part of 'customTimetableEvent.dart';
 // **************************************************************************
 
 CustomTimetableEvent _$CustomTimetableEventFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    CustomTimetableEvent(
+) => CustomTimetableEvent(
   id: json['id'] as String,
   title: json['title'] as String,
   description: json['description'] as String,
@@ -21,8 +21,8 @@ CustomTimetableEvent _$CustomTimetableEventFromJson(
 );
 
 Map<String, dynamic> _$CustomTimetableEventToJson(
-        CustomTimetableEvent instance) =>
+  CustomTimetableEvent instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'title': instance.title,
   'description': instance.description,

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

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

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

@@ -7,18 +7,19 @@ 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>))
+            .map(
+              (e) => CustomTimetableEvent.fromJson(e as Map<String, dynamic>),
+            )
             .toList(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetCustomTimetableEventResponseToJson(
-        GetCustomTimetableEventResponse instance) =>
+  GetCustomTimetableEventResponse instance,
-    <String, dynamic>{
+) => <String, dynamic>{'headers': ?instance.headers, 'events': instance.events};
-      if (instance.headers case final value?) 'headers': value,
-      'events': instance.events,
-    };

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

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

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

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

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

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

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

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

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

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

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

@@ -7,20 +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(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$AuthenticateResponseToJson(
-        AuthenticateResponse instance) =>
+  AuthenticateResponse instance,
-    <String, dynamic>{
+) => <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+  'headers': ?instance.headers,
   'sessionId': instance.sessionId,
   'personType': instance.personType,
   'personId': instance.personId,

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

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

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

@@ -10,21 +10,23 @@ GetRoomsResponse _$GetRoomsResponseFromJson(Map<String, dynamic> json) =>
     GetRoomsResponse(
         (json['result'] as List<dynamic>)
             .map(
-              (e) => GetRoomsResponseObject.fromJson(e as Map<String, dynamic>))
+              (e) => GetRoomsResponseObject.fromJson(e as Map<String, dynamic>),
+            )
             .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetRoomsResponseToJson(GetRoomsResponse instance) =>
     <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+      'headers': ?instance.headers,
       'result': instance.result.map((e) => e.toJson()).toList(),
     };
 
 GetRoomsResponseObject _$GetRoomsResponseObjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetRoomsResponseObject(
+) => GetRoomsResponseObject(
   (json['id'] as num).toInt(),
   json['name'] as String,
   json['longName'] as String,
@@ -33,8 +35,8 @@ GetRoomsResponseObject _$GetRoomsResponseObjectFromJson(
 );
 
 Map<String, dynamic> _$GetRoomsResponseObjectToJson(
-        GetRoomsResponseObject instance) =>
+  GetRoomsResponseObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longName': instance.longName,

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

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

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

@@ -9,19 +9,19 @@ 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>{
+    <String, dynamic>{'options': instance.options.toJson()};
-      'options': instance.options.toJson(),
-    };
 
 GetTimetableParamsOptions _$GetTimetableParamsOptionsFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableParamsOptions(
+) => GetTimetableParamsOptions(
   element: GetTimetableParamsOptionsElement.fromJson(
-          json['element'] as Map<String, dynamic>),
+    json['element'] as Map<String, dynamic>,
+  ),
   startDate: (json['startDate'] as num?)?.toInt(),
   endDate: (json['endDate'] as num?)?.toInt(),
   onlyBaseTimetable: json['onlyBaseTimetable'] as bool?,
@@ -46,40 +46,30 @@ GetTimetableParamsOptions _$GetTimetableParamsOptionsFromJson(
 );
 
 Map<String, dynamic> _$GetTimetableParamsOptionsToJson(
-        GetTimetableParamsOptions instance) =>
+  GetTimetableParamsOptions instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'element': instance.element.toJson(),
-      if (instance.startDate case final value?) 'startDate': value,
+  'startDate': ?instance.startDate,
-      if (instance.endDate case final value?) 'endDate': value,
+  'endDate': ?instance.endDate,
-      if (instance.onlyBaseTimetable case final value?)
+  'onlyBaseTimetable': ?instance.onlyBaseTimetable,
-        'onlyBaseTimetable': value,
+  'showBooking': ?instance.showBooking,
-      if (instance.showBooking case final value?) 'showBooking': value,
+  'showInfo': ?instance.showInfo,
-      if (instance.showInfo case final value?) 'showInfo': value,
+  'showSubstText': ?instance.showSubstText,
-      if (instance.showSubstText case final value?) 'showSubstText': value,
+  'showLsText': ?instance.showLsText,
-      if (instance.showLsText case final value?) 'showLsText': value,
+  'showLsNumber': ?instance.showLsNumber,
-      if (instance.showLsNumber case final value?) 'showLsNumber': value,
+  'showStudentgroup': ?instance.showStudentgroup,
-      if (instance.showStudentgroup case final value?)
+  'klasseFields': ?instance.klasseFields
-        'showStudentgroup': value,
-      if (instance.klasseFields
       ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-              .toList()
+      .toList(),
-          case final value?)
+  'roomFields': ?instance.roomFields
-        'klasseFields': value,
-      if (instance.roomFields
       ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-              .toList()
+      .toList(),
-          case final value?)
+  'subjectFields': ?instance.subjectFields
-        'roomFields': value,
-      if (instance.subjectFields
       ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-              .toList()
+      .toList(),
-          case final value?)
+  'teacherFields': ?instance.teacherFields
-        'subjectFields': value,
-      if (instance.teacherFields
       ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-              .toList()
+      .toList(),
-          case final value?)
-        'teacherFields': value,
 };
 
 const _$GetTimetableParamsOptionsFieldsEnumMap = {
@@ -90,22 +80,23 @@ const _$GetTimetableParamsOptionsFieldsEnumMap = {
 };
 
 GetTimetableParamsOptionsElement _$GetTimetableParamsOptionsElementFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableParamsOptionsElement(
+) => GetTimetableParamsOptionsElement(
   id: (json['id'] as num).toInt(),
   type: (json['type'] as num).toInt(),
   keyType: $enumDecodeNullable(
-          _$GetTimetableParamsOptionsElementKeyTypeEnumMap, json['keyType']),
+    _$GetTimetableParamsOptionsElementKeyTypeEnumMap,
+    json['keyType'],
+  ),
 );
 
 Map<String, dynamic> _$GetTimetableParamsOptionsElementToJson(
-        GetTimetableParamsOptionsElement instance) =>
+  GetTimetableParamsOptionsElement instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'type': instance.type,
-      if (_$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType]
+  'keyType':
-          case final value?)
+      ?_$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType],
-        'keyType': value,
 };
 
 const _$GetTimetableParamsOptionsElementKeyTypeEnumMap = {

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

@@ -7,26 +7,31 @@ part of 'getTimetableResponse.dart';
 // **************************************************************************
 
 GetTimetableResponse _$GetTimetableResponseFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
+) =>
     GetTimetableResponse(
         (json['result'] as List<dynamic>)
-          .map((e) =>
+            .map(
-              GetTimetableResponseObject.fromJson(e as Map<String, dynamic>))
+              (e) => GetTimetableResponseObject.fromJson(
+                e as Map<String, dynamic>,
+              ),
+            )
             .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as String),
       );
 
 Map<String, dynamic> _$GetTimetableResponseToJson(
-        GetTimetableResponse instance) =>
+  GetTimetableResponse instance,
-    <String, dynamic>{
+) => <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
+  'headers': ?instance.headers,
   'result': instance.result.map((e) => e.toJson()).toList(),
 };
 
 GetTimetableResponseObject _$GetTimetableResponseObjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObject(
+) => GetTimetableResponseObject(
   id: (json['id'] as num).toInt(),
   date: (json['date'] as num).toInt(),
   startTime: (json['startTime'] as num).toInt(),
@@ -42,26 +47,36 @@ GetTimetableResponseObject _$GetTimetableResponseObjectFromJson(
   sg: json['sg'] as String?,
   bkRemark: json['bkRemark'] as String?,
   kl: (json['kl'] as List<dynamic>)
-          .map((e) => GetTimetableResponseObjectClass.fromJson(
+      .map(
-              e as Map<String, dynamic>))
+        (e) =>
+            GetTimetableResponseObjectClass.fromJson(e as Map<String, dynamic>),
+      )
       .toList(),
   te: (json['te'] as List<dynamic>)
-          .map((e) => GetTimetableResponseObjectTeacher.fromJson(
+      .map(
-              e as Map<String, dynamic>))
+        (e) => GetTimetableResponseObjectTeacher.fromJson(
+          e as Map<String, dynamic>,
+        ),
+      )
       .toList(),
   su: (json['su'] as List<dynamic>)
-          .map((e) => GetTimetableResponseObjectSubject.fromJson(
+      .map(
-              e as Map<String, dynamic>))
+        (e) => GetTimetableResponseObjectSubject.fromJson(
+          e as Map<String, dynamic>,
+        ),
+      )
       .toList(),
   ro: (json['ro'] as List<dynamic>)
-          .map((e) => GetTimetableResponseObjectRoom.fromJson(
+      .map(
-              e as Map<String, dynamic>))
+        (e) =>
+            GetTimetableResponseObjectRoom.fromJson(e as Map<String, dynamic>),
+      )
       .toList(),
 )..bkText = json['bkText'] as String?;
 
 Map<String, dynamic> _$GetTimetableResponseObjectToJson(
-        GetTimetableResponseObject instance) =>
+  GetTimetableResponseObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'date': instance.date,
   'startTime': instance.startTime,
@@ -84,23 +99,23 @@ Map<String, dynamic> _$GetTimetableResponseObjectToJson(
 };
 
 GetTimetableResponseObjectFields _$GetTimetableResponseObjectFieldsFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObjectFields(
+) => GetTimetableResponseObjectFields(
   (json['te'] as List<dynamic>?)
-          ?.map((e) => GetTimetableResponseObjectFieldsObject.fromJson(
+      ?.map(
-              e as Map<String, dynamic>))
+        (e) => GetTimetableResponseObjectFieldsObject.fromJson(
+          e as Map<String, dynamic>,
+        ),
+      )
       .toList(),
 );
 
 Map<String, dynamic> _$GetTimetableResponseObjectFieldsToJson(
-        GetTimetableResponseObjectFields instance) =>
+  GetTimetableResponseObjectFields instance,
-    <String, dynamic>{
+) => <String, dynamic>{'te': instance.te?.map((e) => e.toJson()).toList()};
-      'te': instance.te?.map((e) => e.toJson()).toList(),
-    };
 
 GetTimetableResponseObjectFieldsObject
-    _$GetTimetableResponseObjectFieldsObjectFromJson(
+_$GetTimetableResponseObjectFieldsObjectFromJson(Map<String, dynamic> json) =>
-            Map<String, dynamic> json) =>
     GetTimetableResponseObjectFieldsObject(
       id: (json['id'] as num?)?.toInt(),
       name: json['name'] as String?,
@@ -109,8 +124,8 @@ GetTimetableResponseObjectFieldsObject
     );
 
 Map<String, dynamic> _$GetTimetableResponseObjectFieldsObjectToJson(
-        GetTimetableResponseObjectFieldsObject instance) =>
+  GetTimetableResponseObjectFieldsObject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longname': instance.longname,
@@ -118,8 +133,8 @@ Map<String, dynamic> _$GetTimetableResponseObjectFieldsObjectToJson(
 };
 
 GetTimetableResponseObjectClass _$GetTimetableResponseObjectClassFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObjectClass(
+) => GetTimetableResponseObjectClass(
   (json['id'] as num).toInt(),
   json['name'] as String,
   json['longname'] as String,
@@ -127,8 +142,8 @@ GetTimetableResponseObjectClass _$GetTimetableResponseObjectClassFromJson(
 );
 
 Map<String, dynamic> _$GetTimetableResponseObjectClassToJson(
-        GetTimetableResponseObjectClass instance) =>
+  GetTimetableResponseObjectClass instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longname': instance.longname,
@@ -136,8 +151,8 @@ Map<String, dynamic> _$GetTimetableResponseObjectClassToJson(
 };
 
 GetTimetableResponseObjectTeacher _$GetTimetableResponseObjectTeacherFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObjectTeacher(
+) => GetTimetableResponseObjectTeacher(
   (json['id'] as num).toInt(),
   json['name'] as String,
   json['longname'] as String,
@@ -147,8 +162,8 @@ GetTimetableResponseObjectTeacher _$GetTimetableResponseObjectTeacherFromJson(
 );
 
 Map<String, dynamic> _$GetTimetableResponseObjectTeacherToJson(
-        GetTimetableResponseObjectTeacher instance) =>
+  GetTimetableResponseObjectTeacher instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longname': instance.longname,
@@ -158,32 +173,32 @@ Map<String, dynamic> _$GetTimetableResponseObjectTeacherToJson(
 };
 
 GetTimetableResponseObjectSubject _$GetTimetableResponseObjectSubjectFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObjectSubject(
+) => GetTimetableResponseObjectSubject(
   (json['id'] as num).toInt(),
   json['name'] as String,
   json['longname'] as String,
 );
 
 Map<String, dynamic> _$GetTimetableResponseObjectSubjectToJson(
-        GetTimetableResponseObjectSubject instance) =>
+  GetTimetableResponseObjectSubject instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longname': instance.longname,
 };
 
 GetTimetableResponseObjectRoom _$GetTimetableResponseObjectRoomFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    GetTimetableResponseObjectRoom(
+) => GetTimetableResponseObjectRoom(
   (json['id'] as num).toInt(),
   json['name'] as String,
   json['longname'] as String,
 );
 
 Map<String, dynamic> _$GetTimetableResponseObjectRoomToJson(
-        GetTimetableResponseObjectRoom instance) =>
+  GetTimetableResponseObjectRoom instance,
-    <String, dynamic>{
+) => <String, dynamic>{
   'id': instance.id,
   'name': instance.name,
   'longname': instance.longname,

lib/api/webuntis/webuntisApi.dart

@@ -19,7 +19,7 @@ abstract class WebuntisApi extends ApiRequest {
   WebuntisApi(this.method, this.genericParam, {this.authenticatedResponse = true});
 
 
-  Future<String> query(WebuntisApi untis) async {
+  Future<String> query(WebuntisApi untis, {bool retry = false}) async {
     var query = '{"id":"ID","method":"$method","params":${untis._body()},"jsonrpc":"2.0"}';
 
     var sessionId = '0';
@@ -32,8 +32,9 @@ abstract class WebuntisApi extends ApiRequest {
     dynamic jsonData = jsonDecode(data.body);
     if(jsonData['error'] != null) {
       if(jsonData['error']['code'] == -8520) {
+        if(retry) throw WebuntisError('Authentication was tried (probably session timeout), but was not successful!', 1);
         await Authenticate.createSession();
-        this.query(untis);
+        return await this.query(untis, retry: true);
       } else {
         throw WebuntisError(jsonData['error']['message'], jsonData['error']['code']);
       }

lib/main.dart

@@ -46,6 +46,7 @@ Future<void> main() async {
 
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r3.pem').then(addCertificateAsTrusted),
     PlatformAssetBundle().load('assets/ca/lets-encrypt-r10.pem').then(addCertificateAsTrusted),
+    PlatformAssetBundle().load('assets/ca/lets-encrypt-r13.pem').then(addCertificateAsTrusted),
 
     Future(() async {
       await HydratedStorage.build(

lib/model/endpointData.dart

@@ -41,7 +41,7 @@ class EndpointData {
 
   Endpoint webuntis() => EndpointOptions(
       live: Endpoint(
-        domain: 'peleus.webuntis.com',
+        domain: 'marianum-fulda.webuntis.com',
       ),
       staged: Endpoint(
         domain: 'mhsl.eu',

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
-class LoadableStateState with _$LoadableStateState {
+abstract 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 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // 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,103 +9,208 @@ 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)
-  $LoadableStateStateCopyWith<LoadableStateState> get copyWith =>
+@pragma('vm:prefer-inline')
-      throw _privateConstructorUsedError;
+$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)';
+}
+
+
 }
 
 /// @nodoc
-abstract class $LoadableStateStateCopyWith<$Res> {
+abstract mixin class $LoadableStateStateCopyWith<$Res>  {
-  factory $LoadableStateStateCopyWith(
+  factory $LoadableStateStateCopyWith(LoadableStateState value, $Res Function(LoadableStateState) _then) = _$LoadableStateStateCopyWithImpl;
-          LoadableStateState value, $Res Function(LoadableStateState) then) =
-      _$LoadableStateStateCopyWithImpl<$Res, LoadableStateState>;
 @useResult
-  $Res call({List<ConnectivityResult>? connections});
+$Res call({
+ List<ConnectivityResult>? connections
+});
+
+
+
+
 }
-
 /// @nodoc
-class _$LoadableStateStateCopyWithImpl<$Res, $Val extends LoadableStateState>
+class _$LoadableStateStateCopyWithImpl<$Res>
     implements $LoadableStateStateCopyWith<$Res> {
-  _$LoadableStateStateCopyWithImpl(this._value, this._then);
+  _$LoadableStateStateCopyWithImpl(this._self, this._then);
 
-  // ignore: unused_field
+  final LoadableStateState _self;
-  final $Val _value;
+  final $Res Function(LoadableStateState) _then;
-  // 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')
+@pragma('vm:prefer-inline') @override $Res call({Object? connections = freezed,}) {
-  @override
+  return _then(_self.copyWith(
-  $Res call({
+connections: freezed == connections ? _self.connections : connections // ignore: cast_nullable_to_non_nullable
-    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);
-
-  /// 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>?,
   ));
 }
+
+}
+
+
+/// 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;
+
+}
+}
+
 }
 
 /// @nodoc
 
-class _$LoadableStateStateImpl implements _LoadableStateState {
+
-  const _$LoadableStateStateImpl(
+class _LoadableStateState implements LoadableStateState {
-      {required final List<ConnectivityResult>? connections})
+  const _LoadableStateState({required final  List<ConnectivityResult>? connections}): _connections = connections;
-      : _connections = connections;
+  
 
  final  List<ConnectivityResult>? _connections;
-  @override
+@override List<ConnectivityResult>? get connections {
-  List<ConnectivityResult>? get connections {
   final value = _connections;
   if (value == null) return null;
   if (_connections is EqualUnmodifiableListView) return _connections;
@@ -113,46 +218,62 @@ class _$LoadableStateStateImpl implements _LoadableStateState {
   return EqualUnmodifiableListView(value);
 }
 
+
+/// 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
+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)';
 }
 
-  @override
+
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$LoadableStateStateImpl &&
-            const DeepCollectionEquality()
-                .equals(other._connections, _connections));
 }
 
-  @override
+/// @nodoc
-  int get hashCode => Object.hash(
+abstract mixin class _$LoadableStateStateCopyWith<$Res> implements $LoadableStateStateCopyWith<$Res> {
-      runtimeType, const DeepCollectionEquality().hash(_connections));
+  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.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+@override @pragma('vm:prefer-inline') $Res call({Object? connections = freezed,}) {
-  @override
+  return _then(_LoadableStateState(
-  @pragma('vm:prefer-inline')
+connections: freezed == connections ? _self._connections : connections // ignore: cast_nullable_to_non_nullable
-  _$$LoadableStateStateImplCopyWith<_$LoadableStateStateImpl> get copyWith =>
+as List<ConnectivityResult>?,
-      __$$LoadableStateStateImplCopyWithImpl<_$LoadableStateStateImpl>(
+  ));
-          this, _$identity);
 }
 
-abstract class _LoadableStateState implements LoadableStateState {
-  const factory _LoadableStateState(
-          {required final List<ConnectivityResult>? connections}) =
-      _$LoadableStateStateImpl;
 
-  @override
-  List<ConnectivityResult>? get 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;
 }
+
+// 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
-class LoadableState<TState> with _$LoadableState {
+abstract class LoadableState<TState> with _$LoadableState<TState> {
   const LoadableState._();
 
   const factory LoadableState({
@@ -14,7 +14,7 @@ class LoadableState<TState> with _$LoadableState {
     required int? lastFetch,
     required void Function()? reFetch,
     required LoadingError? error,
-  }) = _LoadableState;
+  }) = _LoadableState<TState>;
 
   bool _hasError() => error != null;
   bool _hasData() => data != null;

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

@@ -1,5 +1,5 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // 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,86 +9,284 @@ 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)
-  $LoadableStateCopyWith<TState, LoadableState<TState>> get copyWith =>
+@pragma('vm:prefer-inline')
-      throw _privateConstructorUsedError;
+$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)';
+}
+
+
 }
 
 /// @nodoc
-abstract class $LoadableStateCopyWith<TState, $Res> {
+abstract mixin class $LoadableStateCopyWith<TState,$Res>  {
-  factory $LoadableStateCopyWith(LoadableState<TState> value,
+  factory $LoadableStateCopyWith(LoadableState<TState> value, $Res Function(LoadableState<TState>) _then) = _$LoadableStateCopyWithImpl;
-          $Res Function(LoadableState<TState>) then) =
-      _$LoadableStateCopyWithImpl<TState, $Res, LoadableState<TState>>;
 @useResult
-  $Res call(
+$Res call({
-      {bool isLoading,
+ bool isLoading, TState? data, int? lastFetch, void Function()? reFetch, LoadingError? error
-      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._value, this._then);
+  _$LoadableStateCopyWithImpl(this._self, this._then);
 
-  // ignore: unused_field
+  final LoadableState<TState> _self;
-  final $Val _value;
+  final $Res Function(LoadableState<TState>) _then;
-  // 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')
+@pragma('vm:prefer-inline') @override $Res call({Object? isLoading = null,Object? data = freezed,Object? lastFetch = freezed,Object? reFetch = freezed,Object? error = freezed,}) {
-  @override
+  return _then(_self.copyWith(
-  $Res call({
+isLoading: null == isLoading ? _self.isLoading : isLoading // ignore: cast_nullable_to_non_nullable
-    Object? isLoading = null,
+as bool,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
-    Object? data = freezed,
+as TState?,lastFetch: freezed == lastFetch ? _self.lastFetch : lastFetch // ignore: cast_nullable_to_non_nullable
-    Object? lastFetch = freezed,
+as int?,reFetch: freezed == reFetch ? _self.reFetch : reFetch // ignore: cast_nullable_to_non_nullable
-    Object? reFetch = freezed,
+as void Function()?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
-    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);
+  ));
+}
+/// 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;
+  }
+
+  return $LoadingErrorCopyWith<$Res>(_self.error!, (value) {
+    return _then(_self.copyWith(error: value));
+  });
+}
+}
+
+
+/// 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;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+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;
+
+/// 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
@@ -96,159 +294,14 @@ class _$LoadableStateCopyWithImpl<TState, $Res,
 @override
 @pragma('vm:prefer-inline')
 $LoadingErrorCopyWith<$Res>? get error {
-    if (_value.error == null) {
+    if (_self.error == null) {
     return null;
   }
 
-    return $LoadingErrorCopyWith<$Res>(_value.error!, (value) {
+  return $LoadingErrorCopyWith<$Res>(_self.error!, (value) {
-      return _then(_value.copyWith(error: value) as $Val);
+    return _then(_self.copyWith(error: value));
   });
 }
 }
 
-/// @nodoc
+// dart format on
-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});
-
-  @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._();
-
-  @override
-  final bool isLoading;
-  @override
-  final TState? data;
-  @override
-  final int? lastFetch;
-  @override
-  final void Function()? reFetch;
-  @override
-  final LoadingError? error;
-
-  @override
-  String toString() {
-    return 'LoadableState<$TState>(isLoading: $isLoading, data: $data, lastFetch: $lastFetch, reFetch: $reFetch, error: $error)';
-  }
-
-  @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);
-}
-
-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
-class LoadingError with _$LoadingError {
+abstract 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 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // 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,155 +9,266 @@ 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)
-  $LoadingErrorCopyWith<LoadingError> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-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, $Val extends LoadingError>
-    implements $LoadingErrorCopyWith<$Res> {
-  _$LoadingErrorCopyWithImpl(this._value, this._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
+$LoadingErrorCopyWith<LoadingError> get copyWith => _$LoadingErrorCopyWithImpl<LoadingError>(this as LoadingError, _$identity);
-  $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);
-
-  /// 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});
 
 @override
-  final String message;
+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
-  @JsonKey()
+int get hashCode => Object.hash(runtimeType,message,allowRetry);
-  final bool allowRetry;
 
 @override
 String toString() {
   return 'LoadingError(message: $message, allowRetry: $allowRetry)';
 }
 
+
+}
+
+/// @nodoc
+abstract mixin class $LoadingErrorCopyWith<$Res>  {
+  factory $LoadingErrorCopyWith(LoadingError value, $Res Function(LoadingError) _then) = _$LoadingErrorCopyWithImpl;
+@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.
+@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,
+  ));
+}
+
+}
+
+
+/// 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;
+
+}
+}
+
+}
+
+/// @nodoc
+
+
+class _LoadingError implements LoadingError {
+  const _LoadingError({required this.message, this.allowRetry = false});
+  
+
+@override final  String message;
+@override@JsonKey() final  bool 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) ||
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _LoadingError&&(identical(other.message, message) || other.message == message)&&(identical(other.allowRetry, allowRetry) || other.allowRetry == allowRetry));
-        (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);
 
-  /// 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')
+String toString() {
-  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
+  return 'LoadingError(message: $message, allowRetry: $allowRetry)';
-      __$$LoadingErrorImplCopyWithImpl<_$LoadingErrorImpl>(this, _$identity);
 }
 
-abstract class _LoadingError implements LoadingError {
-  const factory _LoadingError(
-      {required final String message,
-      final bool allowRetry}) = _$LoadingErrorImpl;
 
-  @override
+}
-  String get message;
+
-  @override
+/// @nodoc
-  bool get allowRetry;
+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
+@override @pragma('vm:prefer-inline') $Res call({Object? message = null,Object? allowRetry = null,}) {
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  return _then(_LoadingError(
-  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
+message: null == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
-      throw _privateConstructorUsedError;
+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
-class LoadableSaveContext with _$LoadableSaveContext {
+abstract 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 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // 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,160 +9,269 @@ 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 => throw _privateConstructorUsedError;
-
-  /// Serializes this LoadableSaveContext to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 
+ int get timestamp;
 /// 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 class $LoadableSaveContextCopyWith<$Res> {
-  factory $LoadableSaveContextCopyWith(
-          LoadableSaveContext value, $Res Function(LoadableSaveContext) then) =
-      _$LoadableSaveContextCopyWithImpl<$Res, LoadableSaveContext>;
-  @useResult
-  $Res call({int timestamp});
-}
-
-/// @nodoc
-class _$LoadableSaveContextCopyWithImpl<$Res, $Val extends LoadableSaveContext>
-    implements $LoadableSaveContextCopyWith<$Res> {
-  _$LoadableSaveContextCopyWithImpl(this._value, this._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
+$LoadableSaveContextCopyWith<LoadableSaveContext> get copyWith => _$LoadableSaveContextCopyWithImpl<LoadableSaveContext>(this as LoadableSaveContext, _$identity);
-  $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
+  /// Serializes this LoadableSaveContext to a JSON map.
-abstract class _$$LoadableSaveContextImplCopyWith<$Res>
+  Map<String, dynamic> toJson();
-    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);
-
-  /// 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._();
-
-  factory _$LoadableSaveContextImpl.fromJson(Map<String, dynamic> json) =>
-      _$$LoadableSaveContextImplFromJson(json);
-
-  @override
-  final int timestamp;
-
-  @override
-  String toString() {
-    return 'LoadableSaveContext(timestamp: $timestamp)';
-  }
 
 @override
 bool operator ==(Object other) {
-    return identical(this, other) ||
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is LoadableSaveContext&&(identical(other.timestamp, timestamp) || other.timestamp == timestamp));
-        (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);
 
+@override
+String toString() {
+  return 'LoadableSaveContext(timestamp: $timestamp)';
+}
+
+
+}
+
+/// @nodoc
+abstract mixin class $LoadableSaveContextCopyWith<$Res>  {
+  factory $LoadableSaveContextCopyWith(LoadableSaveContext value, $Res Function(LoadableSaveContext) _then) = _$LoadableSaveContextCopyWithImpl;
+@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.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline') @override $Res call({Object? timestamp = null,}) {
-  @override
+  return _then(_self.copyWith(
+timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
+as int,
+  ));
+}
+
+}
+
+
+/// 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;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+class _LoadableSaveContext extends LoadableSaveContext {
+  const _LoadableSaveContext({required this.timestamp}): super._();
+  factory _LoadableSaveContext.fromJson(Map<String, dynamic> json) => _$LoadableSaveContextFromJson(json);
+
+@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')
-  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
+_$LoadableSaveContextCopyWith<_LoadableSaveContext> get copyWith => __$LoadableSaveContextCopyWithImpl<_LoadableSaveContext>(this, _$identity);
-      __$$LoadableSaveContextImplCopyWithImpl<_$LoadableSaveContextImpl>(
-          this, _$identity);
 
 @override
 Map<String, dynamic> toJson() {
-    return _$$LoadableSaveContextImplToJson(
+  return _$LoadableSaveContextToJson(this, );
-      this,
-    );
 }
-}
-
-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;
+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)';
+}
+
+
+}
+
+/// @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
+@override @pragma('vm:prefer-inline') $Res call({Object? timestamp = null,}) {
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  return _then(_LoadableSaveContext(
-  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
+timestamp: null == timestamp ? _self.timestamp : timestamp // ignore: cast_nullable_to_non_nullable
-      throw _privateConstructorUsedError;
+as int,
+  ));
 }
+
+
+}
+
+// dart format on

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

@@ -6,14 +6,9 @@ part of 'loadable_save_context.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$LoadableSaveContextImpl _$$LoadableSaveContextImplFromJson(
+_LoadableSaveContext _$LoadableSaveContextFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _LoadableSaveContext(timestamp: (json['timestamp'] as num).toInt());
-    _$LoadableSaveContextImpl(
-      timestamp: (json['timestamp'] as num).toInt(),
-    );
 
-Map<String, dynamic> _$$LoadableSaveContextImplToJson(
+Map<String, dynamic> _$LoadableSaveContextToJson(
-        _$LoadableSaveContextImpl instance) =>
+  _LoadableSaveContext instance,
-    <String, dynamic>{
+) => <String, dynamic>{'timestamp': instance.timestamp};
-      '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
-class GradeAveragesState with _$GradeAveragesState {
+abstract 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 @@
-// coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
+// coverage:ignore-file
 // 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,185 +9,278 @@ 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 =>
-      throw _privateConstructorUsedError;
-  List<int> get grades => throw _privateConstructorUsedError;
-
-  /// Serializes this GradeAveragesState to a JSON map.
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
 
+ 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)
-  $GradeAveragesStateCopyWith<GradeAveragesState> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-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, $Val extends GradeAveragesState>
-    implements $GradeAveragesStateCopyWith<$Res> {
-  _$GradeAveragesStateCopyWithImpl(this._value, this._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
+$GradeAveragesStateCopyWith<GradeAveragesState> get copyWith => _$GradeAveragesStateCopyWithImpl<GradeAveragesState>(this as GradeAveragesState, _$identity);
-  $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
+  /// Serializes this GradeAveragesState to a JSON map.
-abstract class _$$GradeAveragesStateImplCopyWith<$Res>
+  Map<String, dynamic> toJson();
-    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);
-
-  /// 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;
-
-  factory _$GradeAveragesStateImpl.fromJson(Map<String, dynamic> json) =>
-      _$$GradeAveragesStateImplFromJson(json);
 
 @override
-  final GradeAveragesGradingSystem gradingSystem;
+bool operator ==(Object other) {
-  final List<int> _grades;
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is GradeAveragesState&&(identical(other.gradingSystem, gradingSystem) || other.gradingSystem == gradingSystem)&&const DeepCollectionEquality().equals(other.grades, grades));
-  @override
-  List<int> get grades {
-    if (_grades is EqualUnmodifiableListView) return _grades;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_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)';
 }
 
-  @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)
+/// @nodoc
-  @override
+abstract mixin class $GradeAveragesStateCopyWith<$Res>  {
-  int get hashCode => Object.hash(
+  factory $GradeAveragesStateCopyWith(GradeAveragesState value, $Res Function(GradeAveragesState) _then) = _$GradeAveragesStateCopyWithImpl;
-      runtimeType, gradingSystem, const DeepCollectionEquality().hash(_grades));
+@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.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+@pragma('vm:prefer-inline') @override $Res call({Object? gradingSystem = null,Object? grades = null,}) {
-  @override
+  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>,
+  ));
+}
+
+}
+
+
+/// 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;
+
+}
+}
+
+}
+
+/// @nodoc
+@JsonSerializable()
+
+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);
+
+@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);
+}
+
+
+/// 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')
-  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
+_$GradeAveragesStateCopyWith<_GradeAveragesState> get copyWith => __$GradeAveragesStateCopyWithImpl<_GradeAveragesState>(this, _$identity);
-      __$$GradeAveragesStateImplCopyWithImpl<_$GradeAveragesStateImpl>(
-          this, _$identity);
 
 @override
 Map<String, dynamic> toJson() {
-    return _$$GradeAveragesStateImplToJson(
+  return _$GradeAveragesStateToJson(this, );
-      this,
-    );
-  }
 }
 
-abstract class _GradeAveragesState implements GradeAveragesState {
+@override
-  const factory _GradeAveragesState(
+bool operator ==(Object other) {
-      {required final GradeAveragesGradingSystem gradingSystem,
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _GradeAveragesState&&(identical(other.gradingSystem, gradingSystem) || other.gradingSystem == gradingSystem)&&const DeepCollectionEquality().equals(other._grades, _grades));
-      required final List<int> grades}) = _$GradeAveragesStateImpl;
+}
 
-  factory _GradeAveragesState.fromJson(Map<String, dynamic> json) =
+@JsonKey(includeFromJson: false, includeToJson: false)
-      _$GradeAveragesStateImpl.fromJson;
+@override
+int get hashCode => Object.hash(runtimeType,gradingSystem,const DeepCollectionEquality().hash(_grades));
 
 @override
-  GradeAveragesGradingSystem get gradingSystem;
+String toString() {
-  @override
+  return 'GradeAveragesState(gradingSystem: $gradingSystem, grades: $grades)';
-  List<int> get 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
+@override @pragma('vm:prefer-inline') $Res call({Object? gradingSystem = null,Object? grades = null,}) {
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  return _then(_GradeAveragesState(
-  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
+gradingSystem: null == gradingSystem ? _self.gradingSystem : gradingSystem // ignore: cast_nullable_to_non_nullable
-      throw _privateConstructorUsedError;
+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,21 +6,21 @@ part of 'grade_averages_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$GradeAveragesStateImpl _$$GradeAveragesStateImplFromJson(
+_GradeAveragesState _$GradeAveragesStateFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _GradeAveragesState(
-    _$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> _$$GradeAveragesStateImplToJson(
+Map<String, dynamic> _$GradeAveragesStateToJson(
-        _$GradeAveragesStateImpl instance) =>
+  _GradeAveragesState instance,
-    <String, dynamic>{
+) => <String, dynamic>{
-      'gradingSystem':
+  'gradingSystem': _$GradeAveragesGradingSystemEnumMap[instance.gradingSystem]!,
-          _$GradeAveragesGradingSystemEnumMap[instance.gradingSystem]!,
   'grades': instance.grades,
 };
 

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 ? 'Notensystem' : 'Punktesystem'),
+                      Text(isMiddleSchool ? 'Realschule' : 'Oberstufe'),
                     ],
                   ),
                 )).toList(),
@@ -80,11 +80,19 @@ class GradeAveragesView extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               const SizedBox(height: 30),
-              Text(bloc.average().toStringAsFixed(2), style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
+              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))
+                ],
+              ),
               const SizedBox(height: 10),
               const Divider(),
               const SizedBox(height: 10),
-              Text(bloc.isMiddleSchool() ? 'Wähle unten die Anzahl deiner jeweiligen Noten aus' : 'Wähle unten die Anzahl deiner jeweiligen Punkte aus'),
+              Text(bloc.isMiddleSchool() ? 'Wähle die Anzahl deiner jeweiligen Noten aus' : 'Wähle 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
-class HolidaysState with _$HolidaysState {
+abstract class HolidaysState with _$HolidaysState {
   const factory HolidaysState({
     required bool showPastHolidays,
     required bool showDisclaimer,
@@ -16,7 +16,7 @@ class HolidaysState with _$HolidaysState {
 }
 
 @freezed
-class Holiday with _$Holiday {
+abstract 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
 // **************************************************************************
 
-_$HolidaysStateImpl _$$HolidaysStateImplFromJson(Map<String, dynamic> json) =>
+_HolidaysState _$HolidaysStateFromJson(Map<String, dynamic> json) =>
-    _$HolidaysStateImpl(
+    _HolidaysState(
       showPastHolidays: json['showPastHolidays'] as bool,
       showDisclaimer: json['showDisclaimer'] as bool,
       holidays: (json['holidays'] as List<dynamic>)
@@ -15,15 +15,14 @@ _$HolidaysStateImpl _$$HolidaysStateImplFromJson(Map<String, dynamic> json) =>
           .toList(),
     );
 
-Map<String, dynamic> _$$HolidaysStateImplToJson(_$HolidaysStateImpl instance) =>
+Map<String, dynamic> _$HolidaysStateToJson(_HolidaysState instance) =>
     <String, dynamic>{
       'showPastHolidays': instance.showPastHolidays,
       'showDisclaimer': instance.showDisclaimer,
       'holidays': instance.holidays,
     };
 
-_$HolidayImpl _$$HolidayImplFromJson(Map<String, dynamic> json) =>
+_Holiday _$HolidayFromJson(Map<String, dynamic> json) => _Holiday(
-    _$HolidayImpl(
   start: json['start'] as String,
   end: json['end'] as String,
   year: (json['year'] as num).toInt(),
@@ -32,8 +31,7 @@ _$HolidayImpl _$$HolidayImplFromJson(Map<String, dynamic> json) =>
   slug: json['slug'] as String,
 );
 
-Map<String, dynamic> _$$HolidayImplToJson(_$HolidayImpl instance) =>
+Map<String, dynamic> _$HolidayToJson(_Holiday instance) => <String, dynamic>{
-    <String, dynamic>{
   'start': instance.start,
   'end': instance.end,
   'year': instance.year,

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

@@ -5,7 +5,7 @@ part 'marianum_message_state.g.dart';
 
 
 @freezed
-class MarianumMessageState with _$MarianumMessageState {
+abstract class MarianumMessageState with _$MarianumMessageState {
   const factory MarianumMessageState({
     required MarianumMessageList messageList,
   }) = _MarianumMessageState;
@@ -14,7 +14,7 @@ class MarianumMessageState with _$MarianumMessageState {
 }
 
 @freezed
-class MarianumMessageList with _$MarianumMessageList {
+abstract class MarianumMessageList with _$MarianumMessageList {
   const factory MarianumMessageList({
     required String base,
     required List<MarianumMessage> messages,
@@ -24,7 +24,7 @@ class MarianumMessageList with _$MarianumMessageList {
 }
 
 @freezed
-class MarianumMessage with _$MarianumMessage {
+abstract 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,45 +6,38 @@ part of 'marianum_message_state.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$MarianumMessageStateImpl _$$MarianumMessageStateImplFromJson(
+_MarianumMessageState _$MarianumMessageStateFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    _$MarianumMessageStateImpl(
+) => _MarianumMessageState(
   messageList: MarianumMessageList.fromJson(
-          json['messageList'] as Map<String, dynamic>),
+    json['messageList'] as Map<String, dynamic>,
+  ),
 );
 
-Map<String, dynamic> _$$MarianumMessageStateImplToJson(
+Map<String, dynamic> _$MarianumMessageStateToJson(
-        _$MarianumMessageStateImpl instance) =>
+  _MarianumMessageState instance,
-    <String, dynamic>{
+) => <String, dynamic>{'messageList': instance.messageList};
-      'messageList': instance.messageList,
-    };
 
-_$MarianumMessageListImpl _$$MarianumMessageListImplFromJson(
+_MarianumMessageList _$MarianumMessageListFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _MarianumMessageList(
-    _$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> _$$MarianumMessageListImplToJson(
+Map<String, dynamic> _$MarianumMessageListToJson(
-        _$MarianumMessageListImpl instance) =>
+  _MarianumMessageList instance,
-    <String, dynamic>{
+) => <String, dynamic>{'base': instance.base, 'messages': instance.messages};
-      'base': instance.base,
-      'messages': instance.messages,
-    };
 
-_$MarianumMessageImpl _$$MarianumMessageImplFromJson(
+_MarianumMessage _$MarianumMessageFromJson(Map<String, dynamic> json) =>
-        Map<String, dynamic> json) =>
+    _MarianumMessage(
-    _$MarianumMessageImpl(
       name: json['name'] as String,
       date: json['date'] as String,
       url: json['url'] as String,
     );
 
-Map<String, dynamic> _$$MarianumMessageImplToJson(
+Map<String, dynamic> _$MarianumMessageToJson(_MarianumMessage instance) =>
-        _$MarianumMessageImpl instance) =>
     <String, dynamic>{
       'name': instance.name,
       'date': instance.date,

lib/storage/base/settings.g.dart

@@ -10,21 +10,29 @@ 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>),
+    json['modulesSettings'] as Map<String, dynamic>,
+  ),
   timetableSettings: TimetableSettings.fromJson(
-          json['timetableSettings'] as Map<String, dynamic>),
+    json['timetableSettings'] as Map<String, dynamic>,
-      talkSettings:
+  ),
-          TalkSettings.fromJson(json['talkSettings'] as Map<String, dynamic>),
+  talkSettings: TalkSettings.fromJson(
-      fileSettings:
+    json['talkSettings'] as Map<String, dynamic>,
-          FileSettings.fromJson(json['fileSettings'] as Map<String, dynamic>),
+  ),
+  fileSettings: FileSettings.fromJson(
+    json['fileSettings'] as Map<String, dynamic>,
+  ),
   holidaysSettings: HolidaysSettings.fromJson(
-          json['holidaysSettings'] as Map<String, dynamic>),
+    json['holidaysSettings'] as Map<String, dynamic>,
+  ),
   fileViewSettings: FileViewSettings.fromJson(
-          json['fileViewSettings'] as Map<String, dynamic>),
+    json['fileViewSettings'] as Map<String, dynamic>,
+  ),
   notificationSettings: NotificationSettings.fromJson(
-          json['notificationSettings'] as Map<String, dynamic>),
+    json['notificationSettings'] as Map<String, dynamic>,
+  ),
   devToolsSettings: DevToolsSettings.fromJson(
-          json['devToolsSettings'] as Map<String, dynamic>),
+    json['devToolsSettings'] as Map<String, dynamic>,
+  ),
 );
 
 Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{

lib/storage/fileView/fileViewSettings.g.dart

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

lib/storage/general/modulesSettings.g.dart

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

lib/storage/notification/notificationSettings.g.dart

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

lib/storage/timetable/timetableSettings.g.dart

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

lib/utils/FileSaver.dart

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,10 @@
+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,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:screen_brightness/screen_brightness.dart';
 
 import 'appSharePlatformView.dart';
 
@@ -10,6 +11,18 @@ 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/chatDetails/participants/participantsListView.dart

@@ -13,8 +13,11 @@ class ParticipantsListView extends StatelessWidget {
     lastname(participant) => participant.displayName.toString().split(' ').last;
     
     final participants = participantsResponse.data
-        .sorted((a, b) => lastname(a).compareTo(lastname(b)))
+        .sorted((a, b) {
-        .sorted((a, b) => a.participantType.index.compareTo(b.participantType.index));
+          final typeComparison = a.participantType.index.compareTo(b.participantType.index);
+          if (typeComparison != 0) return typeComparison;
+          return lastname(a).compareTo(lastname(b));
+        });
     var groupedParticipants = participants.groupListsBy((participant) => participant.participantType);
 
     return Scaffold(
@@ -27,7 +30,7 @@ class ParticipantsListView extends StatelessWidget {
             children: [
               ListTile(
                 title: Text(entry.key.prettyName),
-                titleTextStyle: TextStyle(fontWeight: FontWeight.bold),
+                titleTextStyle: Theme.of(context).textTheme.titleMedium
               ),
               ...entry.value.map((participant) => ListTile(
                 leading: UserAvatar(id: participant.actorId),

lib/view/pages/talk/chatView.dart

@@ -51,6 +51,7 @@ 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)) {
@@ -128,7 +129,7 @@ class _ChatViewState extends State<ChatView> {
                   ),
                 ),
                 Container(
-                  color: Theme.of(context).colorScheme.background,
+                  color: Theme.of(context).colorScheme.surface,
                   child: TalkNavigator.isSecondaryVisible(context)
                       ? ChatTextfield(widget.room.token, selfId: widget.selfId)
                       : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)

lib/view/pages/talk/components/chatBubble.dart

@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:open_filex/open_filex.dart';
+import '../../../../api/marianumcloud/talk/getPoll/getPollState.dart';
 import '../../../../extensions/text.dart';
 import 'package:provider/provider.dart';
 
@@ -18,11 +19,13 @@ import '../../../../api/marianumcloud/talk/reactMessage/reactMessageParams.dart'
 import '../../../../api/marianumcloud/talk/room/getRoomResponse.dart';
 import '../../../../model/chatList/chatProps.dart';
 import '../../../../widget/debug/debugTile.dart';
+import '../../../../widget/loadingSpinner.dart';
 import '../../files/fileElement.dart';
 import 'answerReference.dart';
 import 'chatBubbleStyles.dart';
 import 'chatMessage.dart';
 import '../messageReactions.dart';
+import 'pollOptionsList.dart';
 
 class ChatBubble extends StatefulWidget {
   final BuildContext context;
@@ -297,6 +300,34 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
           onLongPress: showOptionsDialog,
           onDoubleTap: showOptionsDialog,
           onTap: () {
+            if(message.originalData?['object']?.type == RichObjectStringObjectType.talkPoll) {
+              var pollId = int.parse(message.originalData!['object']!.id);
+              var pollState = GetPollState(token: widget.bubbleData.token, pollId: pollId).run();
+              showDialog(context: context, builder: (context) => AlertDialog(
+                title: Text(message.originalData!['object']!.name, overflow: TextOverflow.ellipsis),
+                content: FutureBuilder(
+                  future: pollState,
+                  builder: (context, snapshot) {
+                    if(snapshot.connectionState == ConnectionState.waiting) return const Column(mainAxisSize: MainAxisSize.min, children: [LoadingSpinner()]);
+
+                    var pollData = snapshot.data!.data;
+                    return SingleChildScrollView(
+                      child: PollOptionsList(
+                        pollData: pollData,
+                        chatToken: widget.chatData.token,
+                      ),
+                    );
+                  }
+                ),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    child: const Text('Zurück')
+                  ),
+                ],
+              ));
+            }
+
             if(message.file == null) return;
 
             if(downloadProgress > 0) {

lib/view/pages/talk/components/chatMessage.dart

@@ -2,12 +2,12 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_linkify/flutter_linkify.dart';
-import 'package:url_launcher/url_launcher_string.dart';
 
 import '../../../../api/marianumcloud/talk/chat/getChatResponse.dart';
 import '../../../../api/marianumcloud/talk/chat/richObjectStringProcessor.dart';
 import '../../../../model/accountData.dart';
 import '../../../../model/endpointData.dart';
+import '../../../../utils/UrlOpener.dart';
 
 class ChatMessage {
   String originalMessage;
@@ -29,9 +29,17 @@ class ChatMessage {
 
     var contentWidget = Linkify(
       text: content,
-      onOpen: onOpen,
+      onOpen: UrlOpener.onOpen,
     );
 
+    if(originalData?['object']?.type == RichObjectStringObjectType.talkPoll) {
+      return ListTile(
+        leading: const Icon(Icons.poll_outlined),
+        title: Text(originalData!['object']!.name),
+        contentPadding: const EdgeInsets.only(left: 10),
+      );
+    }
+
     if(file == null) return contentWidget;
 
     return Padding(
@@ -65,10 +73,4 @@ class ChatMessage {
         )
     );
   }
-
-  Future<void> onOpen(LinkableElement link) async {
-    if(await canLaunchUrlString(link.url)) {
-      await launchUrlString(link.url);
-    }
-  }
 }

lib/view/pages/talk/components/pollOptionsList.dart

@@ -0,0 +1,67 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_linkify/flutter_linkify.dart';
+
+import '../../../../api/marianumcloud/talk/getPoll/getPollStateResponse.dart';
+import '../../../../utils/UrlOpener.dart';
+
+class PollOptionsList extends StatefulWidget {
+  final GetPollStateResponseObject pollData;
+  final String chatToken;
+  const PollOptionsList({super.key, required this.pollData, required this.chatToken});
+
+  @override
+  State<PollOptionsList> createState() => _PollOptionsListState();
+}
+
+class _PollOptionsListState extends State<PollOptionsList> {
+  @override
+  Widget build(BuildContext context) => Column(
+    children: [
+      ...widget.pollData.options.map<Widget>((option) {
+        var optionId = widget.pollData.options.indexOf(option);
+        var votedSelf = widget.pollData.votedSelf.contains(optionId);
+        var portionsVisible = widget.pollData.votes is Map<String, dynamic>;
+        var votes = portionsVisible
+          ? (widget.pollData.votes['option-$optionId'] as num?) ?? 0
+          : 0;
+        var numVoters = widget.pollData.numVoters ?? 0;
+        double portion = numVoters == 0 ? 0 : (votes / numVoters);
+
+        return ListTile(
+          // enabled: false,
+          isThreeLine: portionsVisible,
+          dense: true,
+          title: Text(
+            option,
+            style: Theme.of(context).textTheme.bodyLarge,
+          ),
+          leading: Icon(
+            votedSelf ? Icons.check_circle_outlined : Icons.circle_outlined,
+            color: votedSelf
+                ? Theme.of(context).colorScheme.primary.withValues(alpha: 0.6)
+                : Theme.of(context).colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
+          ),
+          subtitle: portionsVisible ? Row(
+              children: [
+                Expanded(
+                  child: LinearProgressIndicator(value: portion.clamp(0.0, 1.0)),
+                ),
+                Container(
+                  margin: const EdgeInsets.only(left: 10),
+                  child: Text('${(portion * 100).round()}%'),
+                ),
+              ],
+            ) : null,
+        );
+      }),
+      ListTile(
+        title: Linkify(
+          text: 'Wenn du abstimmen möchtest, verwende die Webversion unter https://cloud.marianum-fulda.de/call/${widget.chatToken}',
+          onOpen: UrlOpener.onOpen,
+          style: Theme.of(context).textTheme.bodySmall,
+        ),
+      )
+    ],
+  );
+}

lib/widget/fileViewer.dart

@@ -9,6 +9,8 @@ import 'package:share_plus/share_plus.dart';
 import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
 
 import '../storage/base/settingsProvider.dart';
+import '../utils/FileSaver.dart';
+import 'infoDialog.dart';
 import 'placeholderView.dart';
 import 'sharePositionOrigin.dart';
 
@@ -21,6 +23,12 @@ class FileViewer extends StatefulWidget {
   State<FileViewer> createState() => _FileViewerState();
 }
 
+enum FileViewingActions {
+  openExternal,
+  share,
+  save
+}
+
 class _FileViewerState extends State<FileViewer> {
   PhotoViewController photoViewController = PhotoViewController();
 
@@ -38,22 +46,57 @@ class _FileViewerState extends State<FileViewer> {
     AppBar appbar({List actions = const []}) => AppBar(
         title: Text(widget.path.split('/').last),
         actions: [
-          IconButton(
+          ...actions,
-              onPressed: () => Navigator.of(context).push(
+          PopupMenuButton<FileViewingActions>(
+            onSelected: (value) async {
+              switch(value) {
+                case FileViewingActions.openExternal:
+                  Navigator.of(context).push(
                       MaterialPageRoute(builder: (context) => FileViewer(path: widget.path, openExternal: true))
-              ),
-              icon: const Icon(Icons.open_in_new)
-          ),
-          IconButton(
-            onPressed: () {
-              Share.shareXFiles(
-                  [XFile(widget.path)],
-                  sharePositionOrigin: SharePositionOrigin.get(context),
                   );
+                  break;
+                case FileViewingActions.share:
+                  SharePlus.instance.share(
+                      ShareParams(
+                          files: [XFile(widget.path)],
+                          sharePositionOrigin: SharePositionOrigin.get(context)
+                      )
+                  );
+                  break;
+                case FileViewingActions.save:
+                  await FileSaver.writeBytes(await File(widget.path).readAsBytes(), widget.path.split('/').last);
+                  if(!context.mounted) return;
+                  InfoDialog.show(context, 'Die Datei wurde im Downloads Ordner gespeichert.');
+                  break;
+              }
             },
-            icon: const Icon(Icons.share_outlined),
+            itemBuilder: (context) => <PopupMenuEntry<FileViewingActions>>[
+              const PopupMenuItem(
+                value: FileViewingActions.openExternal,
+                child: ListTile(
+                  leading: Icon(Icons.open_in_new),
+                  title: Text('Extern öffnen'),
+                  dense: true,
+                ),
+              ),
+              const PopupMenuItem(
+                value: FileViewingActions.share,
+                child: ListTile(
+                  leading: Icon(Icons.share_outlined),
+                  title: Text('Teilen'),
+                  dense: true,
+                ),
+              ),
+              if(Platform.isAndroid) const PopupMenuItem(
+                value: FileViewingActions.save,
+                child: ListTile(
+                  leading: Icon(Icons.save_alt_outlined),
+                  title: Text('Speichern'),
+                  dense: true,
+                ),
+              ),
+            ],
           ),
-          ...actions
         ],
       );
 

pubspec.yaml

@@ -1,36 +1,14 @@
 name: marianum_mobile
 description: Mobile client for Webuntis and Nextcloud with Talk integration
 
-# The following line prevents the package from being accidentally published to
+publish_to: 'none'
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
-version: 0.1.4+42
 
+version: 0.1.7+45
 environment:
-  sdk: '>3.0.0'
+  sdk: ">=3.8.0 <4.0.0"
-
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 
 dependency_overrides:
-  intl: any
+  intl: 0.20.2
 
 dependencies:
   flutter:
@@ -46,6 +24,7 @@ dependencies:
   bottom_sheet: ^4.0.4
   bubble: ^1.2.1
   cached_network_image: ^3.4.1
+  collection: ^1.19.0
   connectivity_plus: ^6.1.2
   crypto: ^3.0.6
   cupertino_icons: ^1.0.8
@@ -64,11 +43,9 @@ dependencies:
       url: https://github.com/Harsh223/flowder.git
   flutter_app_badge: ^2.0.2
   flutter_bloc: ^9.0.0
-  flutter_launcher_icons: ^0.14.3
   flutter_linkify: ^6.0.0
   flutter_local_notifications: ^19.4.1
   flutter_login: ^5.0.0
-  flutter_native_splash: ^2.4.4
   flutter_split_view: ^0.1.2
   freezed_annotation: ^3.1.0
   http: ^1.3.0
@@ -84,8 +61,10 @@ dependencies:
       path: packages/nextcloud
       ref: 3683491a94670393e46cbc83ad85b994f7df7481
       url: https://github.com/provokateurin/nextcloud-neon
+  open_filex: ^4.7.0
   package_info_plus: ^8.1.3
   path_provider: ^2.1.5
+  permission_handler: ^12.0.1
   persistent_bottom_nav_bar_v2: ^6.1.0
   photo_view: ^0.15.0
   pretty_json: ^2.0.0
@@ -93,6 +72,7 @@ dependencies:
   qr_flutter: ^4.1.0
   rrule: ^0.2.17
   rrule_generator: ^0.9.0
+  screen_brightness: ^2.1.7
   share_plus: ^11.1.0
   shared_preferences: ^2.3.5
   syncfusion_flutter_calendar: ^31.1.17
@@ -100,39 +80,19 @@ dependencies:
   time_range_picker: ^2.3.0
   url_launcher: ^6.3.1
   uuid: ^4.5.1
-  open_filex: ^4.7.0
-  collection: ^1.19.0
 
 dev_dependencies:
-  flutter_test:
+  flutter_launcher_icons: ^0.14.3
-    sdk: flutter
+  flutter_native_splash: ^2.4.4
-  json_serializable: any
-  build_runner: any
 
-  # The "flutter_lints" package below contains a set of recommended lints to
+  build_runner: ^2.10.5
-  # encourage good coding practices. The lint set provided by the package is
+  freezed: ^3.2.4
-  # activated in the `analysis_options.yaml` file located at the root of your
+  json_serializable: ^6.11.4
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: any
-  freezed: any
 
-# For information on the generic Dart part of this file, see the
+  flutter_lints: ^6.0.0
-# following page: https://dart.dev/tools/pub/pubspec
 
-# The following section is specific to Flutter packages.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
   assets:
     - assets/ca/
     - assets/background/
@@ -164,13 +124,3 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
-
-flutter_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