Merge remote-tracking branch 'origin/develop' into develop

fix webuntis auth retry not working correctly
working ios build update
2025-09-10 20:23:20 +02:00 · 2025-09-10 20:23:14 +02:00 · 2025-09-09 13:58:00 +02:00 · 2025-09-06 18:51:00 +02:00 · 2025-09-06 17:35:41 +02:00 · 2025-09-06 17:03:01 +02:00
113 changed files with 2028 additions and 1093 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,15 +25,16 @@ if (flutterVersionName == null) {
 android {
    namespace "eu.mhsl.marianum.mobile.client"
    compileSdk flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    ndkVersion "27.0.12077973"

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
    }

    kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
    }

    sourceSets {
@@ -41,11 +42,8 @@ android {
    }

    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "eu.mhsl.marianum.mobile.client"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21
+        minSdkVersion 26
        targetSdkVersion flutter.targetSdkVersion
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
@@ -66,5 +64,6 @@ flutter {
 }

 dependencies {
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.android.support:multidex:2.0.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 }
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.10" apply false
+    id "com.android.application" version '8.7.3' apply false
+    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
 }

 include ":app"
--- a/assets/img/raumplan.jpg
+++ b/assets/img/raumplan.jpg
--- a/ios/.DS_Store
+++ b/ios/.DS_Store
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/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>
--- a/ios/Podfile
+++ b/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
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,185 +1,194 @@
 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/PhotoGallery (4.3.4):
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
    - DKImagePickerController/Core
    - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - 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
+  - emoji_picker_flutter (0.0.1):
+    - Flutter
  - fast_rsa (0.6.0):
    - Flutter
  - file_picker (0.0.1):
    - DKImagePickerController/PhotoGallery
    - Flutter
-  - Firebase/CoreOnly (10.12.0):
-    - FirebaseCore (= 10.12.0)
-  - Firebase/InAppMessaging (10.12.0):
+  - Firebase/CoreOnly (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - Firebase/InAppMessaging (12.2.0):
    - Firebase/CoreOnly
-    - FirebaseInAppMessaging (~> 10.12.0-beta)
-  - Firebase/Messaging (10.12.0):
+    - FirebaseInAppMessaging (~> 12.2.0-beta)
+  - Firebase/Messaging (12.2.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 10.12.0)
-  - firebase_core (2.15.1):
-    - Firebase/CoreOnly (= 10.12.0)
+    - FirebaseMessaging (~> 12.2.0)
+  - firebase_core (4.1.0):
+    - Firebase/CoreOnly (= 12.2.0)
    - Flutter
-  - firebase_in_app_messaging (0.7.3-5):
-    - Firebase/InAppMessaging (= 10.12.0)
+  - firebase_in_app_messaging (0.9.0-1):
+    - Firebase/InAppMessaging (= 12.2.0)
    - firebase_core
    - Flutter
-  - firebase_messaging (14.6.6):
-    - Firebase/Messaging (= 10.12.0)
+  - firebase_messaging (16.0.1):
+    - Firebase/Messaging (= 12.2.0)
    - firebase_core
    - Flutter
-  - FirebaseABTesting (10.13.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseCore (10.12.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.13.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInAppMessaging (10.12.0-beta):
-    - FirebaseABTesting (~> 10.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseInstallations (10.13.0):
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.1)
-  - FirebaseMessaging (10.12.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Reachability (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - FirebaseABTesting (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+  - FirebaseCore (12.2.0):
+    - FirebaseCoreInternal (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreInternal (12.2.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseInAppMessaging (12.2.0-beta):
+    - FirebaseABTesting (~> 12.2.0)
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
+  - FirebaseInstallations (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (12.2.0):
+    - FirebaseCore (~> 12.2.0)
+    - FirebaseInstallations (~> 12.2.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - 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):
-    - Flutter
-    - Toast
-  - FMDB (2.7.5):
-    - 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):
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.5):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.5):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.1.0):
+    - 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/Reachability (7.11.5):
+  - "GoogleUtilities/NSData+zlib (8.1.0)":
+    - 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
+  - in_app_review (2.0.0):
+    - Flutter
  - libphonenumber_plugin (0.0.1):
    - Flutter
    - PhoneNumberKit
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
-  - package_info (0.0.1):
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - open_filex (0.0.2):
+    - Flutter
+  - package_info_plus (0.4.5):
    - Flutter
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - PhoneNumberKit (3.6.7):
-    - PhoneNumberKit/PhoneNumberKitCore (= 3.6.7)
-    - PhoneNumberKit/UIKit (= 3.6.7)
-  - PhoneNumberKit/PhoneNumberKitCore (3.6.7)
-  - PhoneNumberKit/UIKit (3.6.7):
+  - PhoneNumberKit (3.7.11):
+    - PhoneNumberKit/PhoneNumberKitCore (= 3.7.11)
+    - PhoneNumberKit/UIKit (= 3.7.11)
+  - PhoneNumberKit/PhoneNumberKitCore (3.7.11)
+  - PhoneNumberKit/UIKit (3.7.11):
    - PhoneNumberKit/PhoneNumberKitCore
-  - PromisesObjC (2.3.1)
-  - SDWebImage (5.17.0):
-    - SDWebImage/Core (= 5.17.0)
-  - SDWebImage/Core (5.17.0)
+  - PromisesObjC (2.4.0)
+  - SDWebImage (5.21.2):
+    - SDWebImage/Core (= 5.21.2)
+  - 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)
-  - SwiftyGif (5.4.4)
+    - FlutterMacOS
+  - 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`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
  - libphonenumber_plugin (from `.symlinks/plugins/libphonenumber_plugin/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 +203,6 @@ SPEC REPOS:
    - FirebaseInAppMessaging
    - FirebaseInstallations
    - FirebaseMessaging
-    - FMDB
    - GoogleDataTransport
    - GoogleUtilities
    - nanopb
@@ -202,13 +210,14 @@ SPEC REPOS:
    - PromisesObjC
    - SDWebImage
    - SwiftyGif
-    - Toast

 EXTERNAL SOURCES:
-  better_open_file:
-    :path: ".symlinks/plugins/better_open_file/ios"
+  connectivity_plus:
+    :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 +230,76 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/firebase_messaging/ios"
  Flutter:
    :path: Flutter
-  flutter_app_badger:
-    :path: ".symlinks/plugins/flutter_app_badger/ios"
+  flutter_app_badge:
+    :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"
+  in_app_review:
+    :path: ".symlinks/plugins/in_app_review/ios"
  libphonenumber_plugin:
    :path: ".symlinks/plugins/libphonenumber_plugin/ios"
-  package_info:
-    :path: ".symlinks/plugins/package_info/ios"
+  open_filex:
+    :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:
-    :path: ".symlinks/plugins/sqflite/ios"
+  sqflite_darwin:
+    :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
-  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  fast_rsa: f696740d492d562e76f17b0a81dfc8ec3e635374
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
-  Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
-  firebase_core: 4a3246a02f828a01c74a2c26427037786d90f17f
-  firebase_in_app_messaging: aebdbc10109a0ce44a3294f4ea57ed89ebe1d8bd
-  firebase_messaging: 13b378c8449cae7ec96c79570170943dd73d4738
-  FirebaseABTesting: 86ac5a4fc749088bb4d55a1cbfb2c4cb42c6d5de
-  FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
-  FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
-  FirebaseInAppMessaging: dc24f50aebaf81a377f0b8abf360778f94208931
-  FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
-  FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
-  libphonenumber_plugin: e8a7d64a6624a7c25f2c4ab0b7ead2a8e341e35e
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  PhoneNumberKit: 43b5169526cc417398c8f13f77c97552c1c6ed76
-  PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
-  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  syncfusion_flutter_pdfviewer: bb9998884b864cfedf72628df3503bdf57e397c0
-  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
+  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
+  fast_rsa: 8cf0f70421610bbe9462db881cdeef1cdd626153
+  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
+  Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
+  firebase_core: 3ff52146406557dddd01d570e807e203ec7e1302
+  firebase_in_app_messaging: 42894eb8e92aa83ac58f1c534dc9f9f9546f23b9
+  firebase_messaging: 3dcc998dd98e1e54af75d0cccae8606eba43553c
+  FirebaseABTesting: 32f3fc079d72c9b93e000b60877c4e4f62ef7031
+  FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
+  FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
+  FirebaseInAppMessaging: fecba63d44c5cd8f874e9d661a5aa5047380c7d0
+  FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed
+  FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_app_badge: ca742dd659a157c1090ef7cd881cb78f48f3bcdf
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
+  libphonenumber_plugin: d134f173b22bfa5ede50887071f087f309277f8c
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  PhoneNumberKit: ced55861269312a5e3bc2ef82a58d6255b1c976a
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
+  syncfusion_flutter_pdfviewer: 90dc48305d2e33d4aa20681d1e98ddeda891bc14
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d

-PODFILE CHECKSUM: 3d89a90682e2cd438911ad748b8ba5992f8b6a0e
+PODFILE CHECKSUM: e21c9d4c7b9623c73c6784ddc132fd50a603ad93

-COCOAPODS: 1.12.1
+COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -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 = {
@@ -237,6 +238,23 @@
 			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",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			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 +367,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 +452,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 +501,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;
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/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">
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter

-@UIApplicationMain
+@main
@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
--- a/lib/api/apiResponse.dart
+++ b/lib/api/apiResponse.dart
@@ -5,5 +5,5 @@ abstract class ApiResponse {
  late http.Response rawResponse;

  @JsonKey(includeIfNull: false)
-  late Map<String, String>? headers;
+  Map<String, String>? headers;
 }
--- a/lib/api/holidays/getHolidays.dart
+++ b/lib/api/holidays/getHolidays.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-
 import 'package:http/http.dart' as http;

 import 'getHolidaysResponse.dart';
@@ -7,11 +6,10 @@ import 'getHolidaysResponse.dart';
 class GetHolidays {
  Future<GetHolidaysResponse> query() async {
    var response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
+    var data = jsonDecode(response) as List<dynamic>;
    return GetHolidaysResponse(
        List<GetHolidaysResponseObject>.from(
-            jsonDecode(response).map<GetHolidaysResponseObject>(
-                    GetHolidaysResponseObject.fromJson
-            )
+            data.map<GetHolidaysResponseObject>((e) => GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
        )
    );
  }
--- a/lib/api/holidays/getHolidaysCache.dart
+++ b/lib/api/holidays/getHolidaysCache.dart
@@ -15,8 +15,7 @@ class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
    return GetHolidaysResponse(
      List<GetHolidaysResponseObject>.from(
        parsedListJson.map<GetHolidaysResponseObject>(
-                    // ignore: unnecessary_lambdas
-                    (dynamic i) => GetHolidaysResponseObject.fromJson(i)
+          (i) => GetHolidaysResponseObject.fromJson(i as Map<String, dynamic>)
        )
      )
    );
--- a/lib/api/holidays/getHolidaysResponse.g.dart
+++ b/lib/api/holidays/getHolidaysResponse.g.dart
@@ -16,26 +16,19 @@ GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetHolidaysResponseToJson(GetHolidaysResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['data'] = instance.data.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetHolidaysResponseToJson(
+        GetHolidaysResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };

 GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetHolidaysResponseObject(
      start: json['start'] as String,
      end: json['end'] as String,
-      year: json['year'] as int,
+      year: (json['year'] as num).toInt(),
      stateCode: json['stateCode'] as String,
      name: json['name'] as String,
      slug: json['slug'] as String,
--- a/lib/api/marianumcloud/autocomplete/autocompleteResponse.dart
+++ b/lib/api/marianumcloud/autocomplete/autocompleteResponse.dart
@@ -18,7 +18,7 @@ class AutocompleteResponseObject {
  String label;
  String? icon;
  String? source;
-  List<String>? status;
+  String? status;
  String? subline;
  String? shareWithDisplayNameUniqe;

--- a/lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart
+++ b/lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart
@@ -28,7 +28,7 @@ AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
      json['label'] as String,
      json['icon'] as String?,
      json['source'] as String?,
-      (json['status'] as List<dynamic>?)?.map((e) => e as String).toList(),
+      json['status'] as String?,
      json['subline'] as String?,
      json['shareWithDisplayNameUniqe'] as String?,
    );
--- a/lib/api/marianumcloud/files-sharing/fileSharingApiParams.g.dart
+++ b/lib/api/marianumcloud/files-sharing/fileSharingApiParams.g.dart
@@ -9,7 +9,7 @@ part of 'fileSharingApiParams.dart';
 FileSharingApiParams _$FileSharingApiParamsFromJson(
        Map<String, dynamic> json) =>
    FileSharingApiParams(
-      shareType: json['shareType'] as int,
+      shareType: (json['shareType'] as num).toInt(),
      shareWith: json['shareWith'] as String,
      path: json['path'] as String,
      referenceId: json['referenceId'] as String?,
--- a/lib/api/marianumcloud/talk/chat/getChatParams.g.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatParams.g.dart
@@ -10,38 +10,33 @@ GetChatParams _$GetChatParamsFromJson(Map<String, dynamic> json) =>
    GetChatParams(
      lookIntoFuture:
          $enumDecode(_$GetChatParamsSwitchEnumMap, json['lookIntoFuture']),
-      limit: json['limit'] as int?,
-      lastKnownMessageId: json['lastKnownMessageId'] as int?,
-      lastCommonReadId: json['lastCommonReadId'] as int?,
-      timeout: json['timeout'] as int?,
+      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']),
      includeLastKnown: $enumDecodeNullable(
          _$GetChatParamsSwitchEnumMap, json['includeLastKnown']),
    );

-Map<String, dynamic> _$GetChatParamsToJson(GetChatParams instance) {
-  final val = <String, dynamic>{
+Map<String, dynamic> _$GetChatParamsToJson(GetChatParams instance) =>
+    <String, dynamic>{
      'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
+      if (instance.limit case final value?) 'limit': value,
+      if (instance.lastKnownMessageId case final value?)
+        'lastKnownMessageId': value,
+      if (instance.lastCommonReadId case final value?)
+        'lastCommonReadId': value,
+      if (instance.timeout case final value?) 'timeout': value,
+      if (_$GetChatParamsSwitchEnumMap[instance.setReadMarker]
+          case final value?)
+        'setReadMarker': value,
+      if (_$GetChatParamsSwitchEnumMap[instance.includeLastKnown]
+          case final value?)
+        'includeLastKnown': value,
    };

-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('limit', instance.limit);
-  writeNotNull('lastKnownMessageId', instance.lastKnownMessageId);
-  writeNotNull('lastCommonReadId', instance.lastCommonReadId);
-  writeNotNull('timeout', instance.timeout);
-  writeNotNull(
-      'setReadMarker', _$GetChatParamsSwitchEnumMap[instance.setReadMarker]);
-  writeNotNull('includeLastKnown',
-      _$GetChatParamsSwitchEnumMap[instance.includeLastKnown]);
-  return val;
-}
-
 const _$GetChatParamsSwitchEnumMap = {
  GetChatParamsSwitch.on: 1,
  GetChatParamsSwitch.off: 0,
--- a/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart
@@ -15,30 +15,22 @@ GetChatResponse _$GetChatResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['data'] = instance.data.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };

 GetChatResponseObject _$GetChatResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetChatResponseObject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['token'] as String,
      $enumDecode(
          _$GetRoomResponseObjectMessageActorTypeEnumMap, json['actorType']),
      json['actorId'] as String,
      json['actorDisplayName'] as String,
-      json['timestamp'] as int,
+      (json['timestamp'] as num).toInt(),
      json['systemMessage'] as String,
      $enumDecode(
          _$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
@@ -47,7 +39,7 @@ GetChatResponseObject _$GetChatResponseObjectFromJson(
      json['message'] as String,
      _fromJson(json['messageParameters']),
      (json['reactions'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as int),
+        (k, e) => MapEntry(k, (e as num).toInt()),
      ),
      (json['reactionsSelf'] as List<dynamic>?)
          ?.map((e) => e as String)
--- a/lib/api/marianumcloud/talk/createRoom/createRoomParams.g.dart
+++ b/lib/api/marianumcloud/talk/createRoom/createRoomParams.g.dart
@@ -8,7 +8,7 @@ part of 'createRoomParams.dart';

 CreateRoomParams _$CreateRoomParamsFromJson(Map<String, dynamic> json) =>
    CreateRoomParams(
-      roomType: json['roomType'] as int,
+      roomType: (json['roomType'] as num).toInt(),
      invite: json['invite'] as String,
      source: json['source'] as String?,
      roomName: json['roomName'] as String?,
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart
@@ -55,12 +55,15 @@ class GetParticipantsResponseObject {
 }

 enum GetParticipantsResponseObjectParticipantType {
-  @JsonValue(1) owner,
-  @JsonValue(2) moderator,
-  @JsonValue(3) user,
-  @JsonValue(4) guest,
-  @JsonValue(5) userFollowingPublicLink,
-  @JsonValue(6) guestWithModeratorPermissions
+  @JsonValue(1) owner('Besitzer'),
+  @JsonValue(2) moderator('Moderator'),
+  @JsonValue(3) user('Teilnehmer'),
+  @JsonValue(4) guest('Gast'),
+  @JsonValue(5) userFollowingPublicLink('Teilnehmer über Link'),
+  @JsonValue(6) guestWithModeratorPermissions('Gast Moderator');
+
+  const GetParticipantsResponseObjectParticipantType(this.prettyName);
+  final String prettyName;
 }

 enum GetParticipantsResponseObjectParticipantsInCallFlags {
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.g.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.g.dart
@@ -18,34 +18,26 @@ GetParticipantsResponse _$GetParticipantsResponseFromJson(
      );

 Map<String, dynamic> _$GetParticipantsResponseToJson(
-    GetParticipantsResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['data'] = instance.data.map((e) => e.toJson()).toList();
-  return val;
-}
+        GetParticipantsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };

 GetParticipantsResponseObject _$GetParticipantsResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetParticipantsResponseObject(
-      json['attendeeId'] as int,
+      (json['attendeeId'] as num).toInt(),
      json['actorType'] as String,
      json['actorId'] as String,
      json['displayName'] as String,
      $enumDecode(_$GetParticipantsResponseObjectParticipantTypeEnumMap,
          json['participantType']),
-      json['lastPing'] as int,
+      (json['lastPing'] as num).toInt(),
      $enumDecode(_$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
          json['inCall']),
-      json['permissions'] as int,
-      json['attendeePermissions'] as int,
+      (json['permissions'] as num).toInt(),
+      (json['attendeePermissions'] as num).toInt(),
      json['sessionId'] as String?,
      (json['sessionIds'] as List<dynamic>).map((e) => e as String).toList(),
      json['status'] as String?,
--- a/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.g.dart
+++ b/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.g.dart
@@ -22,20 +22,12 @@ GetReactionsResponse _$GetReactionsResponseFromJson(
      );

 Map<String, dynamic> _$GetReactionsResponseToJson(
-    GetReactionsResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['data'] = instance.data
-      .map((k, e) => MapEntry(k, e.map((e) => e.toJson()).toList()));
-  return val;
-}
+        GetReactionsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data
+          .map((k, e) => MapEntry(k, e.map((e) => e.toJson()).toList())),
+    };

 GetReactionsResponseObject _$GetReactionsResponseObjectFromJson(
        Map<String, dynamic> json) =>
@@ -44,7 +36,7 @@ GetReactionsResponseObject _$GetReactionsResponseObjectFromJson(
          _$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
      json['actorId'] as String,
      json['actorDisplayName'] as String,
-      json['timestamp'] as int,
+      (json['timestamp'] as num).toInt(),
    );

 Map<String, dynamic> _$GetReactionsResponseObjectToJson(
--- a/lib/api/marianumcloud/talk/room/getRoomParams.g.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomParams.g.dart
@@ -11,7 +11,7 @@ GetRoomParams _$GetRoomParamsFromJson(Map<String, dynamic> json) =>
      noStatusUpdate: $enumDecodeNullable(
          _$GetRoomParamsStatusUpdateEnumMap, json['noStatusUpdate']),
      includeStatus: json['includeStatus'] as bool?,
-      modifiedSince: json['modifiedSince'] as int?,
+      modifiedSince: (json['modifiedSince'] as num?)?.toInt(),
    );

 Map<String, dynamic> _$GetRoomParamsToJson(GetRoomParams instance) =>
--- a/lib/api/marianumcloud/talk/room/getRoomResponse.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomResponse.dart
@@ -110,6 +110,7 @@ enum GetRoomResponseObjectConversationType {
  @JsonValue(3) public,
  @JsonValue(4) changelog,
  @JsonValue(5) deleted,
+  @JsonValue(6) noteToSelf,
 }

 enum GetRoomResponseObjectParticipantNotificationLevel {
--- a/lib/api/marianumcloud/talk/room/getRoomResponse.g.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomResponse.g.dart
@@ -15,50 +15,42 @@ GetRoomResponse _$GetRoomResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetRoomResponseToJson(GetRoomResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['data'] = instance.data.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetRoomResponseToJson(GetRoomResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };

 GetRoomResponseObject _$GetRoomResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetRoomResponseObject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['token'] as String,
      $enumDecode(_$GetRoomResponseObjectConversationTypeEnumMap, json['type']),
      json['name'] as String,
      json['displayName'] as String,
      json['description'] as String,
-      json['participantType'] as int,
-      json['participantFlags'] as int,
-      json['readOnly'] as int,
-      json['listable'] as int,
-      json['lastPing'] as int,
+      (json['participantType'] as num).toInt(),
+      (json['participantFlags'] as num).toInt(),
+      (json['readOnly'] as num).toInt(),
+      (json['listable'] as num).toInt(),
+      (json['lastPing'] as num).toInt(),
      json['sessionId'] as String,
      json['hasPassword'] as bool,
      json['hasCall'] as bool,
-      json['callFlag'] as int,
+      (json['callFlag'] as num).toInt(),
      json['canStartCall'] as bool,
      json['canDeleteConversation'] as bool,
      json['canLeaveConversation'] as bool,
-      json['lastActivity'] as int,
+      (json['lastActivity'] as num).toInt(),
      json['isFavorite'] as bool,
      $enumDecode(_$GetRoomResponseObjectParticipantNotificationLevelEnumMap,
          json['notificationLevel']),
-      json['unreadMessages'] as int,
+      (json['unreadMessages'] as num).toInt(),
      json['unreadMention'] as bool,
      json['unreadMentionDirect'] as bool,
-      json['lastReadMessage'] as int,
-      json['lastCommonReadMessage'] as int,
+      (json['lastReadMessage'] as num).toInt(),
+      (json['lastCommonReadMessage'] as num).toInt(),
      GetChatResponseObject.fromJson(
          json['lastMessage'] as Map<String, dynamic>),
      json['status'] as String?,
@@ -110,6 +102,7 @@ const _$GetRoomResponseObjectConversationTypeEnumMap = {
  GetRoomResponseObjectConversationType.public: 3,
  GetRoomResponseObjectConversationType.changelog: 4,
  GetRoomResponseObjectConversationType.deleted: 5,
+  GetRoomResponseObjectConversationType.noteToSelf: 6,
 };

 const _$GetRoomResponseObjectParticipantNotificationLevelEnumMap = {
--- a/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.g.dart
+++ b/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.g.dart
@@ -12,17 +12,8 @@ SendMessageParams _$SendMessageParamsFromJson(Map<String, dynamic> json) =>
      replyTo: json['replyTo'] as String?,
    );

-Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) {
-  final val = <String, dynamic>{
+Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) =>
+    <String, dynamic>{
      'message': instance.message,
+      if (instance.replyTo case final value?) 'replyTo': value,
    };
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('replyTo', instance.replyTo);
-  return val;
-}
--- a/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.g.dart
+++ b/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.g.dart
@@ -8,7 +8,7 @@ part of 'setReadMarkerParams.dart';

 SetReadMarkerParams _$SetReadMarkerParamsFromJson(Map<String, dynamic> json) =>
    SetReadMarkerParams(
-      lastReadMessage: json['lastReadMessage'] as int?,
+      lastReadMessage: (json['lastReadMessage'] as num?)?.toInt(),
    );

 Map<String, dynamic> _$SetReadMarkerParamsToJson(
--- a/lib/api/marianumcloud/talk/talkApi.dart
+++ b/lib/api/marianumcloud/talk/talkApi.dart
@@ -58,11 +58,9 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
      assembled?.headers = data.headers;
      return assembled;
    } catch (e) {
-      // TODO report error
-      log('Error assembling Talk API ${T.toString()} message: ${e.toString()} response on ${endpoint.path} with request body: $body and request headers: ${headers.toString()}');
+      var message = 'Error assembling Talk API ${T.toString()} message: ${e.toString()} response with request body: $body and request headers: ${headers.toString()}';
+      log(message);
+      throw Exception(message);
    }
-
-    throw Exception('Error assembling Talk API response');
  }
-
 }
--- a/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.g.dart
+++ b/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.g.dart
@@ -12,7 +12,7 @@ CacheableFile _$CacheableFileFromJson(Map<String, dynamic> json) =>
      isDirectory: json['isDirectory'] as bool,
      name: json['name'] as String,
      mimeType: json['mimeType'] as String?,
-      size: json['size'] as int?,
+      size: (json['size'] as num?)?.toInt(),
      eTag: json['eTag'] as String?,
      createdAt: json['createdAt'] == null
          ? null
--- a/lib/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.g.dart
+++ b/lib/api/marianumcloud/webdav/queries/listFiles/listFilesResponse.g.dart
@@ -15,16 +15,8 @@ ListFilesResponse _$ListFilesResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$ListFilesResponseToJson(ListFilesResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['files'] = instance.files.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$ListFilesResponseToJson(ListFilesResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'files': instance.files.map((e) => e.toJson()).toList(),
+    };
--- a/lib/api/mhsl/breaker/getBreakers/getBreakersResponse.g.dart
+++ b/lib/api/mhsl/breaker/getBreakers/getBreakersResponse.g.dart
@@ -17,20 +17,13 @@ GetBreakersResponse _$GetBreakersResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetBreakersResponseToJson(GetBreakersResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['global'] = instance.global.toJson();
-  val['regional'] = instance.regional.map((k, e) => MapEntry(k, e.toJson()));
-  return val;
-}
+Map<String, dynamic> _$GetBreakersResponseToJson(
+        GetBreakersResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'global': instance.global.toJson(),
+      'regional': instance.regional.map((k, e) => MapEntry(k, e.toJson())),
+    };

 GetBreakersReponseObject _$GetBreakersReponseObjectFromJson(
        Map<String, dynamic> json) =>
--- a/lib/api/mhsl/customTimetableEvent/get/getCustomTimetableEventResponse.g.dart
+++ b/lib/api/mhsl/customTimetableEvent/get/getCustomTimetableEventResponse.g.dart
@@ -17,16 +17,8 @@ GetCustomTimetableEventResponse _$GetCustomTimetableEventResponseFromJson(
      );

 Map<String, dynamic> _$GetCustomTimetableEventResponseToJson(
-    GetCustomTimetableEventResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['events'] = instance.events;
-  return val;
-}
+        GetCustomTimetableEventResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'events': instance.events,
+    };
--- a/lib/api/mhsl/server/feedback/addFeedbackParams.g.dart
+++ b/lib/api/mhsl/server/feedback/addFeedbackParams.g.dart
@@ -11,7 +11,7 @@ AddFeedbackParams _$AddFeedbackParamsFromJson(Map<String, dynamic> json) =>
      user: json['user'] as String,
      feedback: json['feedback'] as String,
      screenshot: json['screenshot'] as String?,
-      appVersion: json['appVersion'] as int,
+      appVersion: (json['appVersion'] as num).toInt(),
    );

 Map<String, dynamic> _$AddFeedbackParamsToJson(AddFeedbackParams instance) =>
--- a/lib/api/mhsl/server/userIndex/update/updateUserIndexParams.g.dart
+++ b/lib/api/mhsl/server/userIndex/update/updateUserIndexParams.g.dart
@@ -12,7 +12,7 @@ UpdateUserIndexParams _$UpdateUserIndexParamsFromJson(
      user: json['user'] as String,
      username: json['username'] as String,
      device: json['device'] as String,
-      appVersion: json['appVersion'] as int,
+      appVersion: (json['appVersion'] as num).toInt(),
      deviceInfo: json['deviceInfo'] as String,
    );

--- a/lib/api/mhsl/server/userIndex/update/updateUserindex.dart
+++ b/lib/api/mhsl/server/userIndex/update/updateUserindex.dart
@@ -4,7 +4,7 @@ import 'dart:developer';

 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:http/http.dart' as http;
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';

 import '../../../../../model/accountData.dart';
 import '../../../mhslApi.dart';
--- a/lib/api/requestCache.dart
+++ b/lib/api/requestCache.dart
@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'package:localstore/localstore.dart';

 import 'apiResponse.dart';
-import 'webuntis/webuntisError.dart';

 abstract class RequestCache<T extends ApiResponse?> {
  static const int cacheNothing = 0;
@@ -40,7 +39,7 @@ abstract class RequestCache<T extends ApiResponse?> {
        'json': jsonEncode(newValue),
        'lastupdate': DateTime.now().millisecondsSinceEpoch
      });
-    } on WebuntisError catch(e) {
+    } on Exception catch(e) {
      onError(e);
    }
  }
--- a/lib/api/webuntis/queries/authenticate/authenticateResponse.g.dart
+++ b/lib/api/webuntis/queries/authenticate/authenticateResponse.g.dart
@@ -10,27 +10,19 @@ AuthenticateResponse _$AuthenticateResponseFromJson(
        Map<String, dynamic> json) =>
    AuthenticateResponse(
      json['sessionId'] as String,
-      json['personType'] as int,
-      json['personId'] as int,
-      json['klasseId'] as int,
+      (json['personType'] as num).toInt(),
+      (json['personId'] as num).toInt(),
+      (json['klasseId'] as num).toInt(),
    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
        (k, e) => MapEntry(k, e as String),
      );

 Map<String, dynamic> _$AuthenticateResponseToJson(
-    AuthenticateResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['sessionId'] = instance.sessionId;
-  val['personType'] = instance.personType;
-  val['personId'] = instance.personId;
-  val['klasseId'] = instance.klasseId;
-  return val;
-}
+        AuthenticateResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'sessionId': instance.sessionId,
+      'personType': instance.personType,
+      'personId': instance.personId,
+      'klasseId': instance.klasseId,
+    };
--- a/lib/api/webuntis/queries/getHolidays/getHolidaysResponse.g.dart
+++ b/lib/api/webuntis/queries/getHolidays/getHolidaysResponse.g.dart
@@ -16,28 +16,21 @@ GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetHolidaysResponseToJson(GetHolidaysResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['result'] = instance.result.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetHolidaysResponseToJson(
+        GetHolidaysResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };

 GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetHolidaysResponseObject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longName'] as String,
-      json['startDate'] as int,
-      json['endDate'] as int,
+      (json['startDate'] as num).toInt(),
+      (json['endDate'] as num).toInt(),
    );

 Map<String, dynamic> _$GetHolidaysResponseObjectToJson(
--- a/lib/api/webuntis/queries/getRooms/getRoomsResponse.g.dart
+++ b/lib/api/webuntis/queries/getRooms/getRoomsResponse.g.dart
@@ -16,24 +16,16 @@ GetRoomsResponse _$GetRoomsResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetRoomsResponseToJson(GetRoomsResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['result'] = instance.result.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetRoomsResponseToJson(GetRoomsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };

 GetRoomsResponseObject _$GetRoomsResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetRoomsResponseObject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longName'] as String,
      json['active'] as bool,
--- a/lib/api/webuntis/queries/getSubjects/getSubjectsResponse.g.dart
+++ b/lib/api/webuntis/queries/getSubjects/getSubjectsResponse.g.dart
@@ -16,24 +16,17 @@ GetSubjectsResponse _$GetSubjectsResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetSubjectsResponseToJson(GetSubjectsResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['result'] = instance.result.map((e) => e.toJson()).toList();
-  return val;
-}
+Map<String, dynamic> _$GetSubjectsResponseToJson(
+        GetSubjectsResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };

 GetSubjectsResponseObject _$GetSubjectsResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetSubjectsResponseObject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longName'] as String,
      json['alternateName'] as String,
--- a/lib/api/webuntis/queries/getTimetable/getTimetableParams.g.dart
+++ b/lib/api/webuntis/queries/getTimetable/getTimetableParams.g.dart
@@ -22,8 +22,8 @@ GetTimetableParamsOptions _$GetTimetableParamsOptionsFromJson(
    GetTimetableParamsOptions(
      element: GetTimetableParamsOptionsElement.fromJson(
          json['element'] as Map<String, dynamic>),
-      startDate: json['startDate'] as int?,
-      endDate: json['endDate'] as int?,
+      startDate: (json['startDate'] as num?)?.toInt(),
+      endDate: (json['endDate'] as num?)?.toInt(),
      onlyBaseTimetable: json['onlyBaseTimetable'] as bool?,
      showBooking: json['showBooking'] as bool?,
      showInfo: json['showInfo'] as bool?,
@@ -46,49 +46,42 @@ GetTimetableParamsOptions _$GetTimetableParamsOptionsFromJson(
    );

 Map<String, dynamic> _$GetTimetableParamsOptionsToJson(
-    GetTimetableParamsOptions instance) {
-  final val = <String, dynamic>{
+        GetTimetableParamsOptions instance) =>
+    <String, dynamic>{
      'element': instance.element.toJson(),
+      if (instance.startDate case final value?) 'startDate': value,
+      if (instance.endDate case final value?) 'endDate': value,
+      if (instance.onlyBaseTimetable case final value?)
+        'onlyBaseTimetable': value,
+      if (instance.showBooking case final value?) 'showBooking': value,
+      if (instance.showInfo case final value?) 'showInfo': value,
+      if (instance.showSubstText case final value?) 'showSubstText': value,
+      if (instance.showLsText case final value?) 'showLsText': value,
+      if (instance.showLsNumber case final value?) 'showLsNumber': value,
+      if (instance.showStudentgroup case final value?)
+        'showStudentgroup': value,
+      if (instance.klasseFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'klasseFields': value,
+      if (instance.roomFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'roomFields': value,
+      if (instance.subjectFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'subjectFields': value,
+      if (instance.teacherFields
+              ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
+              .toList()
+          case final value?)
+        'teacherFields': value,
    };

-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('startDate', instance.startDate);
-  writeNotNull('endDate', instance.endDate);
-  writeNotNull('onlyBaseTimetable', instance.onlyBaseTimetable);
-  writeNotNull('showBooking', instance.showBooking);
-  writeNotNull('showInfo', instance.showInfo);
-  writeNotNull('showSubstText', instance.showSubstText);
-  writeNotNull('showLsText', instance.showLsText);
-  writeNotNull('showLsNumber', instance.showLsNumber);
-  writeNotNull('showStudentgroup', instance.showStudentgroup);
-  writeNotNull(
-      'klasseFields',
-      instance.klasseFields
-          ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-          .toList());
-  writeNotNull(
-      'roomFields',
-      instance.roomFields
-          ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-          .toList());
-  writeNotNull(
-      'subjectFields',
-      instance.subjectFields
-          ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-          .toList());
-  writeNotNull(
-      'teacherFields',
-      instance.teacherFields
-          ?.map((e) => _$GetTimetableParamsOptionsFieldsEnumMap[e]!)
-          .toList());
-  return val;
-}
-
 const _$GetTimetableParamsOptionsFieldsEnumMap = {
  GetTimetableParamsOptionsFields.id: 'id',
  GetTimetableParamsOptionsFields.name: 'name',
@@ -99,30 +92,22 @@ const _$GetTimetableParamsOptionsFieldsEnumMap = {
 GetTimetableParamsOptionsElement _$GetTimetableParamsOptionsElementFromJson(
        Map<String, dynamic> json) =>
    GetTimetableParamsOptionsElement(
-      id: json['id'] as int,
-      type: json['type'] as int,
+      id: (json['id'] as num).toInt(),
+      type: (json['type'] as num).toInt(),
      keyType: $enumDecodeNullable(
          _$GetTimetableParamsOptionsElementKeyTypeEnumMap, json['keyType']),
    );

 Map<String, dynamic> _$GetTimetableParamsOptionsElementToJson(
-    GetTimetableParamsOptionsElement instance) {
-  final val = <String, dynamic>{
+        GetTimetableParamsOptionsElement instance) =>
+    <String, dynamic>{
      'id': instance.id,
      'type': instance.type,
+      if (_$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType]
+          case final value?)
+        'keyType': value,
    };

-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('keyType',
-      _$GetTimetableParamsOptionsElementKeyTypeEnumMap[instance.keyType]);
-  return val;
-}
-
 const _$GetTimetableParamsOptionsElementKeyTypeEnumMap = {
  GetTimetableParamsOptionsElementKeyType.id: 'id',
  GetTimetableParamsOptionsElementKeyType.name: 'name',
--- a/lib/api/webuntis/queries/getTimetable/getTimetableResponse.g.dart
+++ b/lib/api/webuntis/queries/getTimetable/getTimetableResponse.g.dart
@@ -18,33 +18,25 @@ GetTimetableResponse _$GetTimetableResponseFromJson(
      );

 Map<String, dynamic> _$GetTimetableResponseToJson(
-    GetTimetableResponse instance) {
-  final val = <String, dynamic>{};
-
-  void writeNotNull(String key, dynamic value) {
-    if (value != null) {
-      val[key] = value;
-    }
-  }
-
-  writeNotNull('headers', instance.headers);
-  val['result'] = instance.result.map((e) => e.toJson()).toList();
-  return val;
-}
+        GetTimetableResponse instance) =>
+    <String, dynamic>{
+      if (instance.headers case final value?) 'headers': value,
+      'result': instance.result.map((e) => e.toJson()).toList(),
+    };

 GetTimetableResponseObject _$GetTimetableResponseObjectFromJson(
        Map<String, dynamic> json) =>
    GetTimetableResponseObject(
-      id: json['id'] as int,
-      date: json['date'] as int,
-      startTime: json['startTime'] as int,
-      endTime: json['endTime'] as int,
+      id: (json['id'] as num).toInt(),
+      date: (json['date'] as num).toInt(),
+      startTime: (json['startTime'] as num).toInt(),
+      endTime: (json['endTime'] as num).toInt(),
      lstype: json['lstype'] as String?,
      code: json['code'] as String?,
      info: json['info'] as String?,
      substText: json['substText'] as String?,
      lstext: json['lstext'] as String?,
-      lsnumber: json['lsnumber'] as int?,
+      lsnumber: (json['lsnumber'] as num?)?.toInt(),
      statflags: json['statflags'] as String?,
      activityType: json['activityType'] as String?,
      sg: json['sg'] as String?,
@@ -110,7 +102,7 @@ GetTimetableResponseObjectFieldsObject
    _$GetTimetableResponseObjectFieldsObjectFromJson(
            Map<String, dynamic> json) =>
        GetTimetableResponseObjectFieldsObject(
-          id: json['id'] as int?,
+          id: (json['id'] as num?)?.toInt(),
          name: json['name'] as String?,
          longname: json['longname'] as String?,
          externalkey: json['externalkey'] as String?,
@@ -128,7 +120,7 @@ Map<String, dynamic> _$GetTimetableResponseObjectFieldsObjectToJson(
 GetTimetableResponseObjectClass _$GetTimetableResponseObjectClassFromJson(
        Map<String, dynamic> json) =>
    GetTimetableResponseObjectClass(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longname'] as String,
      json['externalkey'] as String?,
@@ -146,10 +138,10 @@ Map<String, dynamic> _$GetTimetableResponseObjectClassToJson(
 GetTimetableResponseObjectTeacher _$GetTimetableResponseObjectTeacherFromJson(
        Map<String, dynamic> json) =>
    GetTimetableResponseObjectTeacher(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longname'] as String,
-      json['orgid'] as int?,
+      (json['orgid'] as num?)?.toInt(),
      json['orgname'] as String?,
      json['externalkey'] as String?,
    );
@@ -168,7 +160,7 @@ Map<String, dynamic> _$GetTimetableResponseObjectTeacherToJson(
 GetTimetableResponseObjectSubject _$GetTimetableResponseObjectSubjectFromJson(
        Map<String, dynamic> json) =>
    GetTimetableResponseObjectSubject(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longname'] as String,
    );
@@ -184,7 +176,7 @@ Map<String, dynamic> _$GetTimetableResponseObjectSubjectToJson(
 GetTimetableResponseObjectRoom _$GetTimetableResponseObjectRoomFromJson(
        Map<String, dynamic> json) =>
    GetTimetableResponseObjectRoom(
-      json['id'] as int,
+      (json['id'] as num).toInt(),
      json['name'] as String,
      json['longname'] as String,
    );
--- a/lib/api/webuntis/webuntisApi.dart
+++ b/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']);
      }
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
 import 'state/app/modules/app_modules.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:provider/provider.dart';
-import 'package:badges/badges.dart' as badges;

 import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import 'api/mhsl/server/userIndex/update/updateUserindex.dart';
@@ -93,7 +92,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
  }

  @override
-  Widget build(BuildContext context) => PersistentTabView(
+  Widget build(BuildContext context) => Consumer<SettingsProvider>(builder: (context, settings, child) => PersistentTabView(
      controller: Main.bottomNavigator,
      navBarOverlap: const NavBarOverlap.none(),
      backgroundColor: Theme.of(context).colorScheme.primary,
@@ -101,29 +100,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {

      screenTransitionAnimation: const ScreenTransitionAnimation(curve: Curves.easeOutQuad, duration: Duration(milliseconds: 200)),
      tabs: [
-        AppModule.getModule(Modules.timetable).toBottomTab(context),
-        AppModule.getModule(Modules.talk).toBottomTab(
-          context,
-          itemBuilder: (icon) => Consumer<ChatListProps>(
-            builder: (context, value, child) {
-              if(value.primaryLoading()) return Icon(icon);
-              var messages = value.getRoomsResponse.data.map((e) => e.unreadMessages).reduce((a, b) => a+b);
-              return badges.Badge(
-                showBadge: messages > 0,
-                position: badges.BadgePosition.topEnd(top: -3, end: -3),
-                stackFit: StackFit.loose,
-                badgeStyle: badges.BadgeStyle(
-                  padding: const EdgeInsets.all(3),
-                  badgeColor: Theme.of(context).primaryColor,
-                  elevation: 1,
-                ),
-                badgeContent: Text('$messages', style: const TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold)),
-                child: Icon(icon),
-              );
-            },
-          ),
-        ),
-        AppModule.getModule(Modules.files).toBottomTab(context),
+        ...AppModule.getBottomBarModules(context).map((e) => e.toBottomTab(context)),

        PersistentTabConfig(
          screen: const Breaker(breaker: BreakerArea.more, child: Overhang()),
@@ -142,7 +119,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
          color: Theme.of(context).colorScheme.surface,
        ),
      ),
-    );
+    ));

  @override
  void dispose() {
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,13 +7,13 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:loader_overlay/loader_overlay.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';

 import 'api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import 'app.dart';
@@ -48,7 +48,9 @@ Future<void> main() async {
    PlatformAssetBundle().load('assets/ca/lets-encrypt-r10.pem').then(addCertificateAsTrusted),

    Future(() async {
-      await HydratedStorage.build(storageDirectory: await getTemporaryDirectory()).then((storage) => HydratedBloc.storage = storage);
+      await HydratedStorage.build(
+          storageDirectory: HydratedStorageDirectory((await getTemporaryDirectory()).path)
+      ).then((storage) => HydratedBloc.storage = storage);
    })
  ];

--- a/lib/model/breakers/Breaker.dart
+++ b/lib/model/breakers/Breaker.dart
@@ -23,7 +23,11 @@ class _BreakerState extends State<Breaker> {
      builder: (context, value, child) {
        var blocked = value.isBlocked(widget.breaker);
        if(blocked != null) {
-          return PlaceholderView(icon: Icons.security_outlined, text: "Die App/ Dieser Bereich wurde als Schutzmaßnahme deaktiviert!\n\n${blocked.isEmpty ? "Es wurde vom Server kein Grund übermittelt." : blocked}");
+          return PlaceholderView(
+            icon: Icons.app_blocking_outlined,
+            text: 'Die App / Dieser Bereich ist zurzeit nicht verfügbar!\n\n'
+                "${blocked.isEmpty ? "Es wurde vom Server kein Grund übermittelt.\nAktualisiere die App und versuche es später erneut" : blocked}"
+          );
        }

        return widget.child;
--- a/lib/model/breakers/BreakerProps.dart
+++ b/lib/model/breakers/BreakerProps.dart
@@ -1,4 +1,5 @@
-import 'package:package_info/package_info.dart';
+import 'package:flutter/foundation.dart';
+import 'package:package_info_plus/package_info_plus.dart';

 import '../../api/apiResponse.dart';
 import '../../api/mhsl/breaker/getBreakers/getBreakersCache.dart';
@@ -12,6 +13,8 @@ class BreakerProps extends DataHolder {
  PackageInfo? packageInfo;

  String? isBlocked(BreakerArea? type) {
+    if(kDebugMode) return null;
+
    if(packageInfo == null) {
      PackageInfo.fromPlatform().then((value) => packageInfo = value);
      return null;
--- a/lib/model/chatList/chatListProps.dart
+++ b/lib/model/chatList/chatListProps.dart
@@ -1,5 +1,5 @@

-import 'package:flutter_app_badger/flutter_app_badger.dart';
+import 'package:flutter_app_badge/flutter_app_badge.dart';

 import '../../api/apiResponse.dart';
 import '../../api/marianumcloud/talk/room/getRoomCache.dart';
@@ -20,7 +20,7 @@ class ChatListProps extends DataHolder {
      onUpdate: (GetRoomResponse data) => {
        _getRoomResponse = data,
        notifyListeners(),
-        FlutterAppBadger.updateBadgeCount(data.data.map((e) => e.unreadMessages).reduce((a, b) => a+b))
+        FlutterAppBadge.count(data.data.map((e) => e.unreadMessages).reduce((a, b) => a+b))
      }
    );
  }
--- a/lib/notification/notificationController.dart
+++ b/lib/notification/notificationController.dart
@@ -44,7 +44,7 @@ class NotificationController {
  }

  static Future<void> onAppOpenedByNotification(RemoteMessage message, BuildContext context) async {
-    NotificationTasks.navigateToTalk();
+    NotificationTasks.navigateToTalk(context);
    NotificationTasks.updateProviders(context);

    DebugTile(context).run(() {
--- a/lib/notification/notificationService.dart
+++ b/lib/notification/notificationService.dart
@@ -15,9 +15,6 @@ class NotificationService {
    );

    final iosSettings = DarwinInitializationSettings(
-      onDidReceiveLocalNotification: (id, title, body, payload) {
-        // TODO Navigate to Talk section (This runs when an Notification is tapped)
-      },
    );


--- a/lib/notification/notificationTasks.dart
+++ b/lib/notification/notificationTasks.dart
@@ -1,15 +1,16 @@
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:flutter_app_badger/flutter_app_badger.dart';
+import 'package:flutter_app_badge/flutter_app_badge.dart';
 import 'package:provider/provider.dart';

 import '../main.dart';
 import '../model/chatList/chatListProps.dart';
 import '../model/chatList/chatProps.dart';
+import '../state/app/modules/app_modules.dart';

 class NotificationTasks {
  static void updateBadgeCount(RemoteMessage notification) {
-    FlutterAppBadger.updateBadgeCount(int.parse(notification.data['unreadCount'] ?? 0));
+    FlutterAppBadge.count(int.parse(notification.data['unreadCount'] ?? 0));
  }

  static void updateProviders(BuildContext context) {
@@ -17,7 +18,9 @@ class NotificationTasks {
    Provider.of<ChatProps>(context, listen: false).run();
  }

-  static void navigateToTalk() {
-    Main.bottomNavigator.jumpToTab(1);
+  static void navigateToTalk(BuildContext context) {
+    var talkTab = AppModule.getBottomBarModules(context).map((e) => e.module).toList().indexOf(Modules.talk);
+    if(talkTab == -1) return;
+    Main.bottomNavigator.jumpToTab(talkTab);
  }
 }
--- a/lib/state/app/basis/dataloader/holiday_data_loader.dart
+++ b/lib/state/app/basis/dataloader/holiday_data_loader.dart
@@ -0,0 +1,9 @@
+import 'package:dio/dio.dart';
+
+import '../../infrastructure/dataLoader/data_loader.dart';
+
+abstract class HolidayDataLoader<TResult> extends DataLoader<TResult> {
+  HolidayDataLoader() : super(Dio(BaseOptions(
+    baseUrl: 'https://ferien-api.de/api/v1/',
+  )));
+}
--- a/lib/state/app/infrastructure/dataLoader/mhsl_data_loader.dart
+++ b/lib/state/app/infrastructure/dataLoader/mhsl_data_loader.dart
@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';

-import 'data_loader.dart';
+import '../../infrastructure/dataLoader/data_loader.dart';

 abstract class MhslDataLoader<TResult> extends DataLoader<TResult> {
  MhslDataLoader() : super(Dio(BaseOptions(
--- a/lib/state/app/infrastructure/dataLoader/data_loader.dart
+++ b/lib/state/app/infrastructure/dataLoader/data_loader.dart
@@ -35,8 +35,12 @@ abstract class DataLoader<TResult> {
 }

 class DataLoaderResult {
-  final Map<String, dynamic> json;
+  final dynamic json;
  final Map<String, String> headers;

+  Map<String, dynamic> asMap() => json as Map<String, dynamic>;
+  List<dynamic> asList() => json as List<dynamic>;
+  List<Map<String, dynamic>> asListOfMaps() => asList().map((e) => e as Map<String, dynamic>).toList();
+
  DataLoaderResult({required this.json, required this.headers});
 }
--- a/lib/state/app/infrastructure/loadableState/bloc/loadable_state_state.freezed.dart
+++ b/lib/state/app/infrastructure/loadableState/bloc/loadable_state_state.freezed.dart
@@ -19,7 +19,9 @@ mixin _$LoadableStateState {
  List<ConnectivityResult>? get connections =>
      throw _privateConstructorUsedError;

-  @JsonKey(ignore: true)
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $LoadableStateStateCopyWith<LoadableStateState> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -43,6 +45,8 @@ class _$LoadableStateStateCopyWithImpl<$Res, $Val extends LoadableStateState>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -76,6 +80,8 @@ class __$$LoadableStateStateImplCopyWithImpl<$Res>
      $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({
@@ -125,7 +131,9 @@ class _$LoadableStateStateImpl implements _LoadableStateState {
  int get hashCode => Object.hash(
      runtimeType, const DeepCollectionEquality().hash(_connections));

-  @JsonKey(ignore: true)
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$LoadableStateStateImplCopyWith<_$LoadableStateStateImpl> get copyWith =>
@@ -140,8 +148,11 @@ abstract class _LoadableStateState implements LoadableStateState {

  @override
  List<ConnectivityResult>? get connections;
+
+  /// Create a copy of LoadableStateState
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$LoadableStateStateImplCopyWith<_$LoadableStateStateImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/state/app/infrastructure/loadableState/loadable_state.dart
+++ b/lib/state/app/infrastructure/loadableState/loadable_state.dart
@@ -9,11 +9,11 @@ class LoadableState<TState> with _$LoadableState {
  const LoadableState._();

  const factory LoadableState({
-    @Default(true) bool isLoading,
-    @Default(null) TState? data,
-    @Default(null) int? lastFetch,
-    @Default(null) void Function()? reFetch,
-    @Default(null) LoadingError? error,
+    required bool isLoading,
+    required TState? data,
+    required int? lastFetch,
+    required void Function()? reFetch,
+    required LoadingError? error,
  }) = _LoadableState;

  bool _hasError() => error != null;
--- a/lib/state/app/infrastructure/loadableState/loadable_state.freezed.dart
+++ b/lib/state/app/infrastructure/loadableState/loadable_state.freezed.dart
@@ -22,7 +22,9 @@ mixin _$LoadableState<TState> {
  void Function()? get reFetch => throw _privateConstructorUsedError;
  LoadingError? get error => throw _privateConstructorUsedError;

-  @JsonKey(ignore: true)
+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $LoadableStateCopyWith<TState, LoadableState<TState>> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -54,6 +56,8 @@ class _$LoadableStateCopyWithImpl<TState, $Res,
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of LoadableState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -87,6 +91,8 @@ class _$LoadableStateCopyWithImpl<TState, $Res,
    ) 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 {
@@ -128,6 +134,8 @@ class __$$LoadableStateImplCopyWithImpl<TState, $Res>
      $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({
@@ -166,27 +174,22 @@ class __$$LoadableStateImplCopyWithImpl<TState, $Res>

 class _$LoadableStateImpl<TState> extends _LoadableState<TState> {
  const _$LoadableStateImpl(
-      {this.isLoading = true,
-      this.data = null,
-      this.lastFetch = null,
-      this.reFetch = null,
-      this.error = null})
+      {required this.isLoading,
+      required this.data,
+      required this.lastFetch,
+      required this.reFetch,
+      required this.error})
      : super._();

  @override
-  @JsonKey()
  final bool isLoading;
  @override
-  @JsonKey()
  final TState? data;
  @override
-  @JsonKey()
  final int? lastFetch;
  @override
-  @JsonKey()
  final void Function()? reFetch;
  @override
-  @JsonKey()
  final LoadingError? error;

  @override
@@ -212,7 +215,9 @@ class _$LoadableStateImpl<TState> extends _LoadableState<TState> {
  int get hashCode => Object.hash(runtimeType, isLoading,
      const DeepCollectionEquality().hash(data), lastFetch, reFetch, error);

-  @JsonKey(ignore: true)
+  /// 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>>
@@ -222,11 +227,11 @@ class _$LoadableStateImpl<TState> extends _LoadableState<TState> {

 abstract class _LoadableState<TState> extends LoadableState<TState> {
  const factory _LoadableState(
-      {final bool isLoading,
-      final TState? data,
-      final int? lastFetch,
-      final void Function()? reFetch,
-      final LoadingError? error}) = _$LoadableStateImpl<TState>;
+      {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
@@ -239,8 +244,11 @@ abstract class _LoadableState<TState> extends LoadableState<TState> {
  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(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$LoadableStateImplCopyWith<TState, _$LoadableStateImpl<TState>>
      get copyWith => throw _privateConstructorUsedError;
 }
--- a/lib/state/app/infrastructure/loadableState/loading_error.freezed.dart
+++ b/lib/state/app/infrastructure/loadableState/loading_error.freezed.dart
@@ -19,7 +19,9 @@ mixin _$LoadingError {
  String get message => throw _privateConstructorUsedError;
  bool get allowRetry => throw _privateConstructorUsedError;

-  @JsonKey(ignore: true)
+  /// 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;
 }
@@ -43,6 +45,8 @@ class _$LoadingErrorCopyWithImpl<$Res, $Val extends LoadingError>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -81,6 +85,8 @@ class __$$LoadingErrorImplCopyWithImpl<$Res>
      _$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({
@@ -129,7 +135,9 @@ class _$LoadingErrorImpl implements _LoadingError {
  @override
  int get hashCode => Object.hash(runtimeType, message, allowRetry);

-  @JsonKey(ignore: true)
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
@@ -145,8 +153,11 @@ abstract class _LoadingError implements LoadingError {
  String get message;
  @override
  bool get allowRetry;
+
+  /// Create a copy of LoadingError
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$LoadingErrorImplCopyWith<_$LoadingErrorImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/state/app/infrastructure/loadableState/view/loadable_state_consumer.dart
+++ b/lib/state/app/infrastructure/loadableState/view/loadable_state_consumer.dart
@@ -15,14 +15,20 @@ import 'loadable_state_primary_loading.dart';

 class LoadableStateConsumer<TController extends Bloc<LoadableHydratedBlocEvent<TState>, LoadableState<TState>>, TState> extends StatelessWidget {
  final Widget Function(TState state, bool loading) child;
+  final void Function(TState state)? onLoad;
  final bool wrapWithScrollView;
-  const LoadableStateConsumer({required this.child, this.wrapWithScrollView = false, super.key});
+  const LoadableStateConsumer({required this.child, this.onLoad, this.wrapWithScrollView = false, super.key});

  static Duration animationDuration = const Duration(milliseconds: 200);

  @override
  Widget build(BuildContext context) {
    var loadableState = context.watch<TController>().state;
+
+    if(!loadableState.isLoading && onLoad != null) {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) => onLoad!(loadableState.data));
+    }
+
    var childWidget = ConditionalWrapper(
      condition: loadableState.reFetch != null,
      wrapper: (child) => RefreshIndicator(
--- a/lib/state/app/infrastructure/loadableState/view/loadable_state_error_bar.dart
+++ b/lib/state/app/infrastructure/loadableState/view/loadable_state_error_bar.dart
@@ -89,4 +89,3 @@ class _LoadableStateErrorBarTextState extends State<LoadableStateErrorBarText> {
    super.dispose();
  }
 }
-
--- a/lib/state/app/infrastructure/utilityWidgets/bloc_module.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/bloc_module.dart
@@ -5,14 +5,19 @@ class BlocModule<TBloc extends StateStreamableSource<TState>, TState> extends St
  final TBloc Function(BuildContext context) create;
  final Widget Function(BuildContext context, TBloc bloc, TState state) child;
  final bool autoRebuild;
-  const BlocModule({required this.create, required this.child, this.autoRebuild = false, super.key});
+  final void Function(BuildContext context, TBloc bloc)? onInitialisation;
+  const BlocModule({required this.create, required this.child, this.autoRebuild = false, this.onInitialisation, super.key});

  Widget rebuildChild(BuildContext context) => child(context, context.watch<TBloc>(), context.watch<TBloc>().state);
  Widget staticChild(BuildContext context) => child(context, context.read<TBloc>(), context.read<TBloc>().state);

  @override
  Widget build(BuildContext context) => BlocProvider<TBloc>(
-    create: create,
+    create: (context) {
+      var bloc = create(context);
+      this.onInitialisation != null ? this.onInitialisation!(context, bloc) : null;
+      return bloc;
+    },
    child: Builder(
      builder: (context) => autoRebuild
        ? rebuildChild(context)
--- a/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc.dart
@@ -17,23 +17,40 @@ abstract class LoadableHydratedBloc<
    LoadableState<TState>
 > {
  late TRepository _repository;
-  LoadableHydratedBloc() : super(const LoadableState()) {
+  LoadableHydratedBloc() : super(const LoadableState(
+    error: null,
+    data: null,
+    isLoading: true,
+    lastFetch: null,
+    reFetch: null,
+  )) {

-    on<Emit<TState>>((event, emit) => emit(LoadableState(
-        isLoading: event.loading,
+    on<Emit<TState>>((event, emit) {
+      emit(LoadableState(
+        isLoading: state.isLoading,
+        data: event.state(innerState ?? fromNothing()),
+        lastFetch: state.lastFetch,
+        reFetch: retry,
+        error: state.error,
+      ));
+    });
+
+    on<DataGathered<TState>>((event, emit) => emit(LoadableState(
+      isLoading: false,
      data: event.state(innerState ?? fromNothing()),
      lastFetch: DateTime.now().millisecondsSinceEpoch,
-        reFetch: retry
+      reFetch: retry,
+      error: null,
    )));

    on<RefetchStarted<TState>>((event, emit) => emit(LoadableState(
        isLoading: true,
        data: innerState,
-        lastFetch: state.lastFetch
+        lastFetch: state.lastFetch,
+        reFetch: null,
+        error: null,
    )));

-    on<ClearState<TState>>((event, emit) => emit(const LoadableState()));
-
    on<Error<TState>>((event, emit) => emit(LoadableState(
        isLoading: false,
        data: innerState,
@@ -61,7 +78,7 @@ abstract class LoadableHydratedBloc<
      (e) {
        log('Error while fetching ${TState.toString()}: ${e.toString()}');
        add(Error(LoadingError(
-          message: e.message,
+          message: e.message ?? e.toString(),
          allowRetry: true,
        )));
      },
@@ -73,14 +90,29 @@ abstract class LoadableHydratedBloc<
  @override
  fromJson(Map<String, dynamic> json) {
    var rawData = LoadableSaveContext.unwrap(json);
-    return LoadableState(isLoading: true, lastFetch: rawData.meta.timestamp, data: fromStorage(rawData.data));
+    return LoadableState(
+      isLoading: true,
+      data: fromStorage(rawData.data),
+      lastFetch: rawData.meta.timestamp,
+      reFetch: null,
+      error: null,
+    );
  }

  @override
-  Map<String, dynamic>? toJson(LoadableState<TState> state) => LoadableSaveContext.wrap(
-      toStorage(state.data),
+  Map<String, dynamic>? toJson(LoadableState<TState> state) {
+    Map<String, dynamic>? data;
+    try {
+      data = state.data == null ? null : toStorage(state.data);
+    } catch(e) {
+      log('Failed to save state ${TState.toString()}: ${e.toString()}');
+    }
+
+    return LoadableSaveContext.wrap(
+      data,
      state.lastFetch ?? DateTime.now().millisecondsSinceEpoch
    );
+  }

  Future<void> gatherData();
  TRepository repository();
--- a/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc_event.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc_event.dart
@@ -3,10 +3,12 @@ import '../../loadableState/loading_error.dart';
 class LoadableHydratedBlocEvent<TState> {}
 class Emit<TState> extends LoadableHydratedBlocEvent<TState> {
  final TState Function(TState state) state;
-  final bool loading;
-  Emit(this.state, {this.loading = false});
+  Emit(this.state);
+}
+class DataGathered<TState> extends LoadableHydratedBlocEvent<TState> {
+  final TState Function(TState state) state;
+  DataGathered(this.state);
 }
-class ClearState<TState> extends LoadableHydratedBlocEvent<TState> {}
 class Error<TState> extends LoadableHydratedBlocEvent<TState> {
  final LoadingError error;
  Error(this.error);
--- a/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.dart
@@ -21,4 +21,3 @@ class LoadableSaveContext with _$LoadableSaveContext {
  static ({Map<String, dynamic> data, LoadableSaveContext meta}) unwrap(Map<String, dynamic> data) =>
      (data: data[dataKey] as Map<String, dynamic>, meta: LoadableSaveContext.fromJson(data[metaKey]));
 }
-
--- a/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.freezed.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.freezed.dart
@@ -22,8 +22,12 @@ LoadableSaveContext _$LoadableSaveContextFromJson(Map<String, dynamic> json) {
 mixin _$LoadableSaveContext {
  int get timestamp => throw _privateConstructorUsedError;

+  /// Serializes this LoadableSaveContext to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// 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;
 }
@@ -47,6 +51,8 @@ class _$LoadableSaveContextCopyWithImpl<$Res, $Val extends LoadableSaveContext>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -80,6 +86,8 @@ class __$$LoadableSaveContextImplCopyWithImpl<$Res>
      $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({
@@ -119,11 +127,13 @@ class _$LoadableSaveContextImpl extends _LoadableSaveContext {
                other.timestamp == timestamp));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, timestamp);

-  @JsonKey(ignore: true)
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
@@ -148,8 +158,11 @@ abstract class _LoadableSaveContext extends LoadableSaveContext {

  @override
  int get timestamp;
+
+  /// Create a copy of LoadableSaveContext
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$LoadableSaveContextImplCopyWith<_$LoadableSaveContextImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.g.dart
+++ b/lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_save_context.g.dart
@@ -9,7 +9,7 @@ part of 'loadable_save_context.dart';
 _$LoadableSaveContextImpl _$$LoadableSaveContextImplFromJson(
        Map<String, dynamic> json) =>
    _$LoadableSaveContextImpl(
-      timestamp: json['timestamp'] as int,
+      timestamp: (json['timestamp'] as num).toInt(),
    );

 Map<String, dynamic> _$$LoadableSaveContextImplToJson(
--- a/lib/state/app/modules/app_modules.dart
+++ b/lib/state/app/modules/app_modules.dart
@@ -1,49 +1,129 @@
 import 'package:flutter/material.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
+import 'package:provider/provider.dart';

 import '../../../api/mhsl/breaker/getBreakers/getBreakersResponse.dart';
 import '../../../model/breakers/Breaker.dart';
+import '../../../model/chatList/chatListProps.dart';
+import '../../../storage/base/settingsProvider.dart';
 import '../../../view/pages/files/files.dart';
-import '../../../view/pages/more/holidays/holidays.dart';
 import '../../../view/pages/more/roomplan/roomplan.dart';
 import '../../../view/pages/talk/chatList.dart';
 import '../../../view/pages/timetable/timetable.dart';
 import '../../../widget/centeredLeading.dart';
 import 'gradeAverages/view/grade_averages_view.dart';
+import 'holidays/view/holidays_view.dart';
 import 'marianumMessage/view/marianum_message_list_view.dart';

+import 'package:badges/badges.dart' as badges;
+
 class AppModule {
+  Modules module;
  String name;
-  IconData icon;
+  Widget Function() icon;
+  BreakerArea breakerArea;
  Widget Function() create;

-  AppModule(this.name, this.icon, this.create);
+  AppModule(this.module, {required this.name, required this.icon, this.breakerArea = BreakerArea.global, required this.create});

-  static Map<Modules, AppModule> modules() => {
-    Modules.timetable: AppModule('Vertretung', Icons.calendar_month, Timetable.new),
-    Modules.talk: AppModule('Talk', Icons.chat, ChatList.new),
-    Modules.files: AppModule('Files', Icons.folder, Files.new),
-    Modules.marianumMessage: AppModule('Marianum Message', Icons.newspaper, MarianumMessageListView.new),
-    Modules.roomPlan: AppModule('Raumplan', Icons.location_pin, Roomplan.new),
-    Modules.gradeAveragesCalculator: AppModule('Notendurschnittsrechner', Icons.calculate, GradeAveragesView.new),
-    Modules.holidays: AppModule('Schulferien', Icons.holiday_village, Holidays.new),
+  static Map<Modules, AppModule> modules(BuildContext context, { showFiltered = false }) {
+    var settings = Provider.of<SettingsProvider>(context, listen: false);
+    var available = {
+      Modules.timetable: AppModule(
+        Modules.timetable,
+        name: 'Stundenplan',
+        icon: () => Icon(Icons.calendar_month),
+        breakerArea: BreakerArea.timetable,
+        create: Timetable.new,
+      ),
+      Modules.talk: AppModule(
+        Modules.talk,
+        name: 'Talk',
+        icon: () => Consumer<ChatListProps>(
+          builder: (context, value, child) {
+            if(value.primaryLoading()) return Icon(Icons.chat);
+            var messages = value.getRoomsResponse.data.map((e) => e.unreadMessages).reduce((a, b) => a+b);
+            return badges.Badge(
+              showBadge: messages > 0,
+              position: badges.BadgePosition.topEnd(top: -3, end: -3),
+              stackFit: StackFit.loose,
+              badgeStyle: badges.BadgeStyle(
+                padding: const EdgeInsets.all(3),
+                badgeColor: Theme.of(context).primaryColor,
+                elevation: 1,
+              ),
+              badgeContent: Text('$messages', style: const TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.bold)),
+              child: Icon(Icons.chat),
+            );
+          },
+        ),
+        breakerArea: BreakerArea.talk,
+        create: ChatList.new,
+      ),
+      Modules.files: AppModule(
+        Modules.files,
+        name: 'Dateien',
+        icon: () => Icon(Icons.folder),
+        breakerArea: BreakerArea.files,
+        create: Files.new,
+      ),
+      Modules.marianumMessage: AppModule(
+        Modules.marianumMessage,
+        name: 'Marianum Message',
+        icon: () => Icon(Icons.newspaper),
+        breakerArea: BreakerArea.more,
+        create: MarianumMessageListView.new,
+      ),
+      Modules.roomPlan: AppModule(
+        Modules.roomPlan,
+        name: 'Raumplan',
+        icon: () => Icon(Icons.location_pin),
+        breakerArea: BreakerArea.more,
+        create: Roomplan.new,
+      ),
+      Modules.gradeAveragesCalculator: AppModule(
+        Modules.gradeAveragesCalculator,
+        name: 'Notendurschnittsrechner',
+        icon: () => Icon(Icons.calculate),
+        breakerArea: BreakerArea.more,
+        create: GradeAveragesView.new,
+      ),
+      Modules.holidays: AppModule(
+        Modules.holidays,
+        name: 'Schulferien',
+        icon: () => Icon(Icons.flight),
+        breakerArea: BreakerArea.more,
+        create: HolidaysView.new,
+      ),
    };

-  static AppModule getModule(Modules module) => modules()[module]!;
+    if(!showFiltered) available.removeWhere((key, value) => settings.val().modulesSettings.hiddenModules.contains(key));

-  Widget toListTile(BuildContext context) => ListTile(
-    leading: CenteredLeading(Icon(icon)),
+    return { for (var element in settings.val().modulesSettings.moduleOrder.where((element) => available.containsKey(element))) element : available[element]! };
+  }
+
+  static List<AppModule> getBottomBarModules(BuildContext context) => modules(context).values.toList().getRange(0, 3).toList();
+  static List<AppModule> getOverhangModules(BuildContext context) => modules(context).values.skip(3).toList();
+
+  Widget toListTile(BuildContext context, {Key? key, bool isReorder = false, Function()? onVisibleChange, bool isVisible = true}) => ListTile(
+    key: key,
+    leading: CenteredLeading(icon()),
    title: Text(name),
-    onTap: () => pushScreen(context, withNavBar: false, screen: create()),
-    trailing: const Icon(Icons.arrow_right),
+    onTap: isReorder ? null : () => pushScreen(context, withNavBar: false, screen: create()),
+    trailing: isReorder
+        ? Row(mainAxisSize: MainAxisSize.min, children: [
+            IconButton(onPressed: onVisibleChange, icon: Icon(isVisible ? Icons.visibility_outlined : Icons.visibility_off_outlined)),
+            Icon(Icons.drag_handle_outlined)
+          ])
+        : const Icon(Icons.arrow_right),
  );

-  PersistentTabConfig toBottomTab(BuildContext context, {Widget Function(IconData icon)? itemBuilder}) => PersistentTabConfig(
-    screen: Breaker(breaker: BreakerArea.global, child: create()),
+  PersistentTabConfig toBottomTab(BuildContext context, {Widget Function(IconData icon)? iconBuilder}) => PersistentTabConfig(
+    screen: Breaker(breaker: breakerArea, child: create()),
    item: ItemConfig(
        activeForegroundColor: Theme.of(context).primaryColor,
        inactiveForegroundColor: Theme.of(context).colorScheme.secondary,
-        icon: itemBuilder == null ? Icon(icon) : itemBuilder(icon),
+        icon: icon(),
        title: name
    ),
  );
--- a/lib/state/app/modules/gradeAverages/bloc/grade_averages_state.freezed.dart
+++ b/lib/state/app/modules/gradeAverages/bloc/grade_averages_state.freezed.dart
@@ -24,8 +24,12 @@ mixin _$GradeAveragesState {
      throw _privateConstructorUsedError;
  List<int> get grades => throw _privateConstructorUsedError;

+  /// Serializes this GradeAveragesState to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// 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;
 }
@@ -49,6 +53,8 @@ class _$GradeAveragesStateCopyWithImpl<$Res, $Val extends GradeAveragesState>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -87,6 +93,8 @@ class __$$GradeAveragesStateImplCopyWithImpl<$Res>
      $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({
@@ -141,12 +149,14 @@ class _$GradeAveragesStateImpl implements _GradeAveragesState {
            const DeepCollectionEquality().equals(other._grades, _grades));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(
      runtimeType, gradingSystem, const DeepCollectionEquality().hash(_grades));

-  @JsonKey(ignore: true)
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
@@ -173,8 +183,11 @@ abstract class _GradeAveragesState implements GradeAveragesState {
  GradeAveragesGradingSystem get gradingSystem;
  @override
  List<int> get grades;
+
+  /// Create a copy of GradeAveragesState
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$GradeAveragesStateImplCopyWith<_$GradeAveragesStateImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/state/app/modules/gradeAverages/bloc/grade_averages_state.g.dart
+++ b/lib/state/app/modules/gradeAverages/bloc/grade_averages_state.g.dart
@@ -11,7 +11,9 @@ _$GradeAveragesStateImpl _$$GradeAveragesStateImplFromJson(
    _$GradeAveragesStateImpl(
      gradingSystem: $enumDecode(
          _$GradeAveragesGradingSystemEnumMap, json['gradingSystem']),
-      grades: (json['grades'] as List<dynamic>).map((e) => e as int).toList(),
+      grades: (json['grades'] as List<dynamic>)
+          .map((e) => (e as num).toInt())
+          .toList(),
    );

 Map<String, dynamic> _$$GradeAveragesStateImplToJson(
--- a/lib/state/app/modules/holidays/bloc/holidays_bloc.dart
+++ b/lib/state/app/modules/holidays/bloc/holidays_bloc.dart
@@ -0,0 +1,37 @@
+import '../../../infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc.dart';
+import '../../../infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc_event.dart';
+import '../repository/holidays_repository.dart';
+import 'holidays_event.dart';
+import 'holidays_state.dart';
+
+class HolidaysBloc extends LoadableHydratedBloc<HolidaysEvent, HolidaysState, HolidaysRepository> {
+  HolidaysBloc() {
+    on<SetPastHolidaysVisible>((event, emit) {
+      add(Emit((state) => state.copyWith(showPastHolidays: event.shouldBeVisible)));
+    });
+
+    on<DisclaimerDismissed>((event, emit) => add(
+      Emit((state) => state.copyWith(showDisclaimer: false))
+    ));
+  }
+
+  bool showPastHolidays() => innerState?.showPastHolidays ?? false;
+  bool showDisclaimerOnEntry() => innerState?.showDisclaimer ?? false;
+  List<Holiday>? getHolidays() => innerState?.holidays
+      .where((element) => showPastHolidays() || DateTime.parse(element.end).isAfter(DateTime.now()))
+      .toList() ?? [];
+
+  @override
+  fromNothing() => const HolidaysState(showPastHolidays: false, holidays: [], showDisclaimer: true);
+  @override
+  fromStorage(Map<String, dynamic> json) => HolidaysState.fromJson(json);
+  @override
+  Future<void> gatherData() async {
+    var holidays = await repo.getHolidays();
+    add(DataGathered((state) => state.copyWith(holidays: holidays)));
+  }
+  @override
+  repository() => HolidaysRepository();
+  @override
+  Map<String, dynamic>? toStorage(state) => state.toJson();
+}
--- a/lib/state/app/modules/holidays/bloc/holidays_event.dart
+++ b/lib/state/app/modules/holidays/bloc/holidays_event.dart
@@ -0,0 +1,9 @@
+import '../../../infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc_event.dart';
+import 'holidays_state.dart';
+
+sealed class HolidaysEvent extends LoadableHydratedBlocEvent<HolidaysState> {}
+class SetPastHolidaysVisible extends HolidaysEvent {
+  final bool shouldBeVisible;
+  SetPastHolidaysVisible(this.shouldBeVisible);
+}
+class DisclaimerDismissed extends HolidaysEvent {}
--- a/lib/state/app/modules/holidays/bloc/holidays_state.dart
+++ b/lib/state/app/modules/holidays/bloc/holidays_state.dart
@@ -0,0 +1,30 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:flutter/foundation.dart';
+
+part 'holidays_state.freezed.dart';
+part 'holidays_state.g.dart';
+
+@freezed
+class HolidaysState with _$HolidaysState {
+  const factory HolidaysState({
+    required bool showPastHolidays,
+    required bool showDisclaimer,
+    required List<Holiday> holidays,
+  }) = _HolidaysState;
+
+  factory HolidaysState.fromJson(Map<String, Object?> json) => _$HolidaysStateFromJson(json);
+}
+
+@freezed
+class Holiday with _$Holiday {
+  const factory Holiday({
+    required String start,
+    required String end,
+    required int year,
+    required String stateCode,
+    required String name,
+    required String slug,
+  }) = _Holiday;
+
+  factory Holiday.fromJson(Map<String, Object?> json) => _$HolidayFromJson(json);
+}
--- a/lib/state/app/modules/holidays/bloc/holidays_state.freezed.dart
+++ b/lib/state/app/modules/holidays/bloc/holidays_state.freezed.dart
@@ -0,0 +1,489 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'holidays_state.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+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');
+
+HolidaysState _$HolidaysStateFromJson(Map<String, dynamic> json) {
+  return _HolidaysState.fromJson(json);
+}
+
+/// @nodoc
+mixin _$HolidaysState {
+  bool get showPastHolidays => throw _privateConstructorUsedError;
+  bool get showDisclaimer => throw _privateConstructorUsedError;
+  List<Holiday> get holidays => throw _privateConstructorUsedError;
+
+  /// Serializes this HolidaysState to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of HolidaysState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $HolidaysStateCopyWith<HolidaysState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $HolidaysStateCopyWith<$Res> {
+  factory $HolidaysStateCopyWith(
+          HolidaysState value, $Res Function(HolidaysState) then) =
+      _$HolidaysStateCopyWithImpl<$Res, HolidaysState>;
+  @useResult
+  $Res call(
+      {bool showPastHolidays, bool showDisclaimer, List<Holiday> holidays});
+}
+
+/// @nodoc
+class _$HolidaysStateCopyWithImpl<$Res, $Val extends HolidaysState>
+    implements $HolidaysStateCopyWith<$Res> {
+  _$HolidaysStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of HolidaysState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? showPastHolidays = null,
+    Object? showDisclaimer = null,
+    Object? holidays = null,
+  }) {
+    return _then(_value.copyWith(
+      showPastHolidays: null == showPastHolidays
+          ? _value.showPastHolidays
+          : showPastHolidays // ignore: cast_nullable_to_non_nullable
+              as bool,
+      showDisclaimer: null == showDisclaimer
+          ? _value.showDisclaimer
+          : showDisclaimer // ignore: cast_nullable_to_non_nullable
+              as bool,
+      holidays: null == holidays
+          ? _value.holidays
+          : holidays // ignore: cast_nullable_to_non_nullable
+              as List<Holiday>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$HolidaysStateImplCopyWith<$Res>
+    implements $HolidaysStateCopyWith<$Res> {
+  factory _$$HolidaysStateImplCopyWith(
+          _$HolidaysStateImpl value, $Res Function(_$HolidaysStateImpl) then) =
+      __$$HolidaysStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {bool showPastHolidays, bool showDisclaimer, List<Holiday> holidays});
+}
+
+/// @nodoc
+class __$$HolidaysStateImplCopyWithImpl<$Res>
+    extends _$HolidaysStateCopyWithImpl<$Res, _$HolidaysStateImpl>
+    implements _$$HolidaysStateImplCopyWith<$Res> {
+  __$$HolidaysStateImplCopyWithImpl(
+      _$HolidaysStateImpl _value, $Res Function(_$HolidaysStateImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of HolidaysState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? showPastHolidays = null,
+    Object? showDisclaimer = null,
+    Object? holidays = null,
+  }) {
+    return _then(_$HolidaysStateImpl(
+      showPastHolidays: null == showPastHolidays
+          ? _value.showPastHolidays
+          : showPastHolidays // ignore: cast_nullable_to_non_nullable
+              as bool,
+      showDisclaimer: null == showDisclaimer
+          ? _value.showDisclaimer
+          : showDisclaimer // ignore: cast_nullable_to_non_nullable
+              as bool,
+      holidays: null == holidays
+          ? _value._holidays
+          : holidays // ignore: cast_nullable_to_non_nullable
+              as List<Holiday>,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$HolidaysStateImpl
+    with DiagnosticableTreeMixin
+    implements _HolidaysState {
+  const _$HolidaysStateImpl(
+      {required this.showPastHolidays,
+      required this.showDisclaimer,
+      required final List<Holiday> holidays})
+      : _holidays = holidays;
+
+  factory _$HolidaysStateImpl.fromJson(Map<String, dynamic> json) =>
+      _$$HolidaysStateImplFromJson(json);
+
+  @override
+  final bool showPastHolidays;
+  @override
+  final bool showDisclaimer;
+  final List<Holiday> _holidays;
+  @override
+  List<Holiday> get holidays {
+    if (_holidays is EqualUnmodifiableListView) return _holidays;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_holidays);
+  }
+
+  @override
+  String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
+    return 'HolidaysState(showPastHolidays: $showPastHolidays, showDisclaimer: $showDisclaimer, holidays: $holidays)';
+  }
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+      ..add(DiagnosticsProperty('type', 'HolidaysState'))
+      ..add(DiagnosticsProperty('showPastHolidays', showPastHolidays))
+      ..add(DiagnosticsProperty('showDisclaimer', showDisclaimer))
+      ..add(DiagnosticsProperty('holidays', holidays));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$HolidaysStateImpl &&
+            (identical(other.showPastHolidays, showPastHolidays) ||
+                other.showPastHolidays == showPastHolidays) &&
+            (identical(other.showDisclaimer, showDisclaimer) ||
+                other.showDisclaimer == showDisclaimer) &&
+            const DeepCollectionEquality().equals(other._holidays, _holidays));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode => Object.hash(runtimeType, showPastHolidays, showDisclaimer,
+      const DeepCollectionEquality().hash(_holidays));
+
+  /// Create a copy of HolidaysState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$HolidaysStateImplCopyWith<_$HolidaysStateImpl> get copyWith =>
+      __$$HolidaysStateImplCopyWithImpl<_$HolidaysStateImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$HolidaysStateImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _HolidaysState implements HolidaysState {
+  const factory _HolidaysState(
+      {required final bool showPastHolidays,
+      required final bool showDisclaimer,
+      required final List<Holiday> holidays}) = _$HolidaysStateImpl;
+
+  factory _HolidaysState.fromJson(Map<String, dynamic> json) =
+      _$HolidaysStateImpl.fromJson;
+
+  @override
+  bool get showPastHolidays;
+  @override
+  bool get showDisclaimer;
+  @override
+  List<Holiday> get holidays;
+
+  /// Create a copy of HolidaysState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$HolidaysStateImplCopyWith<_$HolidaysStateImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+Holiday _$HolidayFromJson(Map<String, dynamic> json) {
+  return _Holiday.fromJson(json);
+}
+
+/// @nodoc
+mixin _$Holiday {
+  String get start => throw _privateConstructorUsedError;
+  String get end => throw _privateConstructorUsedError;
+  int get year => throw _privateConstructorUsedError;
+  String get stateCode => throw _privateConstructorUsedError;
+  String get name => throw _privateConstructorUsedError;
+  String get slug => throw _privateConstructorUsedError;
+
+  /// Serializes this Holiday to a JSON map.
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+
+  /// Create a copy of Holiday
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $HolidayCopyWith<Holiday> get copyWith => throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $HolidayCopyWith<$Res> {
+  factory $HolidayCopyWith(Holiday value, $Res Function(Holiday) then) =
+      _$HolidayCopyWithImpl<$Res, Holiday>;
+  @useResult
+  $Res call(
+      {String start,
+      String end,
+      int year,
+      String stateCode,
+      String name,
+      String slug});
+}
+
+/// @nodoc
+class _$HolidayCopyWithImpl<$Res, $Val extends Holiday>
+    implements $HolidayCopyWith<$Res> {
+  _$HolidayCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of Holiday
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? start = null,
+    Object? end = null,
+    Object? year = null,
+    Object? stateCode = null,
+    Object? name = null,
+    Object? slug = null,
+  }) {
+    return _then(_value.copyWith(
+      start: null == start
+          ? _value.start
+          : start // ignore: cast_nullable_to_non_nullable
+              as String,
+      end: null == end
+          ? _value.end
+          : end // ignore: cast_nullable_to_non_nullable
+              as String,
+      year: null == year
+          ? _value.year
+          : year // ignore: cast_nullable_to_non_nullable
+              as int,
+      stateCode: null == stateCode
+          ? _value.stateCode
+          : stateCode // ignore: cast_nullable_to_non_nullable
+              as String,
+      name: null == name
+          ? _value.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      slug: null == slug
+          ? _value.slug
+          : slug // ignore: cast_nullable_to_non_nullable
+              as String,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$HolidayImplCopyWith<$Res> implements $HolidayCopyWith<$Res> {
+  factory _$$HolidayImplCopyWith(
+          _$HolidayImpl value, $Res Function(_$HolidayImpl) then) =
+      __$$HolidayImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call(
+      {String start,
+      String end,
+      int year,
+      String stateCode,
+      String name,
+      String slug});
+}
+
+/// @nodoc
+class __$$HolidayImplCopyWithImpl<$Res>
+    extends _$HolidayCopyWithImpl<$Res, _$HolidayImpl>
+    implements _$$HolidayImplCopyWith<$Res> {
+  __$$HolidayImplCopyWithImpl(
+      _$HolidayImpl _value, $Res Function(_$HolidayImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of Holiday
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? start = null,
+    Object? end = null,
+    Object? year = null,
+    Object? stateCode = null,
+    Object? name = null,
+    Object? slug = null,
+  }) {
+    return _then(_$HolidayImpl(
+      start: null == start
+          ? _value.start
+          : start // ignore: cast_nullable_to_non_nullable
+              as String,
+      end: null == end
+          ? _value.end
+          : end // ignore: cast_nullable_to_non_nullable
+              as String,
+      year: null == year
+          ? _value.year
+          : year // ignore: cast_nullable_to_non_nullable
+              as int,
+      stateCode: null == stateCode
+          ? _value.stateCode
+          : stateCode // ignore: cast_nullable_to_non_nullable
+              as String,
+      name: null == name
+          ? _value.name
+          : name // ignore: cast_nullable_to_non_nullable
+              as String,
+      slug: null == slug
+          ? _value.slug
+          : slug // ignore: cast_nullable_to_non_nullable
+              as String,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$HolidayImpl with DiagnosticableTreeMixin implements _Holiday {
+  const _$HolidayImpl(
+      {required this.start,
+      required this.end,
+      required this.year,
+      required this.stateCode,
+      required this.name,
+      required this.slug});
+
+  factory _$HolidayImpl.fromJson(Map<String, dynamic> json) =>
+      _$$HolidayImplFromJson(json);
+
+  @override
+  final String start;
+  @override
+  final String end;
+  @override
+  final int year;
+  @override
+  final String stateCode;
+  @override
+  final String name;
+  @override
+  final String slug;
+
+  @override
+  String toString({DiagnosticLevel minLevel = DiagnosticLevel.info}) {
+    return 'Holiday(start: $start, end: $end, year: $year, stateCode: $stateCode, name: $name, slug: $slug)';
+  }
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+      ..add(DiagnosticsProperty('type', 'Holiday'))
+      ..add(DiagnosticsProperty('start', start))
+      ..add(DiagnosticsProperty('end', end))
+      ..add(DiagnosticsProperty('year', year))
+      ..add(DiagnosticsProperty('stateCode', stateCode))
+      ..add(DiagnosticsProperty('name', name))
+      ..add(DiagnosticsProperty('slug', slug));
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$HolidayImpl &&
+            (identical(other.start, start) || other.start == start) &&
+            (identical(other.end, end) || other.end == end) &&
+            (identical(other.year, year) || other.year == year) &&
+            (identical(other.stateCode, stateCode) ||
+                other.stateCode == stateCode) &&
+            (identical(other.name, name) || other.name == name) &&
+            (identical(other.slug, slug) || other.slug == slug));
+  }
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  int get hashCode =>
+      Object.hash(runtimeType, start, end, year, stateCode, name, slug);
+
+  /// Create a copy of Holiday
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$HolidayImplCopyWith<_$HolidayImpl> get copyWith =>
+      __$$HolidayImplCopyWithImpl<_$HolidayImpl>(this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$HolidayImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _Holiday implements Holiday {
+  const factory _Holiday(
+      {required final String start,
+      required final String end,
+      required final int year,
+      required final String stateCode,
+      required final String name,
+      required final String slug}) = _$HolidayImpl;
+
+  factory _Holiday.fromJson(Map<String, dynamic> json) = _$HolidayImpl.fromJson;
+
+  @override
+  String get start;
+  @override
+  String get end;
+  @override
+  int get year;
+  @override
+  String get stateCode;
+  @override
+  String get name;
+  @override
+  String get slug;
+
+  /// Create a copy of Holiday
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$HolidayImplCopyWith<_$HolidayImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
--- a/lib/state/app/modules/holidays/bloc/holidays_state.g.dart
+++ b/lib/state/app/modules/holidays/bloc/holidays_state.g.dart
@@ -0,0 +1,43 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'holidays_state.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+_$HolidaysStateImpl _$$HolidaysStateImplFromJson(Map<String, dynamic> json) =>
+    _$HolidaysStateImpl(
+      showPastHolidays: json['showPastHolidays'] as bool,
+      showDisclaimer: json['showDisclaimer'] as bool,
+      holidays: (json['holidays'] as List<dynamic>)
+          .map((e) => Holiday.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$$HolidaysStateImplToJson(_$HolidaysStateImpl instance) =>
+    <String, dynamic>{
+      'showPastHolidays': instance.showPastHolidays,
+      'showDisclaimer': instance.showDisclaimer,
+      'holidays': instance.holidays,
+    };
+
+_$HolidayImpl _$$HolidayImplFromJson(Map<String, dynamic> json) =>
+    _$HolidayImpl(
+      start: json['start'] as String,
+      end: json['end'] as String,
+      year: (json['year'] as num).toInt(),
+      stateCode: json['stateCode'] as String,
+      name: json['name'] as String,
+      slug: json['slug'] as String,
+    );
+
+Map<String, dynamic> _$$HolidayImplToJson(_$HolidayImpl instance) =>
+    <String, dynamic>{
+      'start': instance.start,
+      'end': instance.end,
+      'year': instance.year,
+      'stateCode': instance.stateCode,
+      'name': instance.name,
+      'slug': instance.slug,
+    };
--- a/lib/state/app/modules/holidays/dataProvider/holidays_get_holidays.dart
+++ b/lib/state/app/modules/holidays/dataProvider/holidays_get_holidays.dart
@@ -0,0 +1,13 @@
+import 'package:dio/dio.dart';
+
+import '../../../basis/dataloader/holiday_data_loader.dart';
+import '../../../infrastructure/dataLoader/data_loader.dart';
+import '../bloc/holidays_state.dart';
+
+class HolidaysGetHolidays extends HolidayDataLoader<List<Holiday>> {
+  @override
+  List<Holiday> assemble(DataLoaderResult data) => data.asListOfMaps().map(Holiday.fromJson).toList();
+
+  @override
+  Future<Response<String>> fetch() => dio.get('/holidays/HE');
+}
--- a/lib/state/app/modules/holidays/repository/holidays_repository.dart
+++ b/lib/state/app/modules/holidays/repository/holidays_repository.dart
@@ -0,0 +1,7 @@
+import '../../../infrastructure/repository/repository.dart';
+import '../bloc/holidays_state.dart';
+import '../dataProvider/holidays_get_holidays.dart';
+
+class HolidaysRepository extends Repository<HolidaysState> {
+  Future<List<Holiday>> getHolidays() => HolidaysGetHolidays().run();
+}
--- a/lib/state/app/modules/holidays/view/holidays_view.dart
+++ b/lib/state/app/modules/holidays/view/holidays_view.dart
@@ -0,0 +1,119 @@
+import 'package:flutter/material.dart';
+import 'package:jiffy/jiffy.dart';
+
+import '../../../../../widget/animatedTime.dart';
+import '../../../../../widget/list_view_util.dart';
+import '../../../../../widget/centeredLeading.dart';
+import '../../../../../widget/debug/debugTile.dart';
+import '../../../../../widget/string_extensions.dart';
+import '../../../infrastructure/loadableState/loadable_state.dart';
+import '../../../infrastructure/loadableState/view/loadable_state_consumer.dart';
+import '../../../infrastructure/utilityWidgets/bloc_module.dart';
+import '../bloc/holidays_bloc.dart';
+import '../bloc/holidays_event.dart';
+import '../bloc/holidays_state.dart';
+
+class HolidaysView extends StatelessWidget {
+  const HolidaysView({super.key});
+
+  @override
+  Widget build(BuildContext context) => BlocModule<HolidaysBloc, LoadableState<HolidaysState>>(
+    create: (context) => HolidaysBloc(),
+    autoRebuild: true,
+    child: (context, bloc, state) {
+      void showDisclaimer() {
+        showDialog(context: context, builder: (context) => AlertDialog(
+          title: const Text('Richtigkeit und Bereitstellung der Daten'),
+          content: const Text(''
+              'Sämtliche Datumsangaben sind ohne Gewähr.\n'
+              'Ich übernehme weder Verantwortung für die Richtigkeit der Daten noch hafte ich für wirtschaftliche Schäden die aus der Verwendung dieser Daten entstehen können.\n\n'
+              'Die Daten stammen von https://ferien-api.de/'),
+          actions: [
+            TextButton(child: const Text('Okay'), onPressed: () => Navigator.of(context).pop()),
+          ],
+        ));
+      }
+
+      return Scaffold(
+        appBar: AppBar(
+          title: const Text('Schulferien in Hessen'),
+          actions: [
+            IconButton(
+              icon: const Icon(Icons.info_outline),
+              onPressed: showDisclaimer,
+            ),
+            PopupMenuButton<bool>(
+              initialValue: bloc.showPastHolidays(),
+              icon: const Icon(Icons.history),
+              itemBuilder: (context) => [true, false].map((e) => PopupMenuItem<bool>(
+                  value: e,
+                  enabled: e != bloc.showPastHolidays(),
+                  child: Row(
+                    children: [
+                      Icon(e ? Icons.history_outlined : Icons.history_toggle_off_outlined, color: Theme.of(context).colorScheme.onSurface),
+                      const SizedBox(width: 15),
+                      Text(e ? 'Alle anzeigen' : 'Nur zukünftige anzeigen')
+                    ],
+                  )
+              )).toList(),
+              onSelected: (e) => bloc.add(SetPastHolidaysVisible(e)),
+            ),
+          ],
+        ),
+        body: LoadableStateConsumer<HolidaysBloc, HolidaysState>(
+          onLoad: (state) {
+            if(state.showDisclaimer) showDisclaimer();
+            bloc.add(DisclaimerDismissed());
+          },
+          child: (state, loading) => ListViewUtil.fromList<Holiday>(bloc.getHolidays(), (holiday) {
+            var holidayType = holiday.name.split(' ').first.capitalize();
+            String formatDate(String date) => Jiffy.parse(date).format(pattern: 'dd.MM.yyyy');
+            String getYear(String date, {String format = 'yyyy'}) => Jiffy.parse(date).format(pattern: format);
+
+            String getHolidayYear(String startDate, String endDate) => getYear(startDate) == getYear(endDate)
+                  ? getYear(startDate)
+                  : '${getYear(startDate)}/${getYear(endDate, format: 'yy')}';
+
+            return ListTile(
+              leading: const CenteredLeading(Icon(Icons.calendar_month)),
+              title: Text('$holidayType ${getHolidayYear(holiday.start, holiday.end)}'),
+              subtitle: Text('${formatDate(holiday.start)} - ${formatDate(holiday.end)}'),
+              onTap: () => showDialog(context: context, builder: (context) => SimpleDialog(
+                title: Text('$holidayType ${holiday.year} in Hessen'),
+                children: [
+                  ListTile(
+                    leading: const CenteredLeading(Icon(Icons.signpost_outlined)),
+                    title: Text(holiday.name.capitalize()),
+                    subtitle: Text(holiday.slug.capitalize()),
+                  ),
+                  ListTile(
+                    leading: const Icon(Icons.date_range_outlined),
+                    title: Text('vom ${formatDate(holiday.start)}'),
+                  ),
+                  ListTile(
+                    leading: const Icon(Icons.date_range_outlined),
+                    title: Text('bis zum ${formatDate(holiday.end)}'),
+                  ),
+                  Visibility(
+                    visible: !DateTime.parse(holiday.start).difference(DateTime.now()).isNegative,
+                    replacement: ListTile(
+                      leading: const CenteredLeading(Icon(Icons.content_paste_search_outlined)),
+                      title: Text(Jiffy.parse(holiday.start).fromNow()),
+                    ),
+                    child: ListTile(
+                      leading: const CenteredLeading(Icon(Icons.timer_outlined)),
+                      title: AnimatedTime(callback: () => DateTime.parse(holiday.start).difference(DateTime.now())),
+                      subtitle: Text(Jiffy.parse(holiday.start).fromNow()),
+                    ),
+                  ),
+                  DebugTile(context).jsonData(holiday.toJson()),
+                ],
+              )),
+              trailing: const Icon(Icons.arrow_right),
+            );
+          }),
+        ),
+      );
+    },
+  );
+}
--- a/lib/state/app/modules/marianumMessage/bloc/marianum_message_bloc.dart
+++ b/lib/state/app/modules/marianumMessage/bloc/marianum_message_bloc.dart
@@ -8,7 +8,7 @@ class MarianumMessageBloc extends LoadableHydratedBloc<MarianumMessageEvent, Mar
  @override
  Future<void> gatherData() async {
    var messages = await repo.getMessages();
-    add(Emit((state) => state.copyWith(messageList: messages)));
+    add(DataGathered((state) => state.copyWith(messageList: messages)));
  }

  @override
--- a/lib/state/app/modules/marianumMessage/bloc/marianum_message_state.freezed.dart
+++ b/lib/state/app/modules/marianumMessage/bloc/marianum_message_state.freezed.dart
@@ -22,8 +22,12 @@ MarianumMessageState _$MarianumMessageStateFromJson(Map<String, dynamic> json) {
 mixin _$MarianumMessageState {
  MarianumMessageList get messageList => throw _privateConstructorUsedError;

+  /// Serializes this MarianumMessageState to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $MarianumMessageStateCopyWith<MarianumMessageState> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -50,6 +54,8 @@ class _$MarianumMessageStateCopyWithImpl<$Res,
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -63,6 +69,8 @@ class _$MarianumMessageStateCopyWithImpl<$Res,
    ) as $Val);
  }

+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
  @override
  @pragma('vm:prefer-inline')
  $MarianumMessageListCopyWith<$Res> get messageList {
@@ -94,6 +102,8 @@ class __$$MarianumMessageStateImplCopyWithImpl<$Res>
      $Res Function(_$MarianumMessageStateImpl) _then)
      : super(_value, _then);

+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -133,11 +143,13 @@ class _$MarianumMessageStateImpl implements _MarianumMessageState {
                other.messageList == messageList));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, messageList);

-  @JsonKey(ignore: true)
+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$MarianumMessageStateImplCopyWith<_$MarianumMessageStateImpl>
@@ -163,8 +175,11 @@ abstract class _MarianumMessageState implements MarianumMessageState {

  @override
  MarianumMessageList get messageList;
+
+  /// Create a copy of MarianumMessageState
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$MarianumMessageStateImplCopyWith<_$MarianumMessageStateImpl>
      get copyWith => throw _privateConstructorUsedError;
 }
@@ -178,8 +193,12 @@ mixin _$MarianumMessageList {
  String get base => throw _privateConstructorUsedError;
  List<MarianumMessage> get messages => throw _privateConstructorUsedError;

+  /// Serializes this MarianumMessageList to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of MarianumMessageList
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $MarianumMessageListCopyWith<MarianumMessageList> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -203,6 +222,8 @@ class _$MarianumMessageListCopyWithImpl<$Res, $Val extends MarianumMessageList>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of MarianumMessageList
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -241,6 +262,8 @@ class __$$MarianumMessageListImplCopyWithImpl<$Res>
      $Res Function(_$MarianumMessageListImpl) _then)
      : super(_value, _then);

+  /// Create a copy of MarianumMessageList
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -294,12 +317,14 @@ class _$MarianumMessageListImpl implements _MarianumMessageList {
            const DeepCollectionEquality().equals(other._messages, _messages));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(
      runtimeType, base, const DeepCollectionEquality().hash(_messages));

-  @JsonKey(ignore: true)
+  /// Create a copy of MarianumMessageList
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$MarianumMessageListImplCopyWith<_$MarianumMessageListImpl> get copyWith =>
@@ -327,8 +352,11 @@ abstract class _MarianumMessageList implements MarianumMessageList {
  String get base;
  @override
  List<MarianumMessage> get messages;
+
+  /// Create a copy of MarianumMessageList
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$MarianumMessageListImplCopyWith<_$MarianumMessageListImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -343,8 +371,12 @@ mixin _$MarianumMessage {
  String get date => throw _privateConstructorUsedError;
  String get url => throw _privateConstructorUsedError;

+  /// Serializes this MarianumMessage to a JSON map.
  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
+
+  /// Create a copy of MarianumMessage
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  $MarianumMessageCopyWith<MarianumMessage> get copyWith =>
      throw _privateConstructorUsedError;
 }
@@ -368,6 +400,8 @@ class _$MarianumMessageCopyWithImpl<$Res, $Val extends MarianumMessage>
  // ignore: unused_field
  final $Res Function($Val) _then;

+  /// Create a copy of MarianumMessage
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -411,6 +445,8 @@ class __$$MarianumMessageImplCopyWithImpl<$Res>
      _$MarianumMessageImpl _value, $Res Function(_$MarianumMessageImpl) _then)
      : super(_value, _then);

+  /// Create a copy of MarianumMessage
+  /// with the given fields replaced by the non-null parameter values.
  @pragma('vm:prefer-inline')
  @override
  $Res call({
@@ -466,11 +502,13 @@ class _$MarianumMessageImpl implements _MarianumMessage {
            (identical(other.url, url) || other.url == url));
  }

-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  int get hashCode => Object.hash(runtimeType, name, date, url);

-  @JsonKey(ignore: true)
+  /// Create a copy of MarianumMessage
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
  @override
  @pragma('vm:prefer-inline')
  _$$MarianumMessageImplCopyWith<_$MarianumMessageImpl> get copyWith =>
@@ -500,8 +538,11 @@ abstract class _MarianumMessage implements MarianumMessage {
  String get date;
  @override
  String get url;
+
+  /// Create a copy of MarianumMessage
+  /// with the given fields replaced by the non-null parameter values.
  @override
-  @JsonKey(ignore: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
  _$$MarianumMessageImplCopyWith<_$MarianumMessageImpl> get copyWith =>
      throw _privateConstructorUsedError;
 }
--- a/lib/state/app/modules/marianumMessage/dataProvider/marianum_message_get_messages.dart
+++ b/lib/state/app/modules/marianumMessage/dataProvider/marianum_message_get_messages.dart
@@ -1,7 +1,7 @@
 import 'package:dio/dio.dart';

 import '../../../infrastructure/dataLoader/data_loader.dart';
-import '../../../infrastructure/dataLoader/mhsl_data_loader.dart';
+import '../../../basis/dataloader/mhsl_data_loader.dart';
 import '../bloc/marianum_message_state.dart';

 class MarianumMessageGetMessages extends MhslDataLoader<MarianumMessageList> {
--- a/lib/storage/base/settings.dart
+++ b/lib/storage/base/settings.dart
@@ -4,6 +4,7 @@ import 'package:json_annotation/json_annotation.dart';
 import '../devTools/devToolsSettings.dart';
 import '../file/fileSettings.dart';
 import '../fileView/fileViewSettings.dart';
+import '../general/modulesSettings.dart';
 import '../holidays/holidaysSettings.dart';
 import '../notification/notificationSettings.dart';
 import '../talk/talkSettings.dart';
@@ -20,6 +21,7 @@ class Settings {
  ThemeMode appTheme;
  bool devToolsEnabled;

+  ModulesSettings modulesSettings;
  TimetableSettings timetableSettings;
  TalkSettings talkSettings;
  FileSettings fileSettings;
@@ -31,6 +33,7 @@ class Settings {
  Settings({
    required this.appTheme,
    required this.devToolsEnabled,
+    required this.modulesSettings,
    required this.timetableSettings,
    required this.talkSettings,
    required this.fileSettings,
--- a/lib/storage/base/settings.g.dart
+++ b/lib/storage/base/settings.g.dart
@@ -9,6 +9,8 @@ part of 'settings.dart';
 Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
      appTheme: Settings._themeFromJson(json['appTheme'] as String),
      devToolsEnabled: json['devToolsEnabled'] as bool,
+      modulesSettings: ModulesSettings.fromJson(
+          json['modulesSettings'] as Map<String, dynamic>),
      timetableSettings: TimetableSettings.fromJson(
          json['timetableSettings'] as Map<String, dynamic>),
      talkSettings:
@@ -28,6 +30,7 @@ Settings _$SettingsFromJson(Map<String, dynamic> json) => Settings(
 Map<String, dynamic> _$SettingsToJson(Settings instance) => <String, dynamic>{
      'appTheme': Settings._themeToJson(instance.appTheme),
      'devToolsEnabled': instance.devToolsEnabled,
+      'modulesSettings': instance.modulesSettings.toJson(),
      'timetableSettings': instance.timetableSettings.toJson(),
      'talkSettings': instance.talkSettings.toJson(),
      'fileSettings': instance.fileSettings.toJson(),
--- a/lib/storage/general/modulesSettings.dart
+++ b/lib/storage/general/modulesSettings.dart
@@ -0,0 +1,19 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+import '../../state/app/modules/app_modules.dart';
+
+part 'modulesSettings.g.dart';
+
+@JsonSerializable()
+class ModulesSettings {
+  List<Modules> moduleOrder;
+  List<Modules> hiddenModules;
+
+  ModulesSettings({
+    required this.moduleOrder,
+    required this.hiddenModules
+  });
+
+  factory ModulesSettings.fromJson(Map<String, dynamic> json) => _$ModulesSettingsFromJson(json);
+  Map<String, dynamic> toJson() => _$ModulesSettingsToJson(this);
+}
--- a/lib/storage/general/modulesSettings.g.dart
+++ b/lib/storage/general/modulesSettings.g.dart
@@ -0,0 +1,35 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'modulesSettings.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ModulesSettings _$ModulesSettingsFromJson(Map<String, dynamic> json) =>
+    ModulesSettings(
+      moduleOrder: (json['moduleOrder'] as List<dynamic>)
+          .map((e) => $enumDecode(_$ModulesEnumMap, e))
+          .toList(),
+      hiddenModules: (json['hiddenModules'] as List<dynamic>)
+          .map((e) => $enumDecode(_$ModulesEnumMap, e))
+          .toList(),
+    );
+
+Map<String, dynamic> _$ModulesSettingsToJson(ModulesSettings instance) =>
+    <String, dynamic>{
+      'moduleOrder':
+          instance.moduleOrder.map((e) => _$ModulesEnumMap[e]!).toList(),
+      'hiddenModules':
+          instance.hiddenModules.map((e) => _$ModulesEnumMap[e]!).toList(),
+    };
+
+const _$ModulesEnumMap = {
+  Modules.timetable: 'timetable',
+  Modules.talk: 'talk',
+  Modules.files: 'files',
+  Modules.marianumMessage: 'marianumMessage',
+  Modules.roomPlan: 'roomPlan',
+  Modules.gradeAveragesCalculator: 'gradeAveragesCalculator',
+  Modules.holidays: 'holidays',
+};
--- a/lib/storage/timetable/timetableSettings.dart
+++ b/lib/storage/timetable/timetableSettings.dart
@@ -1,12 +1,18 @@
 import 'package:json_annotation/json_annotation.dart';

+import '../../view/pages/timetable/timetableNameMode.dart';
+
 part 'timetableSettings.g.dart';

@JsonSerializable()
 class TimetableSettings {
  bool connectDoubleLessons;
+  TimetableNameMode timetableNameMode;

-  TimetableSettings({required this.connectDoubleLessons});
+  TimetableSettings({
+    required this.connectDoubleLessons,
+    required this.timetableNameMode
+  });

  factory TimetableSettings.fromJson(Map<String, dynamic> json) => _$TimetableSettingsFromJson(json);
  Map<String, dynamic> toJson() => _$TimetableSettingsToJson(this);
--- a/lib/storage/timetable/timetableSettings.g.dart
+++ b/lib/storage/timetable/timetableSettings.g.dart
@@ -9,9 +9,19 @@ part of 'timetableSettings.dart';
 TimetableSettings _$TimetableSettingsFromJson(Map<String, dynamic> json) =>
    TimetableSettings(
      connectDoubleLessons: json['connectDoubleLessons'] as bool,
+      timetableNameMode:
+          $enumDecode(_$TimetableNameModeEnumMap, json['timetableNameMode']),
    );

 Map<String, dynamic> _$TimetableSettingsToJson(TimetableSettings instance) =>
    <String, dynamic>{
      'connectDoubleLessons': instance.connectDoubleLessons,
+      'timetableNameMode':
+          _$TimetableNameModeEnumMap[instance.timetableNameMode]!,
    };
+
+const _$TimetableNameModeEnumMap = {
+  TimetableNameMode.name: 'name',
+  TimetableNameMode.longName: 'longName',
+  TimetableNameMode.alternateName: 'alternateName',
+};
--- a/lib/theming/appTheme.dart
+++ b/lib/theming/appTheme.dart
@@ -1,26 +1,21 @@
 import 'package:flutter/material.dart';

+import '../widget/dropdownDisplay.dart';
+
 class AppTheme {
-  static ThemeModeDisplay getDisplayOptions(ThemeMode theme) {
+  static DropdownDisplay getDisplayOptions(ThemeMode theme) {
    switch(theme) {
      case ThemeMode.system:
-        return ThemeModeDisplay(icon: Icons.auto_fix_high_outlined, displayName: 'Systemvorgabe');
+        return DropdownDisplay(icon: Icons.auto_fix_high_outlined, displayName: 'Systemvorgabe');

      case ThemeMode.light:
-        return ThemeModeDisplay(icon: Icons.wb_sunny_outlined, displayName: 'Hell');
+        return DropdownDisplay(icon: Icons.wb_sunny_outlined, displayName: 'Hell');

      case ThemeMode.dark:
-        return ThemeModeDisplay(icon: Icons.dark_mode_outlined, displayName: 'Dunkel');
+        return DropdownDisplay(icon: Icons.dark_mode_outlined, displayName: 'Dunkel');

    }
  }

  static bool isDarkMode(BuildContext context) => Theme.of(context).brightness == Brightness.dark;
 }
-
-class ThemeModeDisplay {
-  final IconData icon;
-  final String displayName;
-
-  ThemeModeDisplay({required this.icon, required this.displayName});
-}
--- a/lib/view/pages/files/fileElement.dart
+++ b/lib/view/pages/files/fileElement.dart
@@ -1,11 +1,11 @@
 import 'dart:io';

-import 'package:better_open_file/better_open_file.dart';
 import 'package:filesize/filesize.dart';
 import 'package:flowder/flowder.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:jiffy/jiffy.dart';
+import 'package:open_filex/open_filex.dart';
 import '../../../widget/infoDialog.dart';
 import 'package:nextcloud/nextcloud.dart';
 import 'package:path_provider/path_provider.dart';
--- a/lib/view/pages/more/feedback/feedbackDialog.dart
+++ b/lib/view/pages/more/feedback/feedbackDialog.dart
@@ -5,7 +5,7 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:loader_overlay/loader_overlay.dart';
-import 'package:package_info/package_info.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 import 'package:badges/badges.dart' as badges;

@@ -60,12 +60,17 @@ class _FeedbackDialogState extends State<FeedbackDialog> {
            Padding(
              padding: const EdgeInsets.all(10),
              child: TextField(
+                onChanged: (value) {
+                  if(value.trim().toLowerCase() == 'ranzig') {
+                    _feedbackInput.text = 'selber';
+                  }
+                },
                controller: _feedbackInput,
                autofocus: true,
                decoration: InputDecoration(
                  border: const OutlineInputBorder(),
                  label: const Text('Feedback und Verbesserungen'),
-                  errorText: _textFieldEmpty ? 'Bitte gib eine Beschreibung an' : null,
+                  errorText: _textFieldEmpty ? 'Bitte gib eine Beschreibung an!' : null,
                ),
                minLines: 4,
                maxLines: 7,
--- a/lib/view/pages/more/holidays/holidays.dart
+++ b/lib/view/pages/more/holidays/holidays.dart
@@ -1,157 +0,0 @@
-import 'dart:core';
-
-import 'package:flutter/material.dart';
-import 'package:jiffy/jiffy.dart';
-import 'package:provider/provider.dart';
-
-import '../../../../model/holidays/holidaysProps.dart';
-import '../../../../storage/base/settingsProvider.dart';
-import '../../../../widget/centeredLeading.dart';
-import '../../../../widget/confirmDialog.dart';
-import '../../../../widget/debug/debugTile.dart';
-import '../../../../widget/loadingSpinner.dart';
-import '../../../../widget/placeholderView.dart';
-import '../../../../widget/animatedTime.dart';
-
-class Holidays extends StatefulWidget {
-  const Holidays({super.key});
-
-  @override
-  State<Holidays> createState() => _HolidaysState();
-}
-
-extension StringExtension on String {
-  String capitalize() => '${this[0].toUpperCase()}${substring(1).toLowerCase()}';
-}
-
-class _HolidaysState extends State<Holidays> {
-  late SettingsProvider settings = Provider.of<SettingsProvider>(context, listen: false);
-  late bool showPastEvents = settings.val().holidaysSettings.showPastEvents;
-
-  @override
-  void initState() {
-    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-      Provider.of<HolidaysProps>(context, listen: false).run();
-      if(!settings.val().holidaysSettings.dismissedDisclaimer) showDisclaimer();
-    });
-
-    super.initState();
-  }
-
-  String parseString(String enDate) => Jiffy.parse(enDate).format(pattern: 'dd.MM.yyyy');
-
-  void showDisclaimer() {
-    showDialog(context: context, builder: (context) => AlertDialog(
-        title: const Text('Richtigkeit und Bereitstellung der Daten'),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            const Text(''
-                'Sämtliche Datumsangaben sind ohne Gewähr.\n'
-                'Ich übernehme weder Verantwortung für die Richtigkeit der Daten noch hafte ich für wirtschaftliche Schäden die aus der Verwendung dieser Daten entstehen können.\n\n'
-                'Die Daten stammen von https://ferien-api.de/'),
-            const SizedBox(height: 30),
-            ListTile(
-              title: const Text('Diese Meldung nicht mehr anzeigen'),
-              trailing: Checkbox(
-                value: settings.val().holidaysSettings.dismissedDisclaimer,
-                onChanged: (value) => settings.val(write: true).holidaysSettings.dismissedDisclaimer = value!,
-              ),
-            )
-          ],
-        ),
-        actions: [
-          TextButton(child: const Text('ferien-api.de besuchen'), onPressed: () => ConfirmDialog.openBrowser(context, 'https://ferien-api.de/')),
-          TextButton(child: const Text('Okay'), onPressed: () => Navigator.of(context).pop()),
-        ],
-      ));
-  }
-
-  @override
-  Widget build(BuildContext context) => Scaffold(
-      appBar: AppBar(
-        title: const Text('Schulferien in Hessen'),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.warning_amber_outlined),
-            onPressed: showDisclaimer,
-          ),
-          PopupMenuButton<bool>(
-            initialValue: settings.val().holidaysSettings.showPastEvents,
-            icon: const Icon(Icons.manage_history_outlined),
-            itemBuilder: (context) => [true, false].map((e) => PopupMenuItem<bool>(
-                  value: e,
-                  enabled: e != showPastEvents,
-                  child: Row(
-                    children: [
-                      Icon(e ? Icons.history_outlined : Icons.history_toggle_off_outlined, color: Theme.of(context).colorScheme.onSurface),
-                      const SizedBox(width: 15),
-                      Text(e ? 'Alle anzeigen' : 'Nur zukünftige anzeigen')
-                    ],
-                  )
-              )).toList(),
-            onSelected: (e) {
-              setState(() {
-                showPastEvents = e;
-                settings.val(write: true).holidaysSettings.showPastEvents = e;
-              });
-            },
-          ),
-        ],
-      ),
-      body: Consumer<HolidaysProps>(builder: (context, value, child) {
-        if(value.primaryLoading()) return const LoadingSpinner();
-
-        var holidays = value.getHolidaysResponse.data;
-        if(!showPastEvents) holidays = holidays.where((element) => DateTime.parse(element.end).isAfter(DateTime.now())).toList();
-
-        if(holidays.isEmpty) return const PlaceholderView(icon: Icons.search_off, text: 'Es wurden keine Ferieneinträge gefunden!');
-
-        return ListView.builder(
-            itemCount: holidays.length,
-            itemBuilder: (context, index) {
-              var holiday = holidays[index];
-              var holidayType = holiday.name.split(' ').first.capitalize();
-              return ListTile(
-                leading: const CenteredLeading(Icon(Icons.calendar_month)),
-                title: Text('$holidayType ab ${parseString(holiday.start)}'),
-                subtitle: Text('bis ${parseString(holiday.end)}'),
-                onTap: () => showDialog(context: context, builder: (context) => SimpleDialog(
-                  title: Text('$holidayType ${holiday.year} in Hessen'),
-                  children: [
-                    ListTile(
-                      leading: const CenteredLeading(Icon(Icons.signpost_outlined)),
-                      title: Text(holiday.name),
-                      subtitle: Text(holiday.slug),
-                    ),
-                    ListTile(
-                      leading: const Icon(Icons.arrow_forward),
-                      title: Text('vom ${parseString(holiday.start)}'),
-                    ),
-                    ListTile(
-                      leading: const Icon(Icons.arrow_back),
-                      title: Text('bis zum ${parseString(holiday.end)}'),
-                    ),
-                    Visibility(
-                      visible: !DateTime.parse(holiday.start).difference(DateTime.now()).isNegative,
-                      replacement: ListTile(
-                        leading: const CenteredLeading(Icon(Icons.content_paste_search_outlined)),
-                        title: Text(Jiffy.parse(holiday.start).fromNow()),
-                      ),
-                      child: ListTile(
-                        leading: const CenteredLeading(Icon(Icons.timer_outlined)),
-                        title: AnimatedTime(callback: () => DateTime.parse(holiday.start).difference(DateTime.now())),
-                        subtitle: Text(Jiffy.parse(holiday.start).fromNow()),
-                      ),
-                    ),
-                    DebugTile(context).jsonData(holiday.toJson()),
-                  ],
-                )),
-                trailing: const Icon(Icons.arrow_right),
-              );
-            },
-          );
-        },
-      )
-    );
-}
--- a/lib/view/pages/overhang.dart
+++ b/lib/view/pages/overhang.dart
@@ -3,33 +3,82 @@ import 'dart:io';

 import 'package:flutter/material.dart';
 import 'package:in_app_review/in_app_review.dart';
+import 'package:provider/provider.dart';
 import '../../extensions/renderNotNull.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';

 import '../../state/app/modules/app_modules.dart';
+import '../../storage/base/settingsProvider.dart';
 import '../../widget/centeredLeading.dart';
 import '../../widget/infoDialog.dart';
+import '../settings/defaultSettings.dart';
 import '../settings/settings.dart';
 import 'more/feedback/feedbackDialog.dart';
 import 'more/share/selectShareTypeDialog.dart';

-class Overhang extends StatelessWidget {
+class Overhang extends StatefulWidget {
  const Overhang({super.key});

  @override
-  Widget build(BuildContext context) => Scaffold(
+  State<Overhang> createState() => _OverhangState();
+}
+
+class _OverhangState extends State<Overhang> {
+  bool editMode = false;
+
+  @override
+  Widget build(BuildContext context) => Consumer<SettingsProvider>(builder: (context, settings, child) => Scaffold(
      appBar: AppBar(
        title: const Text('Mehr'),
        actions: [
-          IconButton(onPressed: () => pushScreen(context, screen: const Settings(), withNavBar: false), icon: const Icon(Icons.settings))
+          if(editMode) IconButton(
+            onPressed: settings.val().modulesSettings.toJson().toString() != DefaultSettings.get().modulesSettings.toJson().toString()
+                ? () => settings.val(write: true).modulesSettings = DefaultSettings.get().modulesSettings
+                : null,
+            icon: Icon(Icons.undo_outlined)
+          ),
+          IconButton(onPressed: () => setState(() => editMode = !editMode), icon: Icon(Icons.edit_note_outlined), color: editMode ? Theme.of(context).primaryColor : null),
+          IconButton(onPressed: editMode ? null : () => pushScreen(context, screen: const Settings(), withNavBar: false), icon: const Icon(Icons.settings)),
        ],
      ),
-      body: ListView(
+      body: editMode ? _sorting()  : _overhang(),
+    ));
+
+  Widget _sorting() => Consumer<SettingsProvider>(builder: (context, settings, child) {
+    void changeVisibility(Modules module) {
+      var hidden = settings.val(write: true).modulesSettings.hiddenModules;
+      hidden.contains(module) ? hidden.remove(module) : (hidden.length < 3 ? hidden.add(module) : null);
+    }
+
+    return ReorderableListView(
+      header: const Center(
+        heightFactor: 2,
+        child: Text('Halte und ziehe einen Eintrag, um ihn zu verschieben.\nEs können 3 Bereiche ausgeblendet werden.', textAlign: TextAlign.center)
+      ),
+      children: AppModule.modules(context, showFiltered: true)
+        .map((key, value) => MapEntry(key, value.toListTile(
+          context,
+          key: Key(key.name),
+          isReorder: true,
+          onVisibleChange: () => changeVisibility(key),
+          isVisible: !settings.val().modulesSettings.hiddenModules.contains(key)
+        )))
+        .values
+        .toList(),
+      onReorder: (oldIndex, newIndex) {
+        if (newIndex > oldIndex) newIndex -= 1;
+
+        var order = settings.val().modulesSettings.moduleOrder.toList();
+        final movedModule = order.removeAt(oldIndex);
+        order.insert(newIndex, movedModule);
+        settings.val(write: true).modulesSettings.moduleOrder = order;
+      }
+    );
+  });
+
+  Widget _overhang() => ListView(
      children: [
-          AppModule.getModule(Modules.marianumMessage).toListTile(context),
-          AppModule.getModule(Modules.roomPlan).toListTile(context),
-          AppModule.getModule(Modules.gradeAveragesCalculator).toListTile(context),
-          AppModule.getModule(Modules.holidays).toListTile(context),
+        ...AppModule.getOverhangModules(context).map((e) => e.toListTile(context)),

        const Divider(),

@@ -73,6 +122,5 @@ class Overhang extends StatelessWidget {
          onTap: () => pushScreen(context, withNavBar: false, screen: const FeedbackDialog()),
        ),
      ],
-      ),
    );
 }
--- a/lib/view/pages/talk/chatDetails/chatInfo.dart
+++ b/lib/view/pages/talk/chatDetails/chatInfo.dart
@@ -66,7 +66,7 @@ class _ChatInfoState extends State<ChatInfo> {
            if(participants != null) ...[
              ListTile(
                leading: const Icon(Icons.supervised_user_circle),
-                title: Text('${participants!.data.length} Teilnehmer'),
+                title: Text('${participants!.data.length} Mitglieder'),
                trailing: const Icon(Icons.arrow_right),
                onTap: () => TalkNavigator.pushSplitView(context, ParticipantsListView(participants!)),
              ),
--- a/lib/view/pages/talk/chatDetails/participants/participantsListView.dart
+++ b/lib/view/pages/talk/chatDetails/participants/participantsListView.dart
@@ -1,28 +1,44 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';

 import '../../../../../api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart';
 import '../../../../../widget/userAvatar.dart';

-class ParticipantsListView extends StatefulWidget {
+class ParticipantsListView extends StatelessWidget {
  final GetParticipantsResponse participantsResponse;
  const ParticipantsListView(this.participantsResponse, {super.key});

  @override
-  State<ParticipantsListView> createState() => _ParticipantsListViewState();
-}
+  Widget build(BuildContext context) {
+    lastname(participant) => participant.displayName.toString().split(' ').last;
    
-class _ParticipantsListViewState extends State<ParticipantsListView> {
-  @override
-  Widget build(BuildContext context) => Scaffold(
+    final participants = participantsResponse.data
+        .sorted((a, b) => lastname(a).compareTo(lastname(b)))
+        .sorted((a, b) => a.participantType.index.compareTo(b.participantType.index));
+    var groupedParticipants = participants.groupListsBy((participant) => participant.participantType);
+
+    return Scaffold(
      appBar: AppBar(
-        title: const Text('Teilnehmende'),
+        title: const Text('Mitglieder'),
      ),
      body: ListView(
-        children: widget.participantsResponse.data.map((participant) => ListTile(
+        children: [
+          ...groupedParticipants.entries.map((entry) => Column(
+            children: [
+              ListTile(
+                title: Text(entry.key.prettyName),
+                titleTextStyle: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              ...entry.value.map((participant) => ListTile(
                leading: UserAvatar(id: participant.actorId),
                title: Text(participant.displayName),
                subtitle: participant.statusMessage != null ? Text(participant.statusMessage!) : null,
-          )).toList(),
-      ),
+              )),
+              Divider(),
+            ],
+          ))
+        ],
+      )
    );
+  }
 }
--- a/lib/view/pages/talk/components/chatBubble.dart
+++ b/lib/view/pages/talk/components/chatBubble.dart
@@ -1,12 +1,11 @@
-import 'package:better_open_file/better_open_file.dart';
 import 'package:bubble/bubble.dart';
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart' as emojis;
 import 'package:flowder/flowder.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:jiffy/jiffy.dart';
+import 'package:open_filex/open_filex.dart';
 import '../../../../extensions/text.dart';
 import 'package:provider/provider.dart';

@@ -131,7 +130,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
                                emojis.EmojiPicker(
                                  config: emojis.Config(
                                    height: 256,
-                                    swapCategoryAndBottomBar: true,
+                                    // swapCategoryAndBottomBar: true, // TODO this property is no longer supported, need to find an replacement
                                    emojiViewConfig: emojis.EmojiViewConfig(
                                      backgroundColor: Theme.of(context).canvasColor,
                                      recentsLimit: 67,
@@ -149,7 +148,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
                                    ),
                                    searchViewConfig: emojis.SearchViewConfig(
                                      backgroundColor: Theme.of(context).dividerColor,
-                                      buttonColor: Theme.of(context).dividerColor,
+                                      // buttonColor: Theme.of(context).dividerColor, // TODO property no longer supported
                                      hintText: 'Suchen',
                                      buttonIconColor: Colors.white,
                                    ),
@@ -207,7 +206,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
            ),
          ),
          Visibility(
-            visible: !message.containsFile,
+            visible: widget.bubbleData.message != '{file}',
            child: ListTile(
              leading: const Icon(Icons.copy),
              title: const Text('Nachricht kopieren'),
@@ -283,14 +282,15 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
            if(!widget.bubbleData.isReplyable) return;
            var dx = details.delta.dx - _dragStartPosition.dx;
            setState(() {
-              _position = (_position.dx + dx).abs() > 30 ? Offset(_position.dx, 0) : Offset(_position.dx + dx, 0);
+              _position = (_position.dx + dx).abs() > 60 ? Offset(_position.dx, 0) : Offset(_position.dx + dx, 0);
            });
          },
          onHorizontalDragEnd: (DragEndDetails details) {
+            var isAction = _position.dx.abs() > 50;
            setState(() {
              _position = const Offset(0, 0);
            });
-            if(widget.bubbleData.isReplyable) {
+            if(widget.bubbleData.isReplyable && isAction) {
              Provider.of<ChatProps>(context, listen: false).setReferenceMessageId(widget.bubbleData.id, context, widget.chatData.token);
            }
          },
@@ -323,7 +323,9 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
              return;
            }

+            setState(() {
              downloadProgress = 1;
+            });
            downloadCore = FileElement.download(context, message.file!.path!, message.file!.name, (progress) {
              if(progress > 1) {
                setState(() {
@@ -408,7 +410,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
                            bottom: 0,
                            right: 0,
                            left: 0,
-                            child: LinearProgressIndicator(value: downloadProgress/100),
+                            child: LinearProgressIndicator(value: downloadProgress == 1 ? null : downloadProgress/100),
                          ),
                        ),
                      ],
--- a/lib/view/pages/talk/components/chatMessage.dart
+++ b/lib/view/pages/talk/components/chatMessage.dart
@@ -21,23 +21,26 @@ class ChatMessage {
  ChatMessage({required this.originalMessage, this.originalData}) {
    if(originalData?.containsKey('file') ?? false) {
      file = originalData?['file'];
-      content = file?.name ?? 'Datei';
-    } else {
-      content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
    }
+    content = RichObjectStringProcessor.parseToString(originalMessage, originalData);
  }

  Widget getWidget() {

-    if(file == null) {
-      return Linkify(
+    var contentWidget = Linkify(
      text: content,
      onOpen: onOpen,
    );
-    }

-    return CachedNetworkImage(
-      errorWidget: (context, url, error) => Padding(padding: const EdgeInsets.only(top: 10), child: Row(
+    if(file == null) return contentWidget;
+
+    return Padding(
+        padding: const EdgeInsets.only(top: 5),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            CachedNetworkImage(
+              errorWidget: (context, url, error) => Row(
                mainAxisSize: MainAxisSize.min,
                crossAxisAlignment: CrossAxisAlignment.center,
                children: [
@@ -46,13 +49,20 @@ class ChatMessage {
                  Flexible(child: Text(file!.name, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontWeight: FontWeight.bold))),
                  const SizedBox(width: 10),
                ],
-        )),
+              ),
              alignment: Alignment.center,
-      placeholder: (context, url) => const Padding(padding: EdgeInsets.all(10), child: CircularProgressIndicator()),
+              placeholder: (context, url) => const Padding(padding: EdgeInsets.all(15), child: SizedBox(width: 50, child: LinearProgressIndicator())),
              fadeInDuration: Duration.zero,
              fadeOutDuration: Duration.zero,
              errorListener: (value) {},
-      imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=100&y=-1&a=1',
+              imageUrl: 'https://${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().full()}/index.php/core/preview?fileId=${file!.id}&x=130&y=-1&a=1',
+            ),
+            if(originalMessage != '{file}') ...[
+              SizedBox(height: 5),
+              contentWidget
+            ]
+          ],
+        )
    );
  }

--- a/lib/view/pages/talk/messageReactions.dart
+++ b/lib/view/pages/talk/messageReactions.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

@@ -38,7 +37,7 @@ class _MessageReactionsState extends State<MessageReactions> {
        future: data,
        builder: (context, snapshot) {
          if(snapshot.connectionState == ConnectionState.waiting) return const LoadingSpinner();
-          if(snapshot.data == null) return const PlaceholderView(icon: Icons.search_off_outlined, text: 'Keine Reaktionen gefunden!');
+          if(snapshot.data!.data.isEmpty) return const PlaceholderView(icon: Icons.search_off_outlined, text: 'Keine Reaktionen gefunden!');
          return ListView(
            children: [
              ...snapshot.data!.data.entries.map<Widget>((entry) => ExpansionTile(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elias Müller	7dea44d1e8	Merge remote-tracking branch 'origin/develop' into develop	2025-09-10 20:23:20 +02:00
Elias Müller	5f27956035	fix webuntis auth retry not working correctly	2025-09-10 20:23:14 +02:00
Elias Müller	32799f648c	working ios build update	2025-09-09 13:58:00 +02:00
Elias Müller	859b85ab2c	Revert "Upgraded Gradle and Android Gradle Plugin" This reverts commit `bd1101c348`.	2025-09-06 18:51:00 +02:00
Elias Müller	bd1101c348	Upgraded Gradle and Android Gradle Plugin Upgraded Gradle from 8.9 to 8.13 and the Android Gradle Plugin from 8.7.3 to 8.13.0.	2025-09-06 17:35:41 +02:00
Elias Müller	f29c84d05c	fixed timetable subject name requirement	2025-09-06 17:03:01 +02:00
Elias Müller	7dbd6038f3	prevent common "change" tiles in timetable, more robust parsing	2025-09-06 16:47:47 +02:00
Elias Müller	877633f4de	Merge pull request 'develop-groupedParticipants' (#89 ) from develop-groupedParticipants into develop Reviewed-on: #89 Reviewed-by: Elias Müller <elias@elias-mueller.com>	2025-09-06 14:12:10 +00:00
lars	22d3d18a17	changed naming for participants	2025-09-06 16:09:47 +02:00
Lars Neuhaus	d65e61c297	Merge branch 'develop' into develop-groupedParticipants	2025-09-06 13:58:08 +00:00
Elias Müller	467b0e0dd8	Merge remote-tracking branch 'origin/develop' into develop	2025-09-06 15:57:19 +02:00
Lars Neuhaus	25a6ef37fa	Merge branch 'develop' into develop-groupedParticipants	2025-09-06 13:57:10 +00:00
Elias Müller	34763ace4a	Merge remote-tracking branch 'origin/develop' into develop	2025-09-06 15:57:08 +02:00
Elias Müller	590a70c623	Merge remote-tracking branch 'origin/develop' into develop	2025-09-06 15:56:51 +02:00
Elias Müller	9b58412ca7	fixed missing no reaction text fixed loading indicator being delayed on file download	2025-09-06 15:56:46 +02:00
Elias Müller	a6c16e41c2	fixed missing no reaction text fixed loading indicator being delayed on file download	2025-09-06 15:56:28 +02:00
Lars Neuhaus	117434a5e3	Merge branch 'develop' into develop-groupedParticipants	2025-09-06 13:54:40 +00:00
lars	e4582eaac5	removed commented code	2025-09-06 15:46:55 +02:00
lars	430d5b8dc7	Merge remote-tracking branch 'origin/develop' into develop-groupedParticipants # Conflicts: # pubspec.yaml	2025-09-06 15:36:12 +02:00
Elias Müller	9177c30d6e	fixed display dimensions of messages with files	2025-09-06 15:33:14 +02:00
Elias Müller	344f8f6d2c	Merge branch 'develop' into develop-fileMessagesWithText	2025-09-06 15:13:15 +02:00
Elias Müller	46971a8d46	upgraded syncfusion dependencies	2025-09-06 14:51:14 +02:00
Elias Müller	f330ef3f56	updated project dependencies and sdk. Comptaible with Flutter 3.35.3	2025-09-06 14:47:08 +02:00
Elias Müller	85f9988453	renamed timetable in ui	2025-09-06 14:12:13 +02:00
lars	f3de0bc165	centered file preview, made text copyable	2025-06-24 15:09:37 +02:00
lars	421ee9179d	grouped the participants list	2025-06-24 14:18:14 +02:00
Elias Müller	0a66858d93	Merge pull request 'sorted participants list alphabetically' (#87 ) from develop-sortedParticipants into develop Reviewed-on: #87 Reviewed-by: Elias Müller <elias@elias-mueller.com>	2025-06-24 10:47:07 +00:00
Elias Müller	49428680de	Merge branch 'develop' into develop-sortedParticipants	2025-06-24 10:46:58 +00:00
lars	0c676dc3d6	made perticipants list stateless	2025-06-23 17:54:12 +02:00
lars	c702b610c5	removed logging	2025-06-23 11:17:59 +02:00
lars	5938c6b3c3	fixed chat search	2025-06-23 11:16:39 +02:00
lars	8000475c1f	aligned text to the left	2025-06-16 16:07:04 +02:00
lars	da772f17cc	changed file messages to show their text or their file name	2025-06-10 21:35:12 +02:00
lars	c44b0464a4	sorted participants list alphabetically	2025-06-10 20:19:44 +02:00
Elias Müller	9d0cf8e313	bumped version	2025-04-16 13:16:49 +02:00
Elias Müller	f0009dad88	renamed files back to localized string	2025-04-16 13:15:31 +02:00
Elias Müller	905206f242	added missing implementation of "note to self", disabled breakers in debug environments	2025-03-11 16:22:02 +01:00
Elias Müller	769fbc1b6a	added timetable color substitute teachers	2025-02-14 19:31:46 +01:00
Elias Müller	8daf57bcee	#75 pinned timetable to german timezone	2025-02-13 22:28:45 +01:00
Elias Müller	33d488946a	updated android configuration files	2025-02-09 20:42:47 +01:00
Elias Müller	41a5e021c5	Merge pull request 'made app modules movable in their order' (#84 ) from develop-reorderableAppModules into develop Reviewed-on: #84 Reviewed-by: Pupsi <larslukasneuhaus@gmx.de>	2025-02-09 17:36:20 +00:00
Elias Müller	8f58893553	Merge branch 'develop' into develop-reorderableAppModules	2025-02-09 17:36:12 +00:00
Elias Müller	626d3d5564	added minimum message drag distance for chat reply	2025-02-09 15:16:02 +01:00
Elias Müller	d833cdb733	made app modules movable in their order	2025-02-09 15:06:14 +01:00
Elias Müller	8868914a76	restructured settings and devtools	2025-02-08 23:21:20 +01:00
Elias Müller	70e6f82b10	updated chat images loading animation	2025-02-08 22:53:14 +01:00
Elias Müller	6651613331	fixed files cache not working correctly	2025-02-08 22:35:20 +01:00
Elias Müller	9ad0f624de	Merge remote-tracking branch 'origin/develop' into develop	2025-02-08 21:40:49 +01:00
Elias Müller	82c143f847	bumped version	2025-02-08 21:40:39 +01:00
Elias Müller	1fdf731b81	Merge pull request 'added option for timetable naming modes' (#83 ) from feature-timetableNamingSetting into develop Reviewed-on: #83 Reviewed-by: Pupsi <larslukasneuhaus@gmx.de>	2025-01-24 22:27:06 +00:00
Elias Müller	2d3ccd25b4	Merge branch 'develop' into feature-timetableNamingSetting	2025-01-24 22:26:52 +00:00
Elias Müller	385ee806d6	updated feedback info text	2025-01-24 13:53:12 +01:00
Elias Müller	92aef41031	updated room plan image	2025-01-24 11:54:35 +01:00
Elias Müller	65b29ec4b8	added option for timetable naming modes	2025-01-24 11:50:14 +01:00
Elias Müller	9f51d68531	updated build runner tasks	2025-01-24 11:02:03 +01:00
Elias Müller	5bc4ba6332	replaced version wildcard with version range	2025-01-23 23:39:01 +01:00
Elias Müller	e9739ac2d5	updated app badger	2025-01-23 22:41:22 +01:00
Elias Müller	4d3a33dd9b	updated project	2025-01-23 11:20:08 +01:00
Elias Müller	ddeeaeaeac	Merge pull request 'develop-bloc-holidays' (#72 ) from develop-bloc-holidays into develop Reviewed-on: #72 Reviewed-by: Pupsi <larslukasneuhaus@gmx.de>	2024-06-23 21:00:45 +00:00
Elias Müller	c8e31b896b	added eof linebreak	2024-06-23 22:59:26 +02:00
Elias Müller	c443a1d567	fixed disclaimer not showing on first visit	2024-06-23 20:31:43 +02:00
Elias Müller	08ef784f57	Merge remote-tracking branch 'origin/develop' into develop-bloc-holidays	2024-06-22 16:47:15 +02:00
Elias Müller	fe93a94fc6	bloc for holidays	2024-06-12 15:53:13 +02:00
Elias Müller	a33c4ddac5	wip: fixed state not updating correctly	2024-05-27 22:28:42 +02:00
Elias Müller	634fe41e78	wip: bloc for holidays	2024-05-14 14:54:01 +02:00