dart format

Reviewed-on: #94

.gitignore

@@ -48,14 +48,14 @@ lib/generated_plugin_registrant.dart
 #pubspec.lock
 
 # Android related
-**/android/**/gradle-wrapper.jar
+materials/screenshots/android/**/gradle-wrapper.jar
-**/android/.gradle
+materials/screenshots/android/.gradle
-**/android/captures/
+materials/screenshots/android/captures/
-**/android/gradlew
+materials/screenshots/android/gradlew
-**/android/gradlew.bat
+materials/screenshots/android/gradlew.bat
-**/android/key.properties
+materials/screenshots/android/key.properties
-**/android/local.properties
+materials/screenshots/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+materials/screenshots/android/**/GeneratedPluginRegistrant.java
 
 # iOS/XCode related
 **/ios/**/*.mode1v3

CLAUDE.md

@@ -0,0 +1,77 @@
+# MarianumMobile Client
+
+Flutter-App für die Schul-Community: Webuntis-Stundenplan, Nextcloud Talk + Files, Custom MHSL-Backend (Breaker, Custom Events, Push).
+
+## Stack
+
+- **Flutter** (Dart >= 3.8)
+- **State:** `flutter_bloc` + `hydrated_bloc` (persistente BLoCs pro Modul)
+- **Navigation:** `persistent_bottom_nav_bar_v2` mit zentraler `AppRoutes`-Klasse als Single Entry Point
+- **HTTP:** `dio`, lokales Caching via `localstore` (Generic `RequestCache<T>`)
+- **Calendar:** `syncfusion_flutter_calendar`
+- **Datum/Zeit:** `jiffy` – wird **nur** über die Extensions in `lib/extensions/date_time.dart` verwendet
+- **Code-Gen:** `freezed`, `json_serializable`
+
+## Ordnerstruktur
+
+```
+lib/
+├── api/                    HTTP-Layer pro Backend (mhsl/, marianumcloud/, webuntis/, holidays/)
+├── state/app/modules/      BLoC pro Feature-Modul (timetable, chat, chat_list, files, ...)
+├── state/app/infrastructure LoadableState<T>, DataLoader, geteilte BLoC-Bausteine
+├── view/                   Screens
+│   ├── login/              Login-Flow
+│   └── pages/              ein Verzeichnis pro Modul (timetable, files, talk, ...)
+├── widget/                 Geteilte UI-Komponenten (Dialoge, Buttons, Sheets)
+├── extensions/             DateTime-, Text-, TimeOfDay-Extensions
+├── routing/                AppRoutes (Single Navigation Entry)
+├── theming/                Light/Dark Theme
+├── storage/                Freezed Settings-Modelle (HydratedBloc-persistent)
+├── notification/           Firebase + flutter_local_notifications
+└── utils/                  Helper (clipboard_helper, debouncer, download_manager, ...)
+```
+
+## Konventionen
+
+**Navigation:** Ausschließlich über `AppRoutes.openX(context, ...)`. Direkte `Navigator.push(...)` für volle Pages sind nicht erlaubt – `Navigator.pop` für Sheets/Dialogs bleibt am Call-Site.
+
+**Dialoge:**
+- Info/Fehler: `InfoDialog.show(context, body, copyable: true, title: '...')` aus `lib/widget/info_dialog.dart`.
+- Bestätigung: `ConfirmDialog(...).asDialog(context)` aus `lib/widget/confirm_dialog.dart`. Async-Bestätigung nutzt `onConfirmAsync` (zeigt Spinner und Inline-Fehler über `AsyncDialogAction`).
+- **Kein** inline `AlertDialog`/`SimpleDialog` mehr.
+
+**Bottom-Sheets:** Detail-Sheets gehen über `showDetailsBottomSheet(context, header: ..., children: (ctx) => [...])` aus `lib/widget/details_bottom_sheet.dart`. Header ist optional.
+
+**Async-Actions:** Statt manuelles Spinner+Try/Catch die `AsyncActionButton`-Familie aus `lib/widget/async_action_button.dart` (`AsyncActionButton`, `AsyncTextButton`, `AsyncIconButton`, `AsyncFab`, `AsyncListTile`, `AsyncDialogAction`, `runWithErrorDialog`). Fehler-Mapping läuft über `errorBuilder` oder zentral über `errorToUserMessage` aus `lib/api/errors/error_mapper.dart`.
+
+**Clipboard:** Über `copyToClipboard(context, text)` aus `lib/utils/clipboard_helper.dart`. Zeigt automatisch SnackBar.
+
+**Datum/Zeit-Formatierung:** Über die Extensions in `lib/extensions/date_time.dart`:
+`dt.formatHm()`, `dt.formatDate()`, `dt.formatDateTime()`, `dt.formatDateShort()`, `dt.formatRelative()`, `start.timeRangeTo(end)`. **Kein** direktes `Jiffy.parseFromDateTime(...).format(pattern: '...')` im View-Code.
+
+**Settings:** Pro Feature ein Freezed-Modell unter `lib/storage/`, persistiert via HydratedBloc.
+
+## Build / Run
+
+```bash
+flutter pub get
+dart run build_runner build --delete-conflicting-outputs   # nach Änderungen an Freezed/JSON-Modellen
+flutter run                                                  # Debug auf angeschlossenem Device
+flutter analyze                                              # statische Analyse, muss 0 Issues melden
+flutter test                                                 # Tests (siehe test/)
+```
+
+## Backend-Integrationen
+
+| Backend                   | Pfad                  | Zweck                                  |
+|---------------------------|-----------------------|----------------------------------------|
+| Webuntis                  | `lib/api/webuntis/`   | Stundenplan, Klassen, Räume, Lehrer    |
+| Nextcloud (Talk + WebDAV) | `lib/api/marianumcloud/` | Chats, Datei-Verwaltung             |
+| Custom MHSL-Server        | `lib/api/mhsl/`       | Breaker, Custom Events, Notify, Noten  |
+| Holiday-Calendar          | `lib/api/holidays/`   | Ferien                                 |
+
+`nextcloud`-Paket ist auf einen Custom-Fork gepinnt (siehe `pubspec.yaml` `dependency_overrides`).
+
+## Tests
+
+`test/` deckt aktuell nur Kern-Funktionen ab (DateTime-Extensions, AsyncActionController, LessonResolver). Beim Hinzufügen neuer pure-function-Helper bitte Test mit dazu.

analysis_options.yaml

@@ -1,33 +1,88 @@
-# This file configures the analyzer, which statically analyzes Dart code to
+# Static analysis configuration for the Flutter project.
-# check for errors, warnings, and lints.
+# https://dart.dev/guides/language/analysis-options
 #
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# Base ruleset: flutter_lints (recommended Flutter defaults).
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# Additional lints below catch real bugs and enforce consistent style.
-# invoked from the command line by running `flutter analyze`.
 
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml
 
-linter:
+analyzer:
-  # The lint rules applied to this project can be customized in the
+  language:
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+    strict-casts: true
-  # included above or to enable additional rules. A list of all available lints
+    strict-raw-types: true
-  # and their documentation is published at
+  errors:
-  # https://dart-lang.github.io/linter/lints/index.html.
+    invalid_annotation_target: ignore
-  #
+    todo: ignore
-  # Instead of disabling a lint rule for the entire project in the
+  exclude:
-  # section below, it can also be suppressed for a single line of code
+    - "**/*.g.dart"
-  # or a specific dart file by using the `// ignore: name_of_lint` and
+    - "**/*.freezed.dart"
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+    - "lib/firebase_options.dart"
-  # producing the lint.
+    - "build/**"
-  rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-    file_names: false
-    prefer_relative_imports: true
-    unnecessary_lambdas: true
-    prefer_single_quotes: true
 
-# Additional information about this file can be found at
+linter:
-# https://dart.dev/guides/language/analysis-options
+  rules:
+    # === Project conventions ===
+    prefer_relative_imports: true
+    prefer_single_quotes: true
+    eol_at_end_of_file: true
+    omit_local_variable_types: true
+    avoid_multiple_declarations_per_line: true
+
+    # === Bug catchers ===
+    always_declare_return_types: true
+    avoid_empty_else: true
+    avoid_slow_async_io: true
+    avoid_type_to_string: true
+    avoid_void_async: true
+    await_only_futures: true
+    cancel_subscriptions: true
+    cast_nullable_to_non_nullable: true
+    close_sinks: true
+    empty_catches: true
+    hash_and_equals: true
+    no_adjacent_strings_in_list: true
+    no_duplicate_case_values: true
+    test_types_in_equals: true
+    throw_in_finally: true
+    unawaited_futures: true
+    unnecessary_statements: true
+    unrelated_type_equality_checks: true
+    use_build_context_synchronously: true
+    valid_regexps: true
+
+    # === Flutter widget hygiene ===
+    avoid_unnecessary_containers: true
+    sized_box_for_whitespace: true
+    sort_child_properties_last: true
+    use_colored_box: true
+    use_decorated_box: true
+    use_full_hex_values_for_flutter_colors: true
+    use_key_in_widget_constructors: true
+
+    # === Code clarity ===
+    directives_ordering: true
+    library_prefixes: true
+    no_leading_underscores_for_local_identifiers: true
+    prefer_conditional_assignment: true
+    prefer_if_elements_to_conditional_expressions: true
+    prefer_if_null_operators: true
+    prefer_initializing_formals: true
+    prefer_interpolation_to_compose_strings: true
+    prefer_is_empty: true
+    prefer_is_not_empty: true
+    prefer_is_not_operator: true
+    prefer_iterable_whereType: true
+    prefer_null_aware_operators: true
+    prefer_spread_collections: true
+    prefer_void_to_null: true
+    unnecessary_await_in_return: true
+    unnecessary_brace_in_string_interps: true
+    unnecessary_lambdas: true
+    unnecessary_null_aware_assignments: true
+    unnecessary_null_checks: true
+    unnecessary_parenthesis: true
+    unnecessary_string_interpolations: true
+    use_super_parameters: true
+
+    # === File naming ===
+    file_names: true

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 "28.2.13676358"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        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.
+        minSdkVersion 26
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 19
         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'
 }

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

android/gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=21

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.13-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/settings.gradle

@@ -19,8 +19,10 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version '8.13.2' apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.library" version '8.13.2' apply false
+    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
 }
 
 include ":app"

assets/ca/lets-encrypt-r10.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFBTCCAu2gAwIBAgIQS6hSk/eaL6JzBkuoBI110DANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
+Fw0yNzAzMTIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
+bmNyeXB0MQwwCgYDVQQDEwNSMTAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDPV+XmxFQS7bRH/sknWHZGUCiMHT6I3wWd1bUYKb3dtVq/+vbOo76vACFL
+YlpaPAEvxVgD9on/jhFD68G14BQHlo9vH9fnuoE5CXVlt8KvGFs3Jijno/QHK20a
+/6tYvJWuQP/py1fEtVt/eA0YYbwX51TGu0mRzW4Y0YCF7qZlNrx06rxQTOr8IfM4
+FpOUurDTazgGzRYSespSdcitdrLCnF2YRVxvYXvGLe48E1KGAdlX5jgc3421H5KR
+mudKHMxFqHJV8LDmowfs/acbZp4/SItxhHFYyTr6717yW0QrPHTnj7JHwQdqzZq3
+DZb3EoEmUVQK7GH29/Xi8orIlQ2NAgMBAAGjgfgwgfUwDgYDVR0PAQH/BAQDAgGG
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdDgQWBBS7vMNHpeS8qcbDpHIMEI2iNeHI6DAfBgNVHSMEGDAWgBR5
+tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKG
+Fmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0gBAwwCjAIBgZngQwBAgEwJwYD
+VR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVuY3Iub3JnLzANBgkqhkiG9w0B
+AQsFAAOCAgEAkrHnQTfreZ2B5s3iJeE6IOmQRJWjgVzPw139vaBw1bGWKCIL0vIo
+zwzn1OZDjCQiHcFCktEJr59L9MhwTyAWsVrdAfYf+B9haxQnsHKNY67u4s5Lzzfd
+u6PUzeetUK29v+PsPmI2cJkxp+iN3epi4hKu9ZzUPSwMqtCceb7qPVxEbpYxY1p9
+1n5PJKBLBX9eb9LU6l8zSxPWV7bK3lG4XaMJgnT9x3ies7msFtpKK5bDtotij/l0
+GaKeA97pb5uwD9KgWvaFXMIEt8jVTjLEvwRdvCn294GPDF08U8lAkIv7tghluaQh
+1QnlE4SEN4LOECj8dsIGJXpGUk3aU3KkJz9icKy+aUgA+2cP21uh6NcDIS3XyfaZ
+QjmDQ993ChII8SXWupQZVBiIpcWO4RqZk3lr7Bz5MUCwzDIA359e57SSq5CCkY0N
+4B6Vulk7LktfwrdGNVI5BsC9qqxSwSKgRJeZ9wygIaehbHFHFhcBaMDKpiZlBHyz
+rsnnlFXCb5s8HKn5LsUgGvB24L7sGNZP2CX7dhHov+YhD+jozLW2p9W4959Bz2Ei
+RmqDtmiXLnzqTpXbI+suyCsohKRg6Un0RC47+cpiVwHiXZAW+cn8eiNIjqbVgXLx
+KPpdzvvtTnOPlC7SQZSYmdunr3Bf9b77AiC/ZidstK36dRILKz7OA54=
+-----END CERTIFICATE-----

assets/ca/lets-encrypt-r13.pem

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

build.yaml

@@ -0,0 +1,7 @@
+targets:
+  $default:
+    builders:
+      json_serializable:
+        options:
+          explicit_to_json: false
+          generic_argument_factories: true

devtools_options.yaml

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

flutter_launcher_icons.yaml

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

flutter_native_splash.yaml

@@ -54,7 +54,7 @@ flutter_native_splash:
     # 640 pixels in diameter.
     # App icon without an icon background: This should be 1152×1152 pixels, and fit within a circle
     # 768 pixels in diameter.
-    image: assets/logo/icon-android12.png
+    image: assets/logo/icon/icon-android12.png
 
     # Splash screen background color.
     color: "#993333"

ios/Flutter/AppFrameworkInfo.plist

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

ios/Podfile

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

ios/Podfile.lock

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

ios/Runner.xcodeproj/project.pbxproj

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

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

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

ios/Runner/AppDelegate.swift

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

ios/Runner/Info.plist

@@ -26,6 +26,8 @@
 		<string>$(FLUTTER_BUILD_NUMBER)</string>
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
+		<key>NSCameraUsageDescription</key>
+		<string>Um Fotos direkt aus der App aufnehmen und teilen zu können wird Zugriff auf die Kamera benötigt.</string>
 		<key>NSPhotoLibraryUsageDescription</key>
 		<string>Um Medien mit anderen zu teilen wird Zugriff zu deine Dateien benötigt.</string>
 		<key>UIApplicationSupportsIndirectInputEvents</key>

lib/api/apiError.dart

@@ -1,10 +0,0 @@
-class ApiError {
-  String message;
-
-  ApiError(this.message);
-
-  @override
-  String toString() {
-    return 'ApiError: $message';
-  }
-}

lib/api/apiParams.dart

@@ -1,3 +0,0 @@
-class ApiParams {
-
-}

lib/api/apiRequest.dart

@@ -1,5 +0,0 @@
-
-
-class ApiRequest {
-
-}

lib/api/api_error.dart

@@ -0,0 +1,8 @@
+class ApiError implements Exception {
+  String message;
+
+  ApiError(this.message);
+
+  @override
+  String toString() => 'ApiError: $message';
+}

lib/api/api_params.dart

@@ -0,0 +1 @@
+class ApiParams {}

lib/api/api_request.dart

@@ -0,0 +1 @@
+class ApiRequest {}

lib/api/api_response.dart

@@ -1,9 +1,10 @@
 import 'package:http/http.dart' as http;
 import 'package:json_annotation/json_annotation.dart';
+
 abstract class ApiResponse {
   @JsonKey(includeFromJson: false, includeToJson: false)
   late http.Response rawResponse;
 
   @JsonKey(includeIfNull: false)
-  late Map<String, String>? headers;
+  Map<String, String>? headers;
 }

lib/api/errors/app_exception.dart

@@ -0,0 +1,16 @@
+abstract class AppException implements Exception {
+  final String userMessage;
+  final String? technicalDetails;
+  final bool allowRetry;
+
+  const AppException({
+    required this.userMessage,
+    this.technicalDetails,
+    this.allowRetry = true,
+  });
+
+  @override
+  String toString() => technicalDetails == null
+      ? '$runtimeType: $userMessage'
+      : '$runtimeType: $userMessage ($technicalDetails)';
+}

lib/api/errors/auth_exception.dart

@@ -0,0 +1,24 @@
+import 'app_exception.dart';
+
+class AuthException extends AppException {
+  final int statusCode;
+
+  const AuthException({
+    required this.statusCode,
+    required super.userMessage,
+    super.technicalDetails,
+  }) : super(allowRetry: false);
+
+  factory AuthException.unauthorized({String? technicalDetails}) =>
+      AuthException(
+        statusCode: 401,
+        userMessage: 'Bitte melde dich erneut an, um fortzufahren.',
+        technicalDetails: technicalDetails,
+      );
+
+  factory AuthException.forbidden({String? technicalDetails}) => AuthException(
+    statusCode: 403,
+    userMessage: 'Du hast keine Berechtigung für diese Aktion.',
+    technicalDetails: technicalDetails,
+  );
+}

lib/api/errors/error_mapper.dart

@@ -0,0 +1,115 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:http/http.dart' as http;
+
+import '../api_error.dart';
+import '../marianumcloud/talk/talk_error.dart';
+import '../webuntis/webuntis_error.dart';
+import 'app_exception.dart';
+import 'network_exception.dart';
+import 'parse_exception.dart';
+import 'server_exception.dart';
+import 'talk_exception.dart';
+import 'webuntis_exception.dart';
+
+const String _defaultFallback =
+    'Etwas ist schiefgelaufen. Bitte versuche es erneut.';
+const String _tlsErrorMessage =
+    'Die sichere Verbindung zum Server wurde abgelehnt (Zertifikat oder TLS-Fehler). '
+    'Häufige Ursachen: falsche Geräte-Uhrzeit oder ein WLAN mit Anmeldeseite (z.B. Café/Hotel).';
+
+AppException? _dioToAppException(DioException error) {
+  switch (error.type) {
+    case DioExceptionType.connectionTimeout:
+    case DioExceptionType.sendTimeout:
+    case DioExceptionType.receiveTimeout:
+      return NetworkException.timeout(technicalDetails: error.message);
+    case DioExceptionType.connectionError:
+      return NetworkException(technicalDetails: error.message);
+    case DioExceptionType.badCertificate:
+      return const NetworkException(userMessage: _tlsErrorMessage);
+    case DioExceptionType.badResponse:
+      final status = error.response?.statusCode;
+      return ServerException(
+        statusCode: status ?? -1,
+        technicalDetails: 'HTTP $status: ${error.message}',
+      );
+    case DioExceptionType.cancel:
+    case DioExceptionType.unknown:
+      final inner = error.error;
+      if (inner is SocketException) {
+        return NetworkException(technicalDetails: inner.message);
+      }
+      if (inner is HandshakeException) {
+        return const NetworkException(userMessage: _tlsErrorMessage);
+      }
+      if (inner is FormatException) {
+        return ParseException(technicalDetails: inner.message);
+      }
+      return null;
+  }
+}
+
+String errorToUserMessage(Object? error, {String fallback = _defaultFallback}) {
+  if (error == null) return fallback;
+  if (error is AppException) return error.userMessage;
+
+  if (error is TalkError) return TalkException(error).userMessage;
+  if (error is WebuntisError) return WebuntisException(error).userMessage;
+
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.userMessage;
+  }
+
+  if (error is SocketException) {
+    return const NetworkException().userMessage;
+  }
+  if (error is TimeoutException) {
+    return NetworkException.timeout().userMessage;
+  }
+  if (error is http.ClientException) {
+    return const NetworkException().userMessage;
+  }
+  if (error is HandshakeException) {
+    return _tlsErrorMessage;
+  }
+  if (error is FormatException) {
+    return const ParseException().userMessage;
+  }
+  if (error is ApiError) {
+    return _stripDioPrefix(error.message);
+  }
+
+  return fallback;
+}
+
+String? errorToTechnicalDetails(Object? error) {
+  if (error == null) return null;
+  if (error is AppException) return error.technicalDetails ?? error.toString();
+  if (error is TalkError) return TalkException(error).technicalDetails;
+  if (error is WebuntisError) return WebuntisException(error).technicalDetails;
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.technicalDetails ?? mapped.toString();
+  }
+  return error.toString();
+}
+
+bool errorAllowsRetry(Object? error) {
+  if (error == null) return true;
+  if (error is AppException) return error.allowRetry;
+  if (error is DioException) {
+    final mapped = _dioToAppException(error);
+    if (mapped != null) return mapped.allowRetry;
+  }
+  return true;
+}
+
+String _stripDioPrefix(String raw) {
+  // ApiError messages embed full request URIs; only surface the first line.
+  final firstLine = raw.split('\n').first.trim();
+  return firstLine.isEmpty ? _defaultFallback : firstLine;
+}

lib/api/errors/network_exception.dart

@@ -0,0 +1,16 @@
+import 'app_exception.dart';
+
+class NetworkException extends AppException {
+  const NetworkException({
+    super.userMessage =
+        'Keine Internetverbindung. Bitte prüfe dein Netzwerk und versuche es erneut.',
+    super.technicalDetails,
+  }) : super(allowRetry: true);
+
+  factory NetworkException.timeout({String? technicalDetails}) =>
+      NetworkException(
+        userMessage:
+            'Der Server hat zu lange gebraucht. Bitte versuche es erneut.',
+        technicalDetails: technicalDetails,
+      );
+}

lib/api/errors/not_found_exception.dart

@@ -0,0 +1,8 @@
+import 'app_exception.dart';
+
+class NotFoundException extends AppException {
+  const NotFoundException({
+    super.userMessage = 'Der angeforderte Eintrag wurde nicht gefunden.',
+    super.technicalDetails,
+  }) : super(allowRetry: false);
+}

lib/api/errors/parse_exception.dart

@@ -0,0 +1,8 @@
+import 'app_exception.dart';
+
+class ParseException extends AppException {
+  const ParseException({
+    super.userMessage = 'Die Antwort des Servers konnte nicht gelesen werden.',
+    super.technicalDetails,
+  }) : super(allowRetry: true);
+}

lib/api/errors/server_exception.dart

@@ -0,0 +1,16 @@
+import 'app_exception.dart';
+
+class ServerException extends AppException {
+  final int statusCode;
+
+  ServerException({
+    required this.statusCode,
+    String? userMessage,
+    super.technicalDetails,
+  }) : super(
+         userMessage:
+             userMessage ??
+             'Der Server hat gerade Probleme (Status $statusCode). Bitte später erneut versuchen.',
+         allowRetry: true,
+       );
+}

lib/api/errors/talk_exception.dart

@@ -0,0 +1,36 @@
+import '../marianumcloud/talk/talk_error.dart';
+import 'app_exception.dart';
+
+class TalkException extends AppException {
+  final TalkError source;
+
+  TalkException(this.source)
+    : super(
+        userMessage: _mapMessage(source),
+        technicalDetails:
+            'Talk ${source.status} (${source.code}): ${source.message}',
+        allowRetry: source.code >= 500,
+      );
+
+  static String _mapMessage(TalkError e) {
+    switch (e.code) {
+      case 401:
+        return 'Bitte melde dich erneut an, um auf Talk zuzugreifen.';
+      case 403:
+        return 'Du hast keine Berechtigung für diese Talk-Aktion.';
+      case 404:
+        return 'Dieser Chat existiert nicht oder wurde entfernt.';
+      case 412:
+        return 'Diese Aktion ist im aktuellen Chat-Zustand nicht erlaubt.';
+      case 429:
+        return 'Zu viele Anfragen. Bitte kurz warten und erneut versuchen.';
+      default:
+        if (e.code >= 500) {
+          return 'Talk-Server hat gerade Probleme (${e.code}).';
+        }
+        return e.message.isNotEmpty
+            ? e.message
+            : 'Talk meldet einen Fehler (${e.code}).';
+    }
+  }
+}

lib/api/errors/webuntis_exception.dart

@@ -0,0 +1,31 @@
+import '../webuntis/webuntis_error.dart';
+import 'app_exception.dart';
+
+class WebuntisException extends AppException {
+  final WebuntisError source;
+
+  WebuntisException(this.source)
+    : super(
+        userMessage: _mapMessage(source),
+        technicalDetails: 'WebUntis (${source.code}): ${source.message}',
+        allowRetry: true,
+      );
+
+  static String _mapMessage(WebuntisError e) {
+    switch (e.code) {
+      case -8504:
+      case -8502:
+        return 'WebUntis-Anmeldung abgelaufen. Bitte erneut anmelden.';
+      case -8520:
+        return 'Bitte melde dich erneut an.';
+      case -7004:
+        return 'Für diesen Zeitraum sind keine Stundenplandaten verfügbar.';
+      case -32601:
+        return 'WebUntis kennt diese Anfrage nicht. Bitte App aktualisieren.';
+      default:
+        return e.message.isNotEmpty
+            ? 'WebUntis: ${e.message}'
+            : 'WebUntis konnte die Anfrage nicht bearbeiten (Code ${e.code}).';
+    }
+  }
+}

lib/api/holidays/getHolidays.dart

@@ -1,18 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import 'getHolidaysResponse.dart';
-
-class GetHolidays {
-  Future<GetHolidaysResponse> query() async {
-    String response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
-    return GetHolidaysResponse(
-        List<GetHolidaysResponseObject>.from(
-            jsonDecode(response).map<GetHolidaysResponseObject>(
-                    GetHolidaysResponseObject.fromJson
-            )
-        )
-    );
-  }
-}

lib/api/holidays/getHolidaysCache.dart

@@ -1,29 +0,0 @@
-import 'dart:convert';
-
-import '../requestCache.dart';
-import 'getHolidays.dart';
-import 'getHolidaysResponse.dart';
-
-class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
-  GetHolidaysCache({onUpdate, renew}) : super(RequestCache.cacheDay, onUpdate, renew: renew) {
-    start('MarianumMobile', 'state-holidays');
-  }
-
-  @override
-  GetHolidaysResponse onLocalData(String json) {
-    List<dynamic> parsedListJson = jsonDecode(json)['data'];
-    return GetHolidaysResponse(
-        List<GetHolidaysResponseObject>.from(
-            parsedListJson.map<GetHolidaysResponseObject>(
-                    // ignore: unnecessary_lambdas
-                    (dynamic i) => GetHolidaysResponseObject.fromJson(i)
-            )
-        )
-    );
-  }
-
-  @override
-  Future<GetHolidaysResponse> onLoad() {
-    return GetHolidays().query();
-  }
-}

lib/api/holidays/getHolidaysResponse.dart

@@ -1,38 +0,0 @@
-
-import 'package:json_annotation/json_annotation.dart';
-
-import '../apiResponse.dart';
-
-part 'getHolidaysResponse.g.dart';
-
-@JsonSerializable(explicitToJson: true)
-class GetHolidaysResponse extends ApiResponse {
-  List<GetHolidaysResponseObject> data;
-
-  GetHolidaysResponse(this.data);
-
-  factory GetHolidaysResponse.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseFromJson(json);
-  Map<String, dynamic> toJson() => _$GetHolidaysResponseToJson(this);
-}
-
-@JsonSerializable()
-class GetHolidaysResponseObject {
-  String start;
-  String end;
-  int year;
-  String stateCode;
-  String name;
-  String slug;
-
-  GetHolidaysResponseObject({
-    required this.start,
-    required this.end,
-    required this.year,
-    required this.stateCode,
-    required this.name,
-    required this.slug
-  });
-
-  factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
-  Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
-}

lib/api/holidays/getHolidaysResponse.g.dart

@@ -1,53 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getHolidaysResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
-    GetHolidaysResponse(
-      (json['data'] as List<dynamic>)
-          .map((e) =>
-              GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (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;
-}
-
-GetHolidaysResponseObject _$GetHolidaysResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    GetHolidaysResponseObject(
-      start: json['start'] as String,
-      end: json['end'] as String,
-      year: json['year'] as int,
-      stateCode: json['stateCode'] as String,
-      name: json['name'] as String,
-      slug: json['slug'] as String,
-    );
-
-Map<String, dynamic> _$GetHolidaysResponseObjectToJson(
-        GetHolidaysResponseObject instance) =>
-    <String, dynamic>{
-      'start': instance.start,
-      'end': instance.end,
-      'year': instance.year,
-      'stateCode': instance.stateCode,
-      'name': instance.name,
-      'slug': instance.slug,
-    };

lib/api/marianumcloud/autocomplete/autocompleteApi.dart

@@ -1,33 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../model/accountData.dart';
-import '../../../model/endpointData.dart';
-import 'autocompleteResponse.dart';
-
-class AutocompleteApi {
-  Future<AutocompleteResponse> find(String query) async {
-    Map<String, dynamic> getParameters = {
-      'search': query,
-      'itemType': ' ',
-      'itemId': ' ',
-      'shareTypes[]': ['0'],
-      'limit': '10',
-    };
-
-    Map<String, String> headers = {};
-    headers.putIfAbsent('Accept', () => 'application/json');
-    headers.putIfAbsent('OCS-APIRequest', () => 'true');
-
-    Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);
-
-    Response response = await http.get(endpoint, headers: headers);
-    if(response.statusCode != HttpStatus.ok) throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
-    String result = response.body;
-    return AutocompleteResponse.fromJson(jsonDecode(result)['ocs']);
-  }
-
-}

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

@@ -1,46 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'autocompleteResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-AutocompleteResponse _$AutocompleteResponseFromJson(
-        Map<String, dynamic> json) =>
-    AutocompleteResponse(
-      (json['data'] as List<dynamic>)
-          .map((e) =>
-              AutocompleteResponseObject.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$AutocompleteResponseToJson(
-        AutocompleteResponse instance) =>
-    <String, dynamic>{
-      'data': instance.data.map((e) => e.toJson()).toList(),
-    };
-
-AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    AutocompleteResponseObject(
-      json['id'] as String,
-      json['label'] as String,
-      json['icon'] as String?,
-      json['source'] as String?,
-      (json['status'] as List<dynamic>?)?.map((e) => e as String).toList(),
-      json['subline'] as String?,
-      json['shareWithDisplayNameUniqe'] as String?,
-    );
-
-Map<String, dynamic> _$AutocompleteResponseObjectToJson(
-        AutocompleteResponseObject instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'label': instance.label,
-      'icon': instance.icon,
-      'source': instance.source,
-      'status': instance.status,
-      'subline': instance.subline,
-      'shareWithDisplayNameUniqe': instance.shareWithDisplayNameUniqe,
-    };

lib/api/marianumcloud/autocomplete/autocomplete_api.dart

@@ -0,0 +1,32 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+
+import '../nextcloud_ocs.dart';
+import 'autocomplete_response.dart';
+
+class AutocompleteApi {
+  Future<AutocompleteResponse> find(String query) async {
+    final endpoint = NextcloudOcs.uri(
+      'core/autocomplete/get',
+      queryParameters: {
+        'search': query,
+        'itemType': ' ',
+        'itemId': ' ',
+        'shareTypes[]': ['0'],
+        'limit': '10',
+      },
+    );
+    final response = await http.get(endpoint, headers: NextcloudOcs.headers());
+    if (response.statusCode != HttpStatus.ok) {
+      throw Exception(
+        'Api call failed with ${response.statusCode}: ${response.body}',
+      );
+    }
+    final decoded = jsonDecode(response.body) as Map<String, dynamic>;
+    return AutocompleteResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+}

lib/api/marianumcloud/autocomplete/autocomplete_response.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'autocompleteResponse.g.dart';
+part 'autocomplete_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class AutocompleteResponse {
@@ -8,7 +8,8 @@ class AutocompleteResponse {
 
   AutocompleteResponse(this.data);
 
-  factory AutocompleteResponse.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseFromJson(json);
+  factory AutocompleteResponse.fromJson(Map<String, dynamic> json) =>
+      _$AutocompleteResponseFromJson(json);
   Map<String, dynamic> toJson() => _$AutocompleteResponseToJson(this);
 }
 
@@ -18,13 +19,21 @@ class AutocompleteResponseObject {
   String label;
   String? icon;
   String? source;
-  List<String>? status;
+  String? status;
   String? subline;
   String? shareWithDisplayNameUniqe;
 
-  AutocompleteResponseObject(this.id, this.label, this.icon, this.source, this.status,
+  AutocompleteResponseObject(
-      this.subline, this.shareWithDisplayNameUniqe);
+    this.id,
+    this.label,
+    this.icon,
+    this.source,
+    this.status,
+    this.subline,
+    this.shareWithDisplayNameUniqe,
+  );
 
-  factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseObjectFromJson(json);
+  factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$AutocompleteResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$AutocompleteResponseObjectToJson(this);
 }

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

@@ -0,0 +1,45 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'autocomplete_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+AutocompleteResponse _$AutocompleteResponseFromJson(
+  Map<String, dynamic> json,
+) => AutocompleteResponse(
+  (json['data'] as List<dynamic>)
+      .map(
+        (e) => AutocompleteResponseObject.fromJson(e as Map<String, dynamic>),
+      )
+      .toList(),
+);
+
+Map<String, dynamic> _$AutocompleteResponseToJson(
+  AutocompleteResponse instance,
+) => <String, dynamic>{'data': instance.data.map((e) => e.toJson()).toList()};
+
+AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
+  Map<String, dynamic> json,
+) => AutocompleteResponseObject(
+  json['id'] as String,
+  json['label'] as String,
+  json['icon'] as String?,
+  json['source'] as String?,
+  json['status'] as String?,
+  json['subline'] as String?,
+  json['shareWithDisplayNameUniqe'] as String?,
+);
+
+Map<String, dynamic> _$AutocompleteResponseObjectToJson(
+  AutocompleteResponseObject instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'label': instance.label,
+  'icon': instance.icon,
+  'source': instance.source,
+  'status': instance.status,
+  'subline': instance.subline,
+  'shareWithDisplayNameUniqe': instance.shareWithDisplayNameUniqe,
+};

lib/api/marianumcloud/files-sharing/fileSharingApi.dart

@@ -1,23 +0,0 @@
-import 'dart:io';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../model/accountData.dart';
-import '../../../model/endpointData.dart';
-import 'fileSharingApiParams.dart';
-
-class FileSharingApi {
-  Future<void> share(FileSharingApiParams query) async {
-    Map<String, String> headers = {};
-    headers.putIfAbsent('Accept', () => 'application/json');
-    headers.putIfAbsent('OCS-APIRequest', () => 'true');
-
-    Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/files_sharing/api/v1/shares', query.toJson().map((key, value) => MapEntry(key, value.toString())));
-    Response response = await http.post(endpoint, headers: headers);
-
-    if(response.statusCode != HttpStatus.ok) {
-      throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
-    }
-  }
-}

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

@@ -1,27 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'fileSharingApiParams.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-FileSharingApiParams _$FileSharingApiParamsFromJson(
-        Map<String, dynamic> json) =>
-    FileSharingApiParams(
-      shareType: json['shareType'] as int,
-      shareWith: json['shareWith'] as String,
-      path: json['path'] as String,
-      referenceId: json['referenceId'] as String?,
-      talkMetaData: json['talkMetaData'] as String?,
-    );
-
-Map<String, dynamic> _$FileSharingApiParamsToJson(
-        FileSharingApiParams instance) =>
-    <String, dynamic>{
-      'shareType': instance.shareType,
-      'shareWith': instance.shareWith,
-      'path': instance.path,
-      'referenceId': instance.referenceId,
-      'talkMetaData': instance.talkMetaData,
-    };

lib/api/marianumcloud/files_sharing/file_sharing_api.dart

@@ -0,0 +1,21 @@
+import 'dart:io';
+
+import 'package:http/http.dart' as http;
+
+import '../nextcloud_ocs.dart';
+import 'file_sharing_api_params.dart';
+
+class FileSharingApi {
+  Future<void> share(FileSharingApiParams query) async {
+    final endpoint = NextcloudOcs.uri(
+      'apps/files_sharing/api/v1/shares',
+      queryParameters: query.toJson(),
+    );
+    final response = await http.post(endpoint, headers: NextcloudOcs.headers());
+    if (response.statusCode != HttpStatus.ok) {
+      throw Exception(
+        'Api call failed with ${response.statusCode}: ${response.body}',
+      );
+    }
+  }
+}

lib/api/marianumcloud/files_sharing/file_sharing_api_params.dart

@@ -1,6 +1,6 @@
 import 'package:json_annotation/json_annotation.dart';
 
-part 'fileSharingApiParams.g.dart';
+part 'file_sharing_api_params.g.dart';
 
 @JsonSerializable()
 class FileSharingApiParams {
@@ -15,9 +15,10 @@ class FileSharingApiParams {
     required this.shareWith,
     required this.path,
     this.referenceId,
-    this.talkMetaData
+    this.talkMetaData,
   });
 
-  factory FileSharingApiParams.fromJson(Map<String, dynamic> json) => _$FileSharingApiParamsFromJson(json);
+  factory FileSharingApiParams.fromJson(Map<String, dynamic> json) =>
+      _$FileSharingApiParamsFromJson(json);
   Map<String, dynamic> toJson() => _$FileSharingApiParamsToJson(this);
 }

lib/api/marianumcloud/files_sharing/file_sharing_api_params.g.dart

@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'file_sharing_api_params.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+FileSharingApiParams _$FileSharingApiParamsFromJson(
+  Map<String, dynamic> json,
+) => FileSharingApiParams(
+  shareType: (json['shareType'] as num).toInt(),
+  shareWith: json['shareWith'] as String,
+  path: json['path'] as String,
+  referenceId: json['referenceId'] as String?,
+  talkMetaData: json['talkMetaData'] as String?,
+);
+
+Map<String, dynamic> _$FileSharingApiParamsToJson(
+  FileSharingApiParams instance,
+) => <String, dynamic>{
+  'shareType': instance.shareType,
+  'shareWith': instance.shareWith,
+  'path': instance.path,
+  'referenceId': instance.referenceId,
+  'talkMetaData': instance.talkMetaData,
+};

lib/api/marianumcloud/nextcloud_ocs.dart

@@ -0,0 +1,23 @@
+import '../../model/account_data.dart';
+import '../../model/endpoint_data.dart';
+
+/// Shared headers and URI builder for Nextcloud OCS v2 endpoints. Used by
+/// TalkApi, AutocompleteApi, FileSharingApi.
+class NextcloudOcs {
+  NextcloudOcs._();
+
+  static Map<String, String> headers() => {
+    'Accept': 'application/json',
+    'OCS-APIRequest': 'true',
+    'Authorization': AccountData().getBasicAuthHeader(),
+  };
+
+  static Uri uri(String pathSuffix, {Map<String, dynamic>? queryParameters}) {
+    final endpoint = EndpointData().nextcloud();
+    return Uri.https(
+      endpoint.domain,
+      '${endpoint.path}/ocs/v2.php/$pathSuffix',
+      queryParameters?.map((key, value) => MapEntry(key, value.toString())),
+    );
+  }
+}

lib/api/marianumcloud/talk/actions/talk_actions.dart

@@ -0,0 +1,64 @@
+import 'package:http/http.dart' as http;
+
+import '../../../api_params.dart';
+import '../../../api_response.dart';
+import '../talk_api.dart';
+
+/// Small POST/DELETE-only Talk endpoints that have no response payload.
+/// Each class extends [TalkApi] with `assemble` returning `null`. They share
+/// no state — they're collected here purely to avoid eight near-empty files.
+
+class SetFavorite extends TalkApi {
+  final String chatToken;
+  final bool favoriteState;
+
+  SetFavorite(this.chatToken, this.favoriteState)
+    : super('v4/room/$chatToken/favorite', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => favoriteState
+      ? http.post(uri, headers: headers)
+      : http.delete(uri, headers: headers);
+}
+
+class LeaveRoom extends TalkApi {
+  final String chatToken;
+
+  LeaveRoom(this.chatToken)
+    : super('v4/room/$chatToken/participants/self', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => http.delete(uri, headers: headers);
+}
+
+class DeleteMessage extends TalkApi {
+  final String chatToken;
+  final int messageId;
+
+  DeleteMessage(this.chatToken, this.messageId)
+    : super('v1/chat/$chatToken/$messageId', null);
+
+  @override
+  ApiResponse? assemble(String raw) => null;
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) => http.delete(uri, headers: headers);
+}

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

@@ -1,26 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-import 'getChatParams.dart';
-import 'getChatResponse.dart';
-
-class GetChat extends TalkApi<GetChatResponse> {
-  String chatToken;
-
-  GetChatParams params;
-  GetChat(this.chatToken, this.params) : super('v1/chat/$chatToken', null, getParameters: params.toJson());
-
-  @override
-  assemble(String raw) {
-    return GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
-  }
-
-  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
-    return http.get(uri, headers: headers);
-  }
-  
-}

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

@@ -1,32 +0,0 @@
-import 'dart:convert';
-
-import '../../../requestCache.dart';
-import 'getChat.dart';
-import 'getChatParams.dart';
-import 'getChatResponse.dart';
-
-class GetChatCache extends RequestCache<GetChatResponse> {
-  String chatToken;
-
-  GetChatCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('MarianumMobile', 'nc-chat-$chatToken');
-  }
-
-  @override
-  Future<GetChatResponse> onLoad() {
-    return GetChat(
-      chatToken,
-      GetChatParams(
-        lookIntoFuture: GetChatParamsSwitch.off,
-        setReadMarker: GetChatParamsSwitch.on,
-        limit: 200,
-      )
-    ).run();
-  }
-
-  @override
-  GetChatResponse onLocalData(String json) {
-    return GetChatResponse.fromJson(jsonDecode(json));
-  }
-
-}

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

@@ -1,48 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getChatParams.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-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?,
-      setReadMarker: $enumDecodeNullable(
-          _$GetChatParamsSwitchEnumMap, json['setReadMarker']),
-      includeLastKnown: $enumDecodeNullable(
-          _$GetChatParamsSwitchEnumMap, json['includeLastKnown']),
-    );
-
-Map<String, dynamic> _$GetChatParamsToJson(GetChatParams instance) {
-  final val = <String, dynamic>{
-    'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
-  };
-
-  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,
-};

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

@@ -1,119 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getChatResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetChatResponse _$GetChatResponseFromJson(Map<String, dynamic> json) =>
-    GetChatResponse(
-      (json['data'] as List<dynamic>)
-          .map((e) => GetChatResponseObject.fromJson(e as Map<String, dynamic>))
-          .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (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;
-}
-
-GetChatResponseObject _$GetChatResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    GetChatResponseObject(
-      json['id'] as int,
-      json['token'] as String,
-      $enumDecode(
-          _$GetRoomResponseObjectMessageActorTypeEnumMap, json['actorType']),
-      json['actorId'] as String,
-      json['actorDisplayName'] as String,
-      json['timestamp'] as int,
-      json['systemMessage'] as String,
-      $enumDecode(
-          _$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
-      json['isReplyable'] as bool,
-      json['referenceId'] as String,
-      json['message'] as String,
-      _fromJson(json['messageParameters']),
-      (json['reactions'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as int),
-      ),
-      (json['reactionsSelf'] as List<dynamic>?)
-          ?.map((e) => e as String)
-          .toList(),
-    );
-
-Map<String, dynamic> _$GetChatResponseObjectToJson(
-        GetChatResponseObject instance) =>
-    <String, dynamic>{
-      'id': instance.id,
-      'token': instance.token,
-      'actorType':
-          _$GetRoomResponseObjectMessageActorTypeEnumMap[instance.actorType]!,
-      'actorId': instance.actorId,
-      'actorDisplayName': instance.actorDisplayName,
-      'timestamp': instance.timestamp,
-      'systemMessage': instance.systemMessage,
-      'messageType':
-          _$GetRoomResponseObjectMessageTypeEnumMap[instance.messageType]!,
-      'isReplyable': instance.isReplyable,
-      'referenceId': instance.referenceId,
-      'message': instance.message,
-      'reactions': instance.reactions,
-      'reactionsSelf': instance.reactionsSelf,
-      'messageParameters':
-          instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
-    };
-
-const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
-  GetRoomResponseObjectMessageActorType.deletedUsers: 'deleted_users',
-  GetRoomResponseObjectMessageActorType.user: 'users',
-  GetRoomResponseObjectMessageActorType.guest: 'guests',
-  GetRoomResponseObjectMessageActorType.bot: 'bots',
-  GetRoomResponseObjectMessageActorType.bridge: 'bridged',
-};
-
-const _$GetRoomResponseObjectMessageTypeEnumMap = {
-  GetRoomResponseObjectMessageType.comment: 'comment',
-  GetRoomResponseObjectMessageType.deletedComment: 'comment_deleted',
-  GetRoomResponseObjectMessageType.system: 'system',
-  GetRoomResponseObjectMessageType.command: 'command',
-};
-
-RichObjectString _$RichObjectStringFromJson(Map<String, dynamic> json) =>
-    RichObjectString(
-      $enumDecode(_$RichObjectStringObjectTypeEnumMap, json['type']),
-      json['id'] as String,
-      json['name'] as String,
-      json['path'] as String?,
-      json['link'] as String?,
-    );
-
-Map<String, dynamic> _$RichObjectStringToJson(RichObjectString instance) =>
-    <String, dynamic>{
-      'type': _$RichObjectStringObjectTypeEnumMap[instance.type]!,
-      'id': instance.id,
-      'name': instance.name,
-      'path': instance.path,
-      'link': instance.link,
-    };
-
-const _$RichObjectStringObjectTypeEnumMap = {
-  RichObjectStringObjectType.user: 'user',
-  RichObjectStringObjectType.group: 'group',
-  RichObjectStringObjectType.file: 'file',
-  RichObjectStringObjectType.guest: 'guest',
-  RichObjectStringObjectType.highlight: 'highlight',
-  RichObjectStringObjectType.talkPoll: 'talk-poll',
-};

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

@@ -0,0 +1,29 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../talk_api.dart';
+import 'get_chat_params.dart';
+import 'get_chat_response.dart';
+
+class GetChat extends TalkApi<GetChatResponse> {
+  String chatToken;
+
+  GetChatParams params;
+  GetChat(this.chatToken, this.params)
+    : super('v1/chat/$chatToken', null, getParameters: params.toJson());
+
+  @override
+  GetChatResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetChatResponse.fromJson(decoded['ocs'] as Map<String, dynamic>);
+  }
+
+  @override
+  Future<Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

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

@@ -0,0 +1,26 @@
+import '../../../request_cache.dart';
+import 'get_chat.dart';
+import 'get_chat_params.dart';
+import 'get_chat_response.dart';
+
+class GetChatCache extends SimpleCache<GetChatResponse> {
+  GetChatCache({
+    super.onCacheData,
+    super.onNetworkData,
+    super.onError,
+    required String chatToken,
+  }) : super(
+         cacheTime: RequestCache.cacheNothing,
+         loader: () => GetChat(
+           chatToken,
+           GetChatParams(
+             lookIntoFuture: GetChatParamsSwitch.off,
+             setReadMarker: GetChatParamsSwitch.on,
+             limit: 200,
+           ),
+         ).run(),
+         fromJson: GetChatResponse.fromJson,
+       ) {
+    start('nc-chat-$chatToken');
+  }
+}

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

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'getChatParams.g.dart';
+part 'get_chat_params.g.dart';
 
 @JsonSerializable(explicitToJson: true, includeIfNull: false)
 class GetChatParams extends ApiParams {
@@ -15,20 +15,23 @@ class GetChatParams extends ApiParams {
   GetChatParamsSwitch? includeLastKnown;
 
   GetChatParams({
-      required this.lookIntoFuture,
+    required this.lookIntoFuture,
-      this.limit,
+    this.limit,
-      this.lastKnownMessageId,
+    this.lastKnownMessageId,
-      this.lastCommonReadId,
+    this.lastCommonReadId,
-      this.timeout,
+    this.timeout,
-      this.setReadMarker,
+    this.setReadMarker,
-      this.includeLastKnown
+    this.includeLastKnown,
   });
 
-  factory GetChatParams.fromJson(Map<String, dynamic> json) => _$GetChatParamsFromJson(json);
+  factory GetChatParams.fromJson(Map<String, dynamic> json) =>
+      _$GetChatParamsFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatParamsToJson(this);
 }
 
 enum GetChatParamsSwitch {
-  @JsonValue(1) on,
+  @JsonValue(1)
-  @JsonValue(0) off,
+  on,
+  @JsonValue(0)
+  off,
 }

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

@@ -0,0 +1,44 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'get_chat_params.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+GetChatParams _$GetChatParamsFromJson(Map<String, dynamic> json) =>
+    GetChatParams(
+      lookIntoFuture: $enumDecode(
+        _$GetChatParamsSwitchEnumMap,
+        json['lookIntoFuture'],
+      ),
+      limit: (json['limit'] as num?)?.toInt(),
+      lastKnownMessageId: (json['lastKnownMessageId'] as num?)?.toInt(),
+      lastCommonReadId: (json['lastCommonReadId'] as num?)?.toInt(),
+      timeout: (json['timeout'] as num?)?.toInt(),
+      setReadMarker: $enumDecodeNullable(
+        _$GetChatParamsSwitchEnumMap,
+        json['setReadMarker'],
+      ),
+      includeLastKnown: $enumDecodeNullable(
+        _$GetChatParamsSwitchEnumMap,
+        json['includeLastKnown'],
+      ),
+    );
+
+Map<String, dynamic> _$GetChatParamsToJson(
+  GetChatParams instance,
+) => <String, dynamic>{
+  'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
+  'limit': ?instance.limit,
+  'lastKnownMessageId': ?instance.lastKnownMessageId,
+  'lastCommonReadId': ?instance.lastCommonReadId,
+  'timeout': ?instance.timeout,
+  'setReadMarker': ?_$GetChatParamsSwitchEnumMap[instance.setReadMarker],
+  'includeLastKnown': ?_$GetChatParamsSwitchEnumMap[instance.includeLastKnown],
+};
+
+const _$GetChatParamsSwitchEnumMap = {
+  GetChatParamsSwitch.on: 1,
+  GetChatParamsSwitch.off: 0,
+};

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

@@ -1,10 +1,10 @@
-import 'package:jiffy/jiffy.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
+import '../../../../extensions/date_time.dart';
-import '../room/getRoomResponse.dart';
+import '../../../api_response.dart';
+import '../room/get_room_response.dart';
 
-part 'getChatResponse.g.dart';
+part 'get_chat_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetChatResponse extends ApiResponse {
@@ -12,11 +12,12 @@ class GetChatResponse extends ApiResponse {
 
   GetChatResponse(this.data);
 
-  factory GetChatResponse.fromJson(Map<String, dynamic> json) => _$GetChatResponseFromJson(json);
+  factory GetChatResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetChatResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatResponseToJson(this);
 
   List<GetChatResponseObject> sortByTimestamp() {
-    List<GetChatResponseObject> sorted = data.toList();
+    var sorted = data.toList();
     sorted.sort((a, b) => a.timestamp.compareTo(b.timestamp));
     return sorted;
   }
@@ -37,35 +38,39 @@ class GetChatResponseObject {
   String message;
   Map<String, int>? reactions;
   List<String>? reactionsSelf;
-  @JsonKey(fromJson: _fromJson) Map<String, RichObjectString>? messageParameters;
+  @JsonKey(fromJson: _fromJson)
+  Map<String, RichObjectString>? messageParameters;
+  GetChatResponseObject? parent;
 
   GetChatResponseObject(
-      this.id,
+    this.id,
-      this.token,
+    this.token,
-      this.actorType,
+    this.actorType,
-      this.actorId,
+    this.actorId,
-      this.actorDisplayName,
+    this.actorDisplayName,
-      this.timestamp,
+    this.timestamp,
-      this.systemMessage,
+    this.systemMessage,
-      this.messageType,
+    this.messageType,
-      this.isReplyable,
+    this.isReplyable,
-      this.referenceId,
+    this.referenceId,
-      this.message,
+    this.message,
-      this.messageParameters,
+    this.messageParameters,
-      this.reactions,
+    this.reactions,
-      this.reactionsSelf
+    this.reactionsSelf,
+    this.parent,
   );
 
-  factory GetChatResponseObject.fromJson(Map<String, dynamic> json) => _$GetChatResponseObjectFromJson(json);
+  factory GetChatResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetChatResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetChatResponseObjectToJson(this);
 
   static GetChatResponseObject getDateDummy(int timestamp) {
-    DateTime elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
+    var elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
-    return getTextDummy(Jiffy.parseFromDateTime(elementDate).format(pattern: 'dd.MM.yyyy'));
+    return getTextDummy(elementDate.formatDate());
   }
 
-  static GetChatResponseObject getTextDummy(String text) {
+  static GetChatResponseObject getTextDummy(String text) =>
-    return GetChatResponseObject(
+      GetChatResponseObject(
         0,
         '',
         GetRoomResponseObjectMessageActorType.user,
@@ -79,17 +84,19 @@ class GetChatResponseObject {
         text,
         null,
         null,
-        null
+        null,
-    );
+        null,
-  }
+      );
-
 }
 
-Map<String, RichObjectString>? _fromJson(json) {
+Map<String, RichObjectString>? _fromJson(dynamic json) {
-  if(json is Map<String, dynamic>) {
+  if (json is Map<String, dynamic>) {
-    Map<String, RichObjectString> data = {};
+    final data = <String, RichObjectString>{};
-    for (var element in json.keys) {
+    for (final element in json.keys) {
-      data.putIfAbsent(element, () => RichObjectString.fromJson(json[element]));
+      data.putIfAbsent(
+        element,
+        () => RichObjectString.fromJson(json[element] as Map<String, dynamic>),
+      );
     }
     return data;
   }
@@ -108,15 +115,26 @@ class RichObjectString {
 
   RichObjectString(this.type, this.id, this.name, this.path, this.link);
 
-  factory RichObjectString.fromJson(Map<String, dynamic> json) => _$RichObjectStringFromJson(json);
+  factory RichObjectString.fromJson(Map<String, dynamic> json) =>
+      _$RichObjectStringFromJson(json);
   Map<String, dynamic> toJson() => _$RichObjectStringToJson(this);
 }
 
 enum RichObjectStringObjectType {
-  @JsonValue('user') user,
+  @JsonValue('user')
-  @JsonValue('group') group,
+  user,
-  @JsonValue('file') file,
+  @JsonValue('group')
-  @JsonValue('guest') guest,
+  group,
-  @JsonValue('highlight') highlight,
+  @JsonValue('file')
-  @JsonValue('talk-poll') talkPoll,
+  file,
+  @JsonValue('guest')
+  guest,
+  @JsonValue('highlight')
+  highlight,
+  @JsonValue('talk-poll')
+  talkPoll,
+  @JsonValue('geo-location')
+  geoLocation,
+  @JsonValue('call')
+  call,
 }

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

@@ -0,0 +1,121 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'get_chat_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+GetChatResponse _$GetChatResponseFromJson(Map<String, dynamic> json) =>
+    GetChatResponse(
+        (json['data'] as List<dynamic>)
+            .map(
+              (e) => GetChatResponseObject.fromJson(e as Map<String, dynamic>),
+            )
+            .toSet(),
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      );
+
+Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) =>
+    <String, dynamic>{
+      'headers': ?instance.headers,
+      'data': instance.data.map((e) => e.toJson()).toList(),
+    };
+
+GetChatResponseObject _$GetChatResponseObjectFromJson(
+  Map<String, dynamic> json,
+) => GetChatResponseObject(
+  (json['id'] as num).toInt(),
+  json['token'] as String,
+  $enumDecode(
+    _$GetRoomResponseObjectMessageActorTypeEnumMap,
+    json['actorType'],
+  ),
+  json['actorId'] as String,
+  json['actorDisplayName'] as String,
+  (json['timestamp'] as num).toInt(),
+  json['systemMessage'] as String,
+  $enumDecode(_$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
+  json['isReplyable'] as bool,
+  json['referenceId'] as String,
+  json['message'] as String,
+  _fromJson(json['messageParameters']),
+  (json['reactions'] as Map<String, dynamic>?)?.map(
+    (k, e) => MapEntry(k, (e as num).toInt()),
+  ),
+  (json['reactionsSelf'] as List<dynamic>?)?.map((e) => e as String).toList(),
+  json['parent'] == null
+      ? null
+      : GetChatResponseObject.fromJson(json['parent'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$GetChatResponseObjectToJson(
+  GetChatResponseObject instance,
+) => <String, dynamic>{
+  'id': instance.id,
+  'token': instance.token,
+  'actorType':
+      _$GetRoomResponseObjectMessageActorTypeEnumMap[instance.actorType]!,
+  'actorId': instance.actorId,
+  'actorDisplayName': instance.actorDisplayName,
+  'timestamp': instance.timestamp,
+  'systemMessage': instance.systemMessage,
+  'messageType':
+      _$GetRoomResponseObjectMessageTypeEnumMap[instance.messageType]!,
+  'isReplyable': instance.isReplyable,
+  'referenceId': instance.referenceId,
+  'message': instance.message,
+  'reactions': instance.reactions,
+  'reactionsSelf': instance.reactionsSelf,
+  'messageParameters': instance.messageParameters?.map(
+    (k, e) => MapEntry(k, e.toJson()),
+  ),
+  'parent': instance.parent?.toJson(),
+};
+
+const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
+  GetRoomResponseObjectMessageActorType.deletedUsers: 'deleted_users',
+  GetRoomResponseObjectMessageActorType.user: 'users',
+  GetRoomResponseObjectMessageActorType.guest: 'guests',
+  GetRoomResponseObjectMessageActorType.bot: 'bots',
+  GetRoomResponseObjectMessageActorType.bridge: 'bridged',
+};
+
+const _$GetRoomResponseObjectMessageTypeEnumMap = {
+  GetRoomResponseObjectMessageType.comment: 'comment',
+  GetRoomResponseObjectMessageType.voiceMessage: 'voice-message',
+  GetRoomResponseObjectMessageType.deletedComment: 'comment_deleted',
+  GetRoomResponseObjectMessageType.system: 'system',
+  GetRoomResponseObjectMessageType.command: 'command',
+};
+
+RichObjectString _$RichObjectStringFromJson(Map<String, dynamic> json) =>
+    RichObjectString(
+      $enumDecode(_$RichObjectStringObjectTypeEnumMap, json['type']),
+      json['id'] as String,
+      json['name'] as String,
+      json['path'] as String?,
+      json['link'] as String?,
+    );
+
+Map<String, dynamic> _$RichObjectStringToJson(RichObjectString instance) =>
+    <String, dynamic>{
+      'type': _$RichObjectStringObjectTypeEnumMap[instance.type]!,
+      'id': instance.id,
+      'name': instance.name,
+      'path': instance.path,
+      'link': instance.link,
+    };
+
+const _$RichObjectStringObjectTypeEnumMap = {
+  RichObjectStringObjectType.user: 'user',
+  RichObjectStringObjectType.group: 'group',
+  RichObjectStringObjectType.file: 'file',
+  RichObjectStringObjectType.guest: 'guest',
+  RichObjectStringObjectType.highlight: 'highlight',
+  RichObjectStringObjectType.talkPoll: 'talk-poll',
+  RichObjectStringObjectType.geoLocation: 'geo-location',
+  RichObjectStringObjectType.call: 'call',
+};

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

@@ -1,14 +0,0 @@
-
-import 'getChatResponse.dart';
-
-class RichObjectStringProcessor {
-  static String parseToString(String message, Map<String, RichObjectString>? data) {
-    if(data == null) return message;
-
-    data.forEach((key, value) {
-      message = message.replaceAll(RegExp('{$key}'), value.name);
-    });
-
-    return message;
-  }
-}

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

@@ -0,0 +1,16 @@
+import 'get_chat_response.dart';
+
+class RichObjectStringProcessor {
+  static String parseToString(
+    String message,
+    Map<String, RichObjectString>? data,
+  ) {
+    if (data == null) return message;
+
+    data.forEach((key, value) {
+      message = message.replaceAll(RegExp('{$key}'), value.name);
+    });
+
+    return message;
+  }
+}

lib/api/marianumcloud/talk/createRoom/createRoom.dart

@@ -1,25 +0,0 @@
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../talkApi.dart';
-import 'createRoomParams.dart';
-class CreateRoom extends TalkApi {
-  CreateRoomParams params;
-
-  CreateRoom(this.params) : super('v4/room', params);
-
-  @override
-  assemble(String raw) {
-    return null;
-  }
-
-  @override
-  Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
-    if(body is CreateRoomParams) {
-      return http.post(uri, headers: headers, body: body.toJson().map((key, value) => MapEntry(key, value.toString())));
-    }
-
-    return null;
-  }
-}

lib/api/marianumcloud/talk/create_room/create_room.dart

@@ -0,0 +1,33 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../talk_api.dart';
+import 'create_room_params.dart';
+
+class CreateRoom extends TalkApi {
+  CreateRoomParams params;
+
+  CreateRoom(this.params) : super('v4/room', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is CreateRoomParams) {
+      return http.post(
+        uri,
+        headers: headers,
+        body: body.toJson().map(
+          (key, value) => MapEntry(key, value.toString()),
+        ),
+      );
+    }
+
+    return null;
+  }
+}

lib/api/marianumcloud/talk/create_room/create_room_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'createRoomParams.g.dart';
+part 'create_room_params.g.dart';
 
 @JsonSerializable()
 class CreateRoomParams extends ApiParams {
@@ -19,9 +19,10 @@ class CreateRoomParams extends ApiParams {
     this.source,
     this.roomName,
     this.objectType,
-    this.objectId
+    this.objectId,
   });
 
-  factory CreateRoomParams.fromJson(Map<String, dynamic> json) => _$CreateRoomParamsFromJson(json);
+  factory CreateRoomParams.fromJson(Map<String, dynamic> json) =>
+      _$CreateRoomParamsFromJson(json);
   Map<String, dynamic> toJson() => _$CreateRoomParamsToJson(this);
 }

lib/api/marianumcloud/talk/create_room/create_room_params.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'createRoomParams.dart';
+part of 'create_room_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
@@ -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?,

lib/api/marianumcloud/talk/deleteMessage/deleteMessage.dart

@@ -1,22 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-
-class DeleteMessage extends TalkApi {
-  String chatToken;
-  int messageId;
-  DeleteMessage(this.chatToken, this.messageId) : super('v1/chat/$chatToken/$messageId', null);
-
-  @override
-  assemble(String raw) {
-    return null;
-  }
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    return http.delete(uri, headers: headers);
-  }
-
-}

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

@@ -1,26 +0,0 @@
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'deleteReactMessageParams.dart';
-
-class DeleteReactMessage extends TalkApi {
-  String chatToken;
-  int messageId;
-  DeleteReactMessage({required this.chatToken, required this.messageId, required DeleteReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);
-
-  @override
-  assemble(String raw) {
-    return null;
-  }
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    if(body is DeleteReactMessageParams) {
-      return http.delete(uri, headers: headers, body: body.toJson());
-    }
-    return null;
-  }
-
-}

lib/api/marianumcloud/talk/delete_react_message/delete_react_message.dart

@@ -0,0 +1,31 @@
+import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
+
+import '../../../api_params.dart';
+import '../talk_api.dart';
+import 'delete_react_message_params.dart';
+
+class DeleteReactMessage extends TalkApi {
+  String chatToken;
+  int messageId;
+  DeleteReactMessage({
+    required this.chatToken,
+    required this.messageId,
+    required DeleteReactMessageParams params,
+  }) : super('v1/reaction/$chatToken/$messageId', params);
+
+  @override
+  Null assemble(String raw) => null;
+
+  @override
+  Future<Response>? request(
+    Uri uri,
+    ApiParams? body,
+    Map<String, String>? headers,
+  ) {
+    if (body is DeleteReactMessageParams) {
+      return http.delete(uri, headers: headers, body: body.toJson());
+    }
+    return null;
+  }
+}

lib/api/marianumcloud/talk/delete_react_message/delete_react_message_params.dart

@@ -1,8 +1,8 @@
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiParams.dart';
+import '../../../api_params.dart';
 
-part 'deleteReactMessageParams.g.dart';
+part 'delete_react_message_params.g.dart';
 
 @JsonSerializable()
 class DeleteReactMessageParams extends ApiParams {
@@ -10,6 +10,7 @@ class DeleteReactMessageParams extends ApiParams {
 
   DeleteReactMessageParams(this.reaction);
 
-  factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) => _$DeleteReactMessageParamsFromJson(json);
+  factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) =>
+      _$DeleteReactMessageParamsFromJson(json);
   Map<String, dynamic> toJson() => _$DeleteReactMessageParamsToJson(this);
 }

lib/api/marianumcloud/talk/delete_react_message/delete_react_message_params.g.dart

@@ -1,19 +1,15 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'deleteReactMessageParams.dart';
+part of 'delete_react_message_params.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
 DeleteReactMessageParams _$DeleteReactMessageParamsFromJson(
-        Map<String, dynamic> json) =>
+  Map<String, dynamic> json,
-    DeleteReactMessageParams(
+) => DeleteReactMessageParams(json['reaction'] as String);
-      json['reaction'] as String,
-    );
 
 Map<String, dynamic> _$DeleteReactMessageParamsToJson(
-        DeleteReactMessageParams instance) =>
+  DeleteReactMessageParams instance,
-    <String, dynamic>{
+) => <String, dynamic>{'reaction': instance.reaction};
-      'reaction': instance.reaction,
-    };

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

@@ -1,22 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-
-import '../talkApi.dart';
-import 'getParticipantsResponse.dart';
-
-class GetParticipants extends TalkApi<GetParticipantsResponse> {
-  String token;
-  GetParticipants(this.token) : super('v4/room/$token/participants', null);
-
-  @override
-  GetParticipantsResponse assemble(String raw) {
-    return GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
-  }
-
-  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) {
-    return http.get(uri, headers: headers);
-  }
-
-}

lib/api/marianumcloud/talk/getParticipants/getParticipantsCache.dart

@@ -1,26 +0,0 @@
-import 'dart:convert';
-
-import '../../../requestCache.dart';
-import 'getParticipants.dart';
-import 'getParticipantsResponse.dart';
-
-class GetParticipantsCache extends RequestCache<GetParticipantsResponse> {
-  String chatToken;
-
-  GetParticipantsCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('MarianumMobile', 'nc-chat-participants-$chatToken');
-  }
-
-  @override
-  Future<GetParticipantsResponse> onLoad() {
-    return GetParticipants(
-        chatToken,
-    ).run();
-  }
-
-  @override
-  GetParticipantsResponse onLocalData(String json) {
-    return GetParticipantsResponse.fromJson(jsonDecode(json));
-  }
-
-}

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

@@ -1,94 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getParticipantsResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetParticipantsResponse _$GetParticipantsResponseFromJson(
-        Map<String, dynamic> json) =>
-    GetParticipantsResponse(
-      (json['data'] as List<dynamic>)
-          .map((e) =>
-              GetParticipantsResponseObject.fromJson(e as Map<String, dynamic>))
-          .toSet(),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      );
-
-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;
-}
-
-GetParticipantsResponseObject _$GetParticipantsResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    GetParticipantsResponseObject(
-      json['attendeeId'] as int,
-      json['actorType'] as String,
-      json['actorId'] as String,
-      json['displayName'] as String,
-      $enumDecode(_$GetParticipantsResponseObjectParticipantTypeEnumMap,
-          json['participantType']),
-      json['lastPing'] as int,
-      $enumDecode(_$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
-          json['inCall']),
-      json['permissions'] as int,
-      json['attendeePermissions'] as int,
-      json['sessionId'] as String?,
-      (json['sessionIds'] as List<dynamic>).map((e) => e as String).toList(),
-      json['status'] as String?,
-      json['statusIcon'] as String?,
-      json['statusMessage'] as String?,
-      json['roomToken'] as String?,
-    );
-
-Map<String, dynamic> _$GetParticipantsResponseObjectToJson(
-        GetParticipantsResponseObject instance) =>
-    <String, dynamic>{
-      'attendeeId': instance.attendeeId,
-      'actorType': instance.actorType,
-      'actorId': instance.actorId,
-      'displayName': instance.displayName,
-      'participantType': _$GetParticipantsResponseObjectParticipantTypeEnumMap[
-          instance.participantType]!,
-      'lastPing': instance.lastPing,
-      'inCall': _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap[
-          instance.inCall]!,
-      'permissions': instance.permissions,
-      'attendeePermissions': instance.attendeePermissions,
-      'sessionId': instance.sessionId,
-      'sessionIds': instance.sessionIds,
-      'status': instance.status,
-      'statusIcon': instance.statusIcon,
-      'statusMessage': instance.statusMessage,
-      'roomToken': instance.roomToken,
-    };
-
-const _$GetParticipantsResponseObjectParticipantTypeEnumMap = {
-  GetParticipantsResponseObjectParticipantType.owner: 1,
-  GetParticipantsResponseObjectParticipantType.moderator: 2,
-  GetParticipantsResponseObjectParticipantType.user: 3,
-  GetParticipantsResponseObjectParticipantType.guest: 4,
-  GetParticipantsResponseObjectParticipantType.userFollowingPublicLink: 5,
-  GetParticipantsResponseObjectParticipantType.guestWithModeratorPermissions: 6,
-};
-
-const _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap = {
-  GetParticipantsResponseObjectParticipantsInCallFlags.disconnected: 0,
-  GetParticipantsResponseObjectParticipantsInCallFlags.inCall: 1,
-  GetParticipantsResponseObjectParticipantsInCallFlags.providesAudio: 2,
-  GetParticipantsResponseObjectParticipantsInCallFlags.providesVideo: 3,
-  GetParticipantsResponseObjectParticipantsInCallFlags.usesSipDialIn: 4,
-};

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

@@ -1,25 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-
-import '../../../apiParams.dart';
-import '../talkApi.dart';
-import 'getReactionsResponse.dart';
-
-class GetReactions extends TalkApi<GetReactionsResponse> {
-  String chatToken;
-  int messageId;
-  GetReactions({required this.chatToken, required this.messageId}) : super('v1/reaction/$chatToken/$messageId', null);
-
-  @override
-  assemble(String raw) {
-    return GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
-  }
-
-  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
-    return http.get(uri, headers: headers);
-  }
-
-}

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

@@ -1,63 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'getReactionsResponse.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-GetReactionsResponse _$GetReactionsResponseFromJson(
-        Map<String, dynamic> json) =>
-    GetReactionsResponse(
-      (json['data'] as Map<String, dynamic>).map(
-        (k, e) => MapEntry(
-            k,
-            (e as List<dynamic>)
-                .map((e) => GetReactionsResponseObject.fromJson(
-                    e as Map<String, dynamic>))
-                .toList()),
-      ),
-    )..headers = (json['headers'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, e as String),
-      );
-
-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;
-}
-
-GetReactionsResponseObject _$GetReactionsResponseObjectFromJson(
-        Map<String, dynamic> json) =>
-    GetReactionsResponseObject(
-      $enumDecode(
-          _$GetReactionsResponseObjectActorTypeEnumMap, json['actorType']),
-      json['actorId'] as String,
-      json['actorDisplayName'] as String,
-      json['timestamp'] as int,
-    );
-
-Map<String, dynamic> _$GetReactionsResponseObjectToJson(
-        GetReactionsResponseObject instance) =>
-    <String, dynamic>{
-      'actorType':
-          _$GetReactionsResponseObjectActorTypeEnumMap[instance.actorType]!,
-      'actorId': instance.actorId,
-      'actorDisplayName': instance.actorDisplayName,
-      'timestamp': instance.timestamp,
-    };
-
-const _$GetReactionsResponseObjectActorTypeEnumMap = {
-  GetReactionsResponseObjectActorType.guests: 'guests',
-  GetReactionsResponseObjectActorType.users: 'users',
-};

lib/api/marianumcloud/talk/get_participants/get_participants.dart

@@ -0,0 +1,26 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import '../talk_api.dart';
+import 'get_participants_response.dart';
+
+class GetParticipants extends TalkApi<GetParticipantsResponse> {
+  String token;
+  GetParticipants(this.token) : super('v4/room/$token/participants', null);
+
+  @override
+  GetParticipantsResponse assemble(String raw) {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return GetParticipantsResponse.fromJson(
+      decoded['ocs'] as Map<String, dynamic>,
+    );
+  }
+
+  @override
+  Future<http.Response> request(
+    Uri uri,
+    Object? body,
+    Map<String, String>? headers,
+  ) => http.get(uri, headers: headers);
+}

lib/api/marianumcloud/talk/get_participants/get_participants_cache.dart

@@ -0,0 +1,17 @@
+import '../../../request_cache.dart';
+import 'get_participants.dart';
+import 'get_participants_response.dart';
+
+class GetParticipantsCache extends SimpleCache<GetParticipantsResponse> {
+  GetParticipantsCache({
+    required void Function(GetParticipantsResponse) onUpdate,
+    required String chatToken,
+  }) : super(
+         cacheTime: RequestCache.cacheNothing,
+         loader: () => GetParticipants(chatToken).run(),
+         fromJson: GetParticipantsResponse.fromJson,
+         onUpdate: onUpdate,
+       ) {
+    start('nc-chat-participants-$chatToken');
+  }
+}

lib/api/marianumcloud/talk/get_participants/get_participants_response.dart

@@ -1,9 +1,8 @@
-
 import 'package:json_annotation/json_annotation.dart';
 
-import '../../../apiResponse.dart';
+import '../../../api_response.dart';
 
-part 'getParticipantsResponse.g.dart';
+part 'get_participants_response.g.dart';
 
 @JsonSerializable(explicitToJson: true)
 class GetParticipantsResponse extends ApiResponse {
@@ -11,7 +10,8 @@ class GetParticipantsResponse extends ApiResponse {
 
   GetParticipantsResponse(this.data);
 
-  factory GetParticipantsResponse.fromJson(Map<String, dynamic> json) => _$GetParticipantsResponseFromJson(json);
+  factory GetParticipantsResponse.fromJson(Map<String, dynamic> json) =>
+      _$GetParticipantsResponseFromJson(json);
   Map<String, dynamic> toJson() => _$GetParticipantsResponseToJson(this);
 }
 
@@ -34,39 +34,55 @@ class GetParticipantsResponseObject {
   String? roomToken;
 
   GetParticipantsResponseObject(
-      this.attendeeId,
+    this.attendeeId,
-      this.actorType,
+    this.actorType,
-      this.actorId,
+    this.actorId,
-      this.displayName,
+    this.displayName,
-      this.participantType,
+    this.participantType,
-      this.lastPing,
+    this.lastPing,
-      this.inCall,
+    this.inCall,
-      this.permissions,
+    this.permissions,
-      this.attendeePermissions,
+    this.attendeePermissions,
-      this.sessionId,
+    this.sessionId,
-      this.sessionIds,
+    this.sessionIds,
-      this.status,
+    this.status,
-      this.statusIcon,
+    this.statusIcon,
-      this.statusMessage,
+    this.statusMessage,
-      this.roomToken);
+    this.roomToken,
+  );
 
-  factory GetParticipantsResponseObject.fromJson(Map<String, dynamic> json) => _$GetParticipantsResponseObjectFromJson(json);
+  factory GetParticipantsResponseObject.fromJson(Map<String, dynamic> json) =>
+      _$GetParticipantsResponseObjectFromJson(json);
   Map<String, dynamic> toJson() => _$GetParticipantsResponseObjectToJson(this);
 }
 
 enum GetParticipantsResponseObjectParticipantType {
-  @JsonValue(1) owner,
+  @JsonValue(1)
-  @JsonValue(2) moderator,
+  owner('Besitzer'),
-  @JsonValue(3) user,
+  @JsonValue(2)
-  @JsonValue(4) guest,
+  moderator('Moderator'),
-  @JsonValue(5) userFollowingPublicLink,
+  @JsonValue(3)
-  @JsonValue(6) guestWithModeratorPermissions
+  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 {
-  @JsonValue(0) disconnected,
+  @JsonValue(0)
-  @JsonValue(1) inCall,
+  disconnected,
-  @JsonValue(2) providesAudio,
+  @JsonValue(1)
-  @JsonValue(3) providesVideo,
+  inCall,
-  @JsonValue(4) usesSipDialIn
+  @JsonValue(2)
+  providesAudio,
+  @JsonValue(3)
+  providesVideo,
+  @JsonValue(4)
+  usesSipDialIn,
 }

lib/api/marianumcloud/talk/get_participants/get_participants_response.g.dart

@@ -0,0 +1,97 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'get_participants_response.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+GetParticipantsResponse _$GetParticipantsResponseFromJson(
+  Map<String, dynamic> json,
+) =>
+    GetParticipantsResponse(
+        (json['data'] as List<dynamic>)
+            .map(
+              (e) => GetParticipantsResponseObject.fromJson(
+                e as Map<String, dynamic>,
+              ),
+            )
+            .toSet(),
+      )
+      ..headers = (json['headers'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      );
+
+Map<String, dynamic> _$GetParticipantsResponseToJson(
+  GetParticipantsResponse instance,
+) => <String, dynamic>{
+  'headers': ?instance.headers,
+  'data': instance.data.map((e) => e.toJson()).toList(),
+};
+
+GetParticipantsResponseObject _$GetParticipantsResponseObjectFromJson(
+  Map<String, dynamic> json,
+) => GetParticipantsResponseObject(
+  (json['attendeeId'] as num).toInt(),
+  json['actorType'] as String,
+  json['actorId'] as String,
+  json['displayName'] as String,
+  $enumDecode(
+    _$GetParticipantsResponseObjectParticipantTypeEnumMap,
+    json['participantType'],
+  ),
+  (json['lastPing'] as num).toInt(),
+  $enumDecode(
+    _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
+    json['inCall'],
+  ),
+  (json['permissions'] as num).toInt(),
+  (json['attendeePermissions'] as num).toInt(),
+  json['sessionId'] as String?,
+  (json['sessionIds'] as List<dynamic>).map((e) => e as String).toList(),
+  json['status'] as String?,
+  json['statusIcon'] as String?,
+  json['statusMessage'] as String?,
+  json['roomToken'] as String?,
+);
+
+Map<String, dynamic> _$GetParticipantsResponseObjectToJson(
+  GetParticipantsResponseObject instance,
+) => <String, dynamic>{
+  'attendeeId': instance.attendeeId,
+  'actorType': instance.actorType,
+  'actorId': instance.actorId,
+  'displayName': instance.displayName,
+  'participantType':
+      _$GetParticipantsResponseObjectParticipantTypeEnumMap[instance
+          .participantType]!,
+  'lastPing': instance.lastPing,
+  'inCall':
+      _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap[instance
+          .inCall]!,
+  'permissions': instance.permissions,
+  'attendeePermissions': instance.attendeePermissions,
+  'sessionId': instance.sessionId,
+  'sessionIds': instance.sessionIds,
+  'status': instance.status,
+  'statusIcon': instance.statusIcon,
+  'statusMessage': instance.statusMessage,
+  'roomToken': instance.roomToken,
+};
+
+const _$GetParticipantsResponseObjectParticipantTypeEnumMap = {
+  GetParticipantsResponseObjectParticipantType.owner: 1,
+  GetParticipantsResponseObjectParticipantType.moderator: 2,
+  GetParticipantsResponseObjectParticipantType.user: 3,
+  GetParticipantsResponseObjectParticipantType.guest: 4,
+  GetParticipantsResponseObjectParticipantType.userFollowingPublicLink: 5,
+  GetParticipantsResponseObjectParticipantType.guestWithModeratorPermissions: 6,
+};
+
+const _$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap = {
+  GetParticipantsResponseObjectParticipantsInCallFlags.disconnected: 0,
+  GetParticipantsResponseObjectParticipantsInCallFlags.inCall: 1,
+  GetParticipantsResponseObjectParticipantsInCallFlags.providesAudio: 2,
+  GetParticipantsResponseObjectParticipantsInCallFlags.providesVideo: 3,
+  GetParticipantsResponseObjectParticipantsInCallFlags.usesSipDialIn: 4,
+};