added notes for next tasks

wip
updated new linter rules
2024-03-30 18:33:52 +01:00 · 2024-03-29 21:58:51 +01:00 · 2024-03-29 18:47:54 +01:00 · 2024-03-29 18:32:59 +01:00 · 2024-03-29 17:29:31 +01:00 · 2024-03-24 14:21:01 +01:00
354 changed files with 3633 additions and 7182 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -48,14 +48,14 @@ lib/generated_plugin_registrant.dart
 #pubspec.lock

 # Android related
-materials/screenshots/android/**/gradle-wrapper.jar
-materials/screenshots/android/.gradle
-materials/screenshots/android/captures/
-materials/screenshots/android/gradlew
-materials/screenshots/android/gradlew.bat
-materials/screenshots/android/key.properties
-materials/screenshots/android/local.properties
-materials/screenshots/android/**/GeneratedPluginRegistrant.java
+**/android/**/gradle-wrapper.jar
+**/android/.gradle
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/key.properties
+**/android/local.properties
+**/android/**/GeneratedPluginRegistrant.java

 # iOS/XCode related
 **/ios/**/*.mode1v3
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -9,10 +9,6 @@
 # packages, and plugins designed to encourage good coding practices.
 include: package:flutter_lints/flutter.yaml

-analyzer:
-  errors:
-    invalid_annotation_target: ignore
-
 linter:
  # The lint rules applied to this project can be customized in the
  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -32,13 +28,6 @@ linter:
    prefer_relative_imports: true
    unnecessary_lambdas: true
    prefer_single_quotes: true
-    prefer_if_elements_to_conditional_expressions: true
-    prefer_expression_function_bodies: true
-    omit_local_variable_types: true
-    eol_at_end_of_file: true
-    cast_nullable_to_non_nullable: true
-    avoid_void_async: true
-    avoid_multiple_declarations_per_line: true

 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,16 +25,15 @@ if (flutterVersionName == null) {
 android {
    namespace "eu.mhsl.marianum.mobile.client"
    compileSdk flutter.compileSdkVersion
-    ndkVersion "27.0.12077973"
+    ndkVersion flutter.ndkVersion

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

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

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

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

 flutter {
@@ -67,6 +66,5 @@ flutter {
 }

 dependencies {
-    implementation 'com.android.support:multidex:2.0.1'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+    implementation 'com.android.support:multidex:1.0.3'
 }
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,73 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
->
-
-    <!--
-     Required to query activities that can process text, see:
-         https://developer.android.com/training/package-visibility?hl=en and
-         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
-
-         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin.
-    -->
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT" />
-
-            <data android:mimeType="text/plain" />
-        </intent>
-    </queries>
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
-        tools:replace="android:label"
+        android:label="Marianum Fulda"
        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:label="Marianum Fulda">
-        <receiver
-            android:name=".TimetableWidget"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/timetable_widget_info" />
-        </receiver>
-
+        android:icon="@mipmap/ic_launcher">
        <activity
            android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:exported="true"
-            android:hardwareAccelerated="true"
            android:launchMode="singleTop"
            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
            android:windowSoftInputMode="adjustResize">
-
-            <!--
-                 Specifies an Android theme to apply to this Activity as soon as
+            <!-- Specifies an Android theme to apply to this Activity as soon as
                 the Android process has started. This theme is visible to the user
                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI.
-            -->
+                 to determine the Window background behind the Flutter UI. -->
            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
-
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
-        <!--
- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java
-        -->
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
        <meta-data
            android:name="flutterEmbedding"
            android:value="2" />
    </application>
-</manifest>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility?hl=en and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
--- a/android/app/src/main/java/eu/mhsl/marianum/mobile/client/TimetableWidget.kt
+++ b/android/app/src/main/java/eu/mhsl/marianum/mobile/client/TimetableWidget.kt
@@ -1,39 +0,0 @@
-package eu.mhsl.marianum.mobile.client
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.widget.RemoteViews
-
-import es.antonborri.home_widget.HomeWidgetPlugin
-import android.util.Base64
-
-/**
- * Implementation of App Widget functionality.
- */
-class TimetableWidget : AppWidgetProvider() {
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray,
-    ) {
-        for (appWidgetId in appWidgetIds) {
-            val widgetData = HomeWidgetPlugin.getData(context)
-            val views = RemoteViews(context.packageName, R.layout.timetable_widget).apply {
-                val imageBase64 = widgetData.getString("screen", null) ?: return@apply
-                val imageBytes = Base64.decode(imageBase64, Base64.DEFAULT);
-                val imageBitmap: Bitmap = BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
-                setImageViewBitmap(R.id.widget_image, imageBitmap)
-            }
-
-            val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
-            val pendingIntent = PendingIntent.getActivity(context, 0, launchIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-            views.setOnClickPendingIntent(R.id.background, pendingIntent)
-
-            appWidgetManager.updateAppWidget(appWidgetId, views)
-        }
-    }
-}
--- a/android/app/src/main/res/drawable-nodpi/timetable_widget_default.png
+++ b/android/app/src/main/res/drawable-nodpi/timetable_widget_default.png
--- a/android/app/src/main/res/drawable-nodpi/timetable_widget_preview.png
+++ b/android/app/src/main/res/drawable-nodpi/timetable_widget_preview.png
--- a/android/app/src/main/res/drawable-v21/app_widget_background.xml
+++ b/android/app/src/main/res/drawable-v21/app_widget_background.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Background for widgets to make the rounded corners based on the
-appWidgetRadius attribute value
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="?attr/appWidgetRadius" />
-    <solid android:color="?android:attr/colorBackground" />
-</shape>
--- a/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml
+++ b/android/app/src/main/res/drawable-v21/app_widget_inner_view_background.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Background for views inside widgets to make the rounded corners based on the
-appWidgetInnerRadius attribute value
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="?attr/appWidgetInnerRadius" />
-    <solid android:color="?android:attr/colorAccent" />
-</shape>
--- a/android/app/src/main/res/layout/timetable_widget.xml
+++ b/android/app/src/main/res/layout/timetable_widget.xml
@@ -1,26 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/background"
-    style="@style/Widget.Android.AppWidget.Container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/transparent"
-    android:padding="0dp"
-    android:theme="@style/Theme.Android.AppWidgetContainer">
-
-    <ImageView
-        android:id="@+id/widget_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="0dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginBottom="0dp"
-        android:layout_weight="1"
-        android:adjustViewBounds="false"
-        android:background="@android:color/transparent"
-        android:scaleType="fitCenter"
-        android:src="@drawable/timetable_widget_default"
-        android:visibility="visible"
-        tools:visibility="visible" />
-</RelativeLayout>
--- a/android/app/src/main/res/values-night-v31/themes.xml
+++ b/android/app/src/main/res/values-night-v31/themes.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--
-    Having themes.xml for night-v31 because of the priority order of the resource qualifiers.
-    -->
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
-        <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
-    </style>
-</resources>
--- a/android/app/src/main/res/values-v21/styles.xml
+++ b/android/app/src/main/res/values-v21/styles.xml
@@ -1,14 +0,0 @@
-<resources>
-
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
-        <item name="android:id">@android:id/background</item>
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_background</item>
-    </style>
-
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_inner_view_background</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-</resources>
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -18,18 +18,4 @@
    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <item name="android:windowBackground">?android:colorBackground</item>
    </style>
-
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
-        <item name="android:id">@android:id/background</item>
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_background</item>
-        <item name="android:clipToOutline">true</item>
-    </style>
-
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_inner_view_background</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:clipToOutline">true</item>
-    </style>
 </resources>
--- a/android/app/src/main/res/values-v31/themes.xml
+++ b/android/app/src/main/res/values-v31/themes.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--
-    Having themes.xml for v31 variant because @android:dimen/system_app_widget_background_radius
-     and @android:dimen/system_app_widget_internal_padding requires API level 31
-    -->
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
-        <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
-    </style>
-</resources>
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -1,7 +0,0 @@
-<resources>
-    <declare-styleable name="AppWidgetAttrs">
-        <attr name="appWidgetPadding" format="dimension" />
-        <attr name="appWidgetInnerRadius" format="dimension" />
-        <attr name="appWidgetRadius" format="dimension" />
-    </declare-styleable>
-</resources>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,6 +0,0 @@
-<resources>
-    <color name="light_blue_50">#FFE1F5FE</color>
-    <color name="light_blue_200">#FF81D4FA</color>
-    <color name="light_blue_600">#FF039BE5</color>
-    <color name="light_blue_900">#FF01579B</color>
-</resources>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!--
-Refer to App Widget Documentation for margin information
-http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-    -->
-    <dimen name="widget_margin">0dp</dimen>
-
-</resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="appwidget_text">Marianum Vertretungsplan</string>
-    <string name="add_widget">Hinzufügen</string>
-    <string name="app_widget_description">Übersicht zum Vertretungsplan</string>
-</resources>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -19,14 +19,4 @@
    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
        <item name="android:windowBackground">?android:colorBackground</item>
    </style>
-
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
-        <item name="android:id">@android:id/background</item>
-        <item name="android:background">?android:attr/colorBackground</item>
-    </style>
-
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:background">?android:attr/colorBackground</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
 </resources>
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,17 +0,0 @@
-<resources>
-
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
-        <!-- Radius of the outer bound of widgets to make the rounded corners -->
-        <item name="appWidgetRadius">16dp</item>
-        <!--
-        Radius of the inner view's bound of widgets to make the rounded corners.
-        It needs to be 8dp or less than the value of appWidgetRadius
-        -->
-        <item name="appWidgetInnerRadius">8dp</item>
-    </style>
-
-    <style name="Theme.Android.AppWidgetContainer" parent="Theme.Android.AppWidgetContainerParent">
-        <!-- Apply padding to avoid the content of the widget colliding with the rounded corners -->
-        <item name="appWidgetPadding">16dp</item>
-    </style>
-</resources>
--- a/android/app/src/main/res/xml/timetable_widget_info.xml
+++ b/android/app/src/main/res/xml/timetable_widget_info.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/app_widget_description"
-    android:initialKeyguardLayout="@layout/timetable_widget"
-    android:initialLayout="@layout/timetable_widget"
-    android:minWidth="220dp"
-    android:minHeight="294dp"
-    android:minResizeWidth="110dp"
-    android:minResizeHeight="147dp"
-    android:previewImage="@drawable/timetable_widget_preview"
-    android:previewLayout="@layout/timetable_widget"
-    android:resizeMode="horizontal|vertical"
-    android:targetCellWidth="3"
-    android:targetCellHeight="4"
-    android:updatePeriodMillis="86400000"
-    android:widgetCategory="home_screen" />
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,21 +2,6 @@ allprojects {
    repositories {
        google()
        mavenCentral()
-
-        // [required] background_fetch
-        maven {
-            url "${project(':background_fetch').projectDir}/libs"
-        }
-    }
-}
-
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10'
    }
 }

--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,6 +1,3 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -19,8 +19,8 @@ pluginManagement {

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

 include ":app"
--- a/assets/ca/lets-encrypt-r10.pem
+++ b/assets/ca/lets-encrypt-r10.pem
@@ -1,29 +0,0 @@
-----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-----
--- a/assets/ca/lets-encrypt-r13.pem
+++ b/assets/ca/lets-encrypt-r13.pem
@@ -1,29 +0,0 @@
-----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-----
--- a/assets/img/raumplan.jpg
+++ b/assets/img/raumplan.jpg
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +0,0 @@
-targets:
-  $default:
-    builders:
-      json_serializable:
-        options:
-          explicit_to_json: false
-          generic_argument_factories: true
--- a/google-play/app-symbol.png
+++ b/google-play/app-symbol.png
--- a/google-play/mobile-screenshot.png
+++ b/google-play/mobile-screenshot.png
--- a/google-play/mobile-screenshot2.png
+++ b/google-play/mobile-screenshot2.png
--- a/google-play/vorstellungsgrafik.png
+++ b/google-play/vorstellungsgrafik.png
--- a/ios/.DS_Store
+++ b/ios/.DS_Store
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>13.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '15.0'
+platform :ios, '11.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -31,8 +31,6 @@ target 'Runner' do
  use_frameworks!
  use_modular_headers!

-  pod 'PhoneNumberKit', '~> 3.7.6'
-
  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 #  target 'RunnerTests' do
 #    inherit! :search_paths
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,194 +1,185 @@
 PODS:
-  - connectivity_plus (0.0.1):
+  - better_open_file (0.0.1):
    - Flutter
  - device_info_plus (0.0.1):
    - Flutter
-  - DKImagePickerController/Core (4.3.9):
+  - DKImagePickerController/Core (4.3.4):
    - DKImagePickerController/ImageDataManager
    - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.9)
-  - DKImagePickerController/PhotoGallery (4.3.9):
+  - DKImagePickerController/ImageDataManager (4.3.4)
+  - DKImagePickerController/PhotoGallery (4.3.4):
    - DKImagePickerController/Core
    - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.9)
-  - DKPhotoGallery (0.0.19):
-    - DKPhotoGallery/Core (= 0.0.19)
-    - DKPhotoGallery/Model (= 0.0.19)
-    - DKPhotoGallery/Preview (= 0.0.19)
-    - DKPhotoGallery/Resource (= 0.0.19)
+  - DKImagePickerController/Resource (4.3.4)
+  - DKPhotoGallery (0.0.17):
+    - DKPhotoGallery/Core (= 0.0.17)
+    - DKPhotoGallery/Model (= 0.0.17)
+    - DKPhotoGallery/Preview (= 0.0.17)
+    - DKPhotoGallery/Resource (= 0.0.17)
    - SDWebImage
    - SwiftyGif
-  - DKPhotoGallery/Core (0.0.19):
+  - DKPhotoGallery/Core (0.0.17):
    - DKPhotoGallery/Model
    - DKPhotoGallery/Preview
    - SDWebImage
    - SwiftyGif
-  - DKPhotoGallery/Model (0.0.19):
+  - DKPhotoGallery/Model (0.0.17):
    - SDWebImage
    - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.19):
+  - DKPhotoGallery/Preview (0.0.17):
    - DKPhotoGallery/Model
    - DKPhotoGallery/Resource
    - SDWebImage
    - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.19):
+  - DKPhotoGallery/Resource (0.0.17):
    - SDWebImage
    - SwiftyGif
-  - emoji_picker_flutter (0.0.1):
-    - Flutter
  - fast_rsa (0.6.0):
    - Flutter
  - file_picker (0.0.1):
    - DKImagePickerController/PhotoGallery
    - Flutter
-  - Firebase/CoreOnly (12.2.0):
-    - FirebaseCore (~> 12.2.0)
-  - Firebase/InAppMessaging (12.2.0):
+  - Firebase/CoreOnly (10.12.0):
+    - FirebaseCore (= 10.12.0)
+  - Firebase/InAppMessaging (10.12.0):
    - Firebase/CoreOnly
-    - FirebaseInAppMessaging (~> 12.2.0-beta)
-  - Firebase/Messaging (12.2.0):
+    - FirebaseInAppMessaging (~> 10.12.0-beta)
+  - Firebase/Messaging (10.12.0):
    - Firebase/CoreOnly
-    - FirebaseMessaging (~> 12.2.0)
-  - firebase_core (4.1.0):
-    - Firebase/CoreOnly (= 12.2.0)
+    - FirebaseMessaging (~> 10.12.0)
+  - firebase_core (2.15.1):
+    - Firebase/CoreOnly (= 10.12.0)
    - Flutter
-  - firebase_in_app_messaging (0.9.0-1):
-    - Firebase/InAppMessaging (= 12.2.0)
+  - firebase_in_app_messaging (0.7.3-5):
+    - Firebase/InAppMessaging (= 10.12.0)
    - firebase_core
    - Flutter
-  - firebase_messaging (16.0.1):
-    - Firebase/Messaging (= 12.2.0)
+  - firebase_messaging (14.6.6):
+    - Firebase/Messaging (= 10.12.0)
    - firebase_core
    - Flutter
-  - FirebaseABTesting (12.2.0):
-    - FirebaseCore (~> 12.2.0)
-  - FirebaseCore (12.2.0):
-    - FirebaseCoreInternal (~> 12.2.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Logger (~> 8.1)
-  - FirebaseCoreInternal (12.2.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.1)"
-  - FirebaseInAppMessaging (12.2.0-beta):
-    - FirebaseABTesting (~> 12.2.0)
-    - FirebaseCore (~> 12.2.0)
-    - FirebaseInstallations (~> 12.2.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
-    - nanopb (~> 3.30910.0)
-  - FirebaseInstallations (12.2.0):
-    - FirebaseCore (~> 12.2.0)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
-    - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (12.2.0):
-    - FirebaseCore (~> 12.2.0)
-    - FirebaseInstallations (~> 12.2.0)
-    - GoogleDataTransport (~> 10.1)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
-    - GoogleUtilities/Environment (~> 8.1)
-    - GoogleUtilities/Reachability (~> 8.1)
-    - GoogleUtilities/UserDefaults (~> 8.1)
-    - nanopb (~> 3.30910.0)
+  - FirebaseABTesting (10.13.0):
+    - FirebaseCore (~> 10.0)
+  - FirebaseCore (10.12.0):
+    - FirebaseCoreInternal (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Logger (~> 7.8)
+  - FirebaseCoreInternal (10.13.0):
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
+  - FirebaseInAppMessaging (10.12.0-beta):
+    - FirebaseABTesting (~> 10.0)
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+  - FirebaseInstallations (10.13.0):
+    - FirebaseCore (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - PromisesObjC (~> 2.1)
+  - FirebaseMessaging (10.12.0):
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
+    - GoogleUtilities/Environment (~> 7.8)
+    - GoogleUtilities/Reachability (~> 7.8)
+    - GoogleUtilities/UserDefaults (~> 7.8)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
  - Flutter (1.0.0)
-  - flutter_app_badge (2.0.0):
+  - flutter_app_badger (1.3.0):
    - Flutter
  - flutter_local_notifications (0.0.1):
    - Flutter
-  - flutter_native_splash (2.4.3):
+  - flutter_native_splash (0.0.1):
    - Flutter
-  - GoogleDataTransport (10.1.0):
-    - nanopb (~> 3.30910.0)
-    - PromisesObjC (~> 2.4)
-  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
+  - fluttertoast (0.0.2):
+    - Flutter
+    - Toast
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
+  - GoogleDataTransport (9.2.5):
+    - GoogleUtilities/Environment (~> 7.7)
+    - nanopb (< 2.30910.0, >= 2.30908.0)
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/AppDelegateSwizzler (7.11.5):
    - GoogleUtilities/Environment
    - GoogleUtilities/Logger
    - GoogleUtilities/Network
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (8.1.0):
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Logger (8.1.0):
+  - GoogleUtilities/Environment (7.11.5):
+    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/Logger (7.11.5):
    - GoogleUtilities/Environment
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (8.1.0):
+  - GoogleUtilities/Network (7.11.5):
    - GoogleUtilities/Logger
    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Privacy
    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (8.1.0)":
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (8.1.0)
-  - GoogleUtilities/Reachability (8.1.0):
+  - "GoogleUtilities/NSData+zlib (7.11.5)"
+  - GoogleUtilities/Reachability (7.11.5):
    - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (8.1.0):
+  - GoogleUtilities/UserDefaults (7.11.5):
    - GoogleUtilities/Logger
-    - GoogleUtilities/Privacy
  - image_picker_ios (0.0.1):
    - Flutter
-  - in_app_review (2.0.0):
-    - Flutter
  - libphonenumber_plugin (0.0.1):
    - Flutter
    - PhoneNumberKit
-  - nanopb (3.30910.0):
-    - nanopb/decode (= 3.30910.0)
-    - nanopb/encode (= 3.30910.0)
-  - nanopb/decode (3.30910.0)
-  - nanopb/encode (3.30910.0)
-  - open_filex (0.0.2):
-    - Flutter
-  - package_info_plus (0.4.5):
+  - nanopb (2.30909.0):
+    - nanopb/decode (= 2.30909.0)
+    - nanopb/encode (= 2.30909.0)
+  - nanopb/decode (2.30909.0)
+  - nanopb/encode (2.30909.0)
+  - package_info (0.0.1):
    - Flutter
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - PhoneNumberKit (3.7.11):
-    - PhoneNumberKit/PhoneNumberKitCore (= 3.7.11)
-    - PhoneNumberKit/UIKit (= 3.7.11)
-  - PhoneNumberKit/PhoneNumberKitCore (3.7.11)
-  - PhoneNumberKit/UIKit (3.7.11):
+  - PhoneNumberKit (3.6.7):
+    - PhoneNumberKit/PhoneNumberKitCore (= 3.6.7)
+    - PhoneNumberKit/UIKit (= 3.6.7)
+  - PhoneNumberKit/PhoneNumberKitCore (3.6.7)
+  - PhoneNumberKit/UIKit (3.6.7):
    - PhoneNumberKit/PhoneNumberKitCore
-  - PromisesObjC (2.4.0)
-  - SDWebImage (5.21.2):
-    - SDWebImage/Core (= 5.21.2)
-  - SDWebImage/Core (5.21.2)
+  - PromisesObjC (2.3.1)
+  - SDWebImage (5.17.0):
+    - SDWebImage/Core (= 5.17.0)
+  - SDWebImage/Core (5.17.0)
  - share_plus (0.0.1):
    - Flutter
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - sqflite_darwin (0.0.4):
+  - sqflite (0.0.3):
    - Flutter
-    - FlutterMacOS
-  - SwiftyGif (5.4.5)
+    - FMDB (>= 2.7.5)
+  - SwiftyGif (5.4.4)
  - syncfusion_flutter_pdfviewer (0.0.1):
    - Flutter
+  - Toast (4.0.0)
  - url_launcher_ios (0.0.1):
    - Flutter

 DEPENDENCIES:
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - better_open_file (from `.symlinks/plugins/better_open_file/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_badge (from `.symlinks/plugins/flutter_app_badge/ios`)
+  - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
  - libphonenumber_plugin (from `.symlinks/plugins/libphonenumber_plugin/ios`)
-  - open_filex (from `.symlinks/plugins/open_filex/ios`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - package_info (from `.symlinks/plugins/package_info/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_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
+  - sqflite (from `.symlinks/plugins/sqflite/ios`)
  - syncfusion_flutter_pdfviewer (from `.symlinks/plugins/syncfusion_flutter_pdfviewer/ios`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

@@ -203,6 +194,7 @@ SPEC REPOS:
    - FirebaseInAppMessaging
    - FirebaseInstallations
    - FirebaseMessaging
+    - FMDB
    - GoogleDataTransport
    - GoogleUtilities
    - nanopb
@@ -210,14 +202,13 @@ SPEC REPOS:
    - PromisesObjC
    - SDWebImage
    - SwiftyGif
+    - Toast

 EXTERNAL SOURCES:
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
+  better_open_file:
+    :path: ".symlinks/plugins/better_open_file/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:
@@ -230,76 +221,74 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/firebase_messaging/ios"
  Flutter:
    :path: Flutter
-  flutter_app_badge:
-    :path: ".symlinks/plugins/flutter_app_badge/ios"
+  flutter_app_badger:
+    :path: ".symlinks/plugins/flutter_app_badger/ios"
  flutter_local_notifications:
    :path: ".symlinks/plugins/flutter_local_notifications/ios"
  flutter_native_splash:
    :path: ".symlinks/plugins/flutter_native_splash/ios"
+  fluttertoast:
+    :path: ".symlinks/plugins/fluttertoast/ios"
  image_picker_ios:
    :path: ".symlinks/plugins/image_picker_ios/ios"
-  in_app_review:
-    :path: ".symlinks/plugins/in_app_review/ios"
  libphonenumber_plugin:
    :path: ".symlinks/plugins/libphonenumber_plugin/ios"
-  open_filex:
-    :path: ".symlinks/plugins/open_filex/ios"
-  package_info_plus:
-    :path: ".symlinks/plugins/package_info_plus/ios"
+  package_info:
+    :path: ".symlinks/plugins/package_info/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_darwin:
-    :path: ".symlinks/plugins/sqflite_darwin/darwin"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/ios"
  syncfusion_flutter_pdfviewer:
    :path: ".symlinks/plugins/syncfusion_flutter_pdfviewer/ios"
  url_launcher_ios:
    :path: ".symlinks/plugins/url_launcher_ios/ios"

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

-PODFILE CHECKSUM: e21c9d4c7b9623c73c6784ddc132fd50a603ad93
+PODFILE CHECKSUM: 3d89a90682e2cd438911ad748b8ba5992f8b6a0e

-COCOAPODS: 1.16.2
+COCOAPODS: 1.12.1
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -144,7 +144,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				174B54D80220E5F588BD9737 /* [CP] Embed Pods Frameworks */,
-				859FAB4E05FAC31B7B1A62D7 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -162,7 +161,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -238,23 +237,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		859FAB4E05FAC31B7B1A62D7 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -367,7 +349,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -452,7 +434,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -501,7 +483,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1430"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      shouldUseLaunchSchemeArgsEnv = "YES">
      <MacroExpansion>
         <BuildableReference
@@ -44,13 +43,11 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
      debugServiceExtension = "internal"
-      enableGPUValidationMode = "1"
      allowLocationSimulation = "YES">
      <BuildableProductRunnable
         runnableDebuggingMode = "0">
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter

-@main
+@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
--- a/lib/api/apiError.dart
+++ b/lib/api/apiError.dart
@@ -4,5 +4,7 @@ class ApiError {
  ApiError(this.message);

  @override
-  String toString() => 'ApiError: $message';
-}
+  String toString() {
+    return 'ApiError: $message';
+  }
+}
--- a/lib/api/apiParams.dart
+++ b/lib/api/apiParams.dart
@@ -1,3 +1,3 @@
 class ApiParams {

-}
+}
--- a/lib/api/apiRequest.dart
+++ b/lib/api/apiRequest.dart
@@ -2,4 +2,4 @@

 class ApiRequest {

-}
+}
--- a/lib/api/apiResponse.dart
+++ b/lib/api/apiResponse.dart
@@ -5,5 +5,5 @@ abstract class ApiResponse {
  late http.Response rawResponse;

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

 import 'getHolidaysResponse.dart';

 class GetHolidays {
  Future<GetHolidaysResponse> query() async {
-    var response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
-    var data = jsonDecode(response) as List<dynamic>;
+    String response = (await http.get(Uri.parse('https://ferien-api.de/api/v1/holidays/HE'))).body;
    return GetHolidaysResponse(
        List<GetHolidaysResponseObject>.from(
-            data.map<GetHolidaysResponseObject>((e) => GetHolidaysResponseObject.fromJson(e as Map<String, dynamic>))
+            jsonDecode(response).map<GetHolidaysResponseObject>(
+                    GetHolidaysResponseObject.fromJson
+            )
        )
    );
  }
-}
+}
--- a/lib/api/holidays/getHolidaysCache.dart
+++ b/lib/api/holidays/getHolidaysCache.dart
@@ -6,21 +6,24 @@ import 'getHolidaysResponse.dart';

 class GetHolidaysCache extends RequestCache<GetHolidaysResponse> {
  GetHolidaysCache({onUpdate, renew}) : super(RequestCache.cacheDay, onUpdate, renew: renew) {
-    start('state-holidays');
+    start('MarianumMobile', 'state-holidays');
  }

  @override
  GetHolidaysResponse onLocalData(String json) {
    List<dynamic> parsedListJson = jsonDecode(json)['data'];
    return GetHolidaysResponse(
-      List<GetHolidaysResponseObject>.from(
-        parsedListJson.map<GetHolidaysResponseObject>(
-          (i) => GetHolidaysResponseObject.fromJson(i as Map<String, dynamic>)
+        List<GetHolidaysResponseObject>.from(
+            parsedListJson.map<GetHolidaysResponseObject>(
+                    // ignore: unnecessary_lambdas
+                    (dynamic i) => GetHolidaysResponseObject.fromJson(i)
+            )
        )
-      )
    );
  }

  @override
-  Future<GetHolidaysResponse> onLoad() => GetHolidays().query();
-}
+  Future<GetHolidaysResponse> onLoad() {
+    return GetHolidays().query();
+  }
+}
--- a/lib/api/holidays/getHolidaysResponse.dart
+++ b/lib/api/holidays/getHolidaysResponse.dart
@@ -35,4 +35,4 @@ class GetHolidaysResponseObject {

  factory GetHolidaysResponseObject.fromJson(Map<String, dynamic> json) => _$GetHolidaysResponseObjectFromJson(json);
  Map<String, dynamic> toJson() => _$GetHolidaysResponseObjectToJson(this);
-}
+}
--- a/lib/api/holidays/getHolidaysResponse.g.dart
+++ b/lib/api/holidays/getHolidaysResponse.g.dart
@@ -16,19 +16,26 @@ GetHolidaysResponse _$GetHolidaysResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetHolidaysResponseToJson(
-        GetHolidaysResponse instance) =>
-    <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
-      'data': instance.data.map((e) => e.toJson()).toList(),
-    };
+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 num).toInt(),
+      year: json['year'] as int,
      stateCode: json['stateCode'] as String,
      name: json['name'] as String,
      slug: json['slug'] as String,
--- a/lib/api/marianumcloud/autocomplete/autocompleteApi.dart
+++ b/lib/api/marianumcloud/autocomplete/autocompleteApi.dart
@@ -2,6 +2,7 @@ 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';
@@ -9,7 +10,7 @@ import 'autocompleteResponse.dart';

 class AutocompleteApi {
  Future<AutocompleteResponse> find(String query) async {
-    var getParameters = <String, dynamic>{
+    Map<String, dynamic> getParameters = {
      'search': query,
      'itemType': ' ',
      'itemId': ' ',
@@ -17,16 +18,16 @@ class AutocompleteApi {
      'limit': '10',
    };

-    var headers = <String, String>{};
+    Map<String, String> headers = {};
    headers.putIfAbsent('Accept', () => 'application/json');
    headers.putIfAbsent('OCS-APIRequest', () => 'true');

-    var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);
+    Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/core/autocomplete/get', getParameters);

-    var response = await http.get(endpoint, headers: headers);
+    Response response = await http.get(endpoint, headers: headers);
    if(response.statusCode != HttpStatus.ok) throw Exception('Api call failed with ${response.statusCode}: ${response.body}');
-    var result = response.body;
+    String result = response.body;
    return AutocompleteResponse.fromJson(jsonDecode(result)['ocs']);
  }

-}
+}
--- a/lib/api/marianumcloud/autocomplete/autocompleteResponse.dart
+++ b/lib/api/marianumcloud/autocomplete/autocompleteResponse.dart
@@ -18,7 +18,7 @@ class AutocompleteResponseObject {
  String label;
  String? icon;
  String? source;
-  String? status;
+  List<String>? status;
  String? subline;
  String? shareWithDisplayNameUniqe;

@@ -27,4 +27,4 @@ class AutocompleteResponseObject {

  factory AutocompleteResponseObject.fromJson(Map<String, dynamic> json) => _$AutocompleteResponseObjectFromJson(json);
  Map<String, dynamic> toJson() => _$AutocompleteResponseObjectToJson(this);
-}
+}
--- a/lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart
+++ b/lib/api/marianumcloud/autocomplete/autocompleteResponse.g.dart
@@ -28,7 +28,7 @@ AutocompleteResponseObject _$AutocompleteResponseObjectFromJson(
      json['label'] as String,
      json['icon'] as String?,
      json['source'] as String?,
-      json['status'] as String?,
+      (json['status'] as List<dynamic>?)?.map((e) => e as String).toList(),
      json['subline'] as String?,
      json['shareWithDisplayNameUniqe'] as String?,
    );
--- a/lib/api/marianumcloud/files-sharing/fileSharingApi.dart
+++ b/lib/api/marianumcloud/files-sharing/fileSharingApi.dart
@@ -1,6 +1,7 @@
 import 'dart:io';

 import 'package:http/http.dart' as http;
+import 'package:http/http.dart';

 import '../../../model/accountData.dart';
 import '../../../model/endpointData.dart';
@@ -8,15 +9,15 @@ import 'fileSharingApiParams.dart';

 class FileSharingApi {
  Future<void> share(FileSharingApiParams query) async {
-    var headers = <String, String>{};
+    Map<String, String> headers = {};
    headers.putIfAbsent('Accept', () => 'application/json');
    headers.putIfAbsent('OCS-APIRequest', () => 'true');

-    var 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())));
-    var response = await http.post(endpoint, headers: headers);
+    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}');
    }
  }
-}
+}
--- a/lib/api/marianumcloud/files-sharing/fileSharingApiParams.dart
+++ b/lib/api/marianumcloud/files-sharing/fileSharingApiParams.dart
@@ -20,4 +20,4 @@ class FileSharingApiParams {

  factory FileSharingApiParams.fromJson(Map<String, dynamic> json) => _$FileSharingApiParamsFromJson(json);
  Map<String, dynamic> toJson() => _$FileSharingApiParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/files-sharing/fileSharingApiParams.g.dart
+++ b/lib/api/marianumcloud/files-sharing/fileSharingApiParams.g.dart
@@ -9,7 +9,7 @@ part of 'fileSharingApiParams.dart';
 FileSharingApiParams _$FileSharingApiParamsFromJson(
        Map<String, dynamic> json) =>
    FileSharingApiParams(
-      shareType: (json['shareType'] as num).toInt(),
+      shareType: json['shareType'] as int,
      shareWith: json['shareWith'] as String,
      path: json['path'] as String,
      referenceId: json['referenceId'] as String?,
--- a/lib/api/marianumcloud/talk/chat/getChat.dart
+++ b/lib/api/marianumcloud/talk/chat/getChat.dart
@@ -14,9 +14,13 @@ class GetChat extends TalkApi<GetChatResponse> {
  GetChat(this.chatToken, this.params) : super('v1/chat/$chatToken', null, getParameters: params.toJson());

  @override
-  assemble(String raw) => GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
+  assemble(String raw) {
+    return GetChatResponse.fromJson(jsonDecode(raw)['ocs']);
+  }

  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
+  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
+    return http.get(uri, headers: headers);
+  }
  
-}
+}
--- a/lib/api/marianumcloud/talk/chat/getChatCache.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatCache.dart
@@ -9,11 +9,12 @@ class GetChatCache extends RequestCache<GetChatResponse> {
  String chatToken;

  GetChatCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('nc-chat-$chatToken');
+    start('MarianumMobile', 'nc-chat-$chatToken');
  }

  @override
-  Future<GetChatResponse> onLoad() => GetChat(
+  Future<GetChatResponse> onLoad() {
+    return GetChat(
      chatToken,
      GetChatParams(
        lookIntoFuture: GetChatParamsSwitch.off,
@@ -21,8 +22,11 @@ class GetChatCache extends RequestCache<GetChatResponse> {
        limit: 200,
      )
    ).run();
+  }

  @override
-  GetChatResponse onLocalData(String json) => GetChatResponse.fromJson(jsonDecode(json));
+  GetChatResponse onLocalData(String json) {
+    return GetChatResponse.fromJson(jsonDecode(json));
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/chat/getChatParams.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatParams.dart
@@ -31,4 +31,4 @@ class GetChatParams extends ApiParams {
 enum GetChatParamsSwitch {
  @JsonValue(1) on,
  @JsonValue(0) off,
-}
+}
--- a/lib/api/marianumcloud/talk/chat/getChatParams.g.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatParams.g.dart
@@ -10,32 +10,37 @@ 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(),
+      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) =>
-    <String, dynamic>{
-      'lookIntoFuture': _$GetChatParamsSwitchEnumMap[instance.lookIntoFuture]!,
-      if (instance.limit case final value?) 'limit': value,
-      if (instance.lastKnownMessageId case final value?)
-        'lastKnownMessageId': value,
-      if (instance.lastCommonReadId case final value?)
-        'lastCommonReadId': value,
-      if (instance.timeout case final value?) 'timeout': value,
-      if (_$GetChatParamsSwitchEnumMap[instance.setReadMarker]
-          case final value?)
-        'setReadMarker': value,
-      if (_$GetChatParamsSwitchEnumMap[instance.includeLastKnown]
-          case final value?)
-        'includeLastKnown': value,
-    };
+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,
--- a/lib/api/marianumcloud/talk/chat/getChatResponse.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatResponse.dart
@@ -16,7 +16,7 @@ class GetChatResponse extends ApiResponse {
  Map<String, dynamic> toJson() => _$GetChatResponseToJson(this);

  List<GetChatResponseObject> sortByTimestamp() {
-    var sorted = data.toList();
+    List<GetChatResponseObject> sorted = data.toList();
    sorted.sort((a, b) => a.timestamp.compareTo(b.timestamp));
    return sorted;
  }
@@ -38,7 +38,6 @@ class GetChatResponseObject {
  Map<String, int>? reactions;
  List<String>? reactionsSelf;
  @JsonKey(fromJson: _fromJson) Map<String, RichObjectString>? messageParameters;
-  GetChatResponseObject? parent;

  GetChatResponseObject(
      this.id,
@@ -54,19 +53,19 @@ class GetChatResponseObject {
      this.message,
      this.messageParameters,
      this.reactions,
-      this.reactionsSelf,
-      this.parent,
+      this.reactionsSelf
  );

  factory GetChatResponseObject.fromJson(Map<String, dynamic> json) => _$GetChatResponseObjectFromJson(json);
  Map<String, dynamic> toJson() => _$GetChatResponseObjectToJson(this);

  static GetChatResponseObject getDateDummy(int timestamp) {
-    var elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
+    DateTime elementDate = DateTime.fromMillisecondsSinceEpoch(timestamp * 1000);
    return getTextDummy(Jiffy.parseFromDateTime(elementDate).format(pattern: 'dd.MM.yyyy'));
  }

-  static GetChatResponseObject getTextDummy(String text) => GetChatResponseObject(
+  static GetChatResponseObject getTextDummy(String text) {
+    return GetChatResponseObject(
        0,
        '',
        GetRoomResponseObjectMessageActorType.user,
@@ -80,15 +79,15 @@ class GetChatResponseObject {
        text,
        null,
        null,
-        null,
-        null,
+        null
    );
+  }

 }

 Map<String, RichObjectString>? _fromJson(json) {
  if(json is Map<String, dynamic>) {
-    var data = <String, RichObjectString>{};
+    Map<String, RichObjectString> data = {};
    for (var element in json.keys) {
      data.putIfAbsent(element, () => RichObjectString.fromJson(json[element]));
    }
@@ -120,5 +119,4 @@ enum RichObjectStringObjectType {
  @JsonValue('guest') guest,
  @JsonValue('highlight') highlight,
  @JsonValue('talk-poll') talkPoll,
-  @JsonValue('geo-location') geoLocation,
-}
+}
--- a/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart
+++ b/lib/api/marianumcloud/talk/chat/getChatResponse.g.dart
@@ -15,22 +15,30 @@ GetChatResponse _$GetChatResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

-Map<String, dynamic> _$GetChatResponseToJson(GetChatResponse instance) =>
-    <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
-      'data': instance.data.map((e) => e.toJson()).toList(),
-    };
+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 num).toInt(),
+      json['id'] as int,
      json['token'] as String,
      $enumDecode(
          _$GetRoomResponseObjectMessageActorTypeEnumMap, json['actorType']),
      json['actorId'] as String,
      json['actorDisplayName'] as String,
-      (json['timestamp'] as num).toInt(),
+      json['timestamp'] as int,
      json['systemMessage'] as String,
      $enumDecode(
          _$GetRoomResponseObjectMessageTypeEnumMap, json['messageType']),
@@ -39,15 +47,11 @@ GetChatResponseObject _$GetChatResponseObjectFromJson(
      json['message'] as String,
      _fromJson(json['messageParameters']),
      (json['reactions'] as Map<String, dynamic>?)?.map(
-        (k, e) => MapEntry(k, (e as num).toInt()),
+        (k, e) => MapEntry(k, e as int),
      ),
      (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(
@@ -70,7 +74,6 @@ Map<String, dynamic> _$GetChatResponseObjectToJson(
      'reactionsSelf': instance.reactionsSelf,
      'messageParameters':
          instance.messageParameters?.map((k, e) => MapEntry(k, e.toJson())),
-      'parent': instance.parent?.toJson(),
    };

 const _$GetRoomResponseObjectMessageActorTypeEnumMap = {
@@ -113,5 +116,4 @@ const _$RichObjectStringObjectTypeEnumMap = {
  RichObjectStringObjectType.guest: 'guest',
  RichObjectStringObjectType.highlight: 'highlight',
  RichObjectStringObjectType.talkPoll: 'talk-poll',
-  RichObjectStringObjectType.geoLocation: 'geo-location',
 };
--- a/lib/api/marianumcloud/talk/chat/richObjectStringProcessor.dart
+++ b/lib/api/marianumcloud/talk/chat/richObjectStringProcessor.dart
@@ -11,4 +11,4 @@ class RichObjectStringProcessor {

    return message;
  }
-}
+}
--- a/lib/api/marianumcloud/talk/createRoom/createRoom.dart
+++ b/lib/api/marianumcloud/talk/createRoom/createRoom.dart
@@ -10,7 +10,9 @@ class CreateRoom extends TalkApi {
  CreateRoom(this.params) : super('v4/room', params);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
@@ -20,4 +22,4 @@ class CreateRoom extends TalkApi {

    return null;
  }
-}
+}
--- a/lib/api/marianumcloud/talk/createRoom/createRoomParams.dart
+++ b/lib/api/marianumcloud/talk/createRoom/createRoomParams.dart
@@ -24,4 +24,4 @@ class CreateRoomParams extends ApiParams {

  factory CreateRoomParams.fromJson(Map<String, dynamic> json) => _$CreateRoomParamsFromJson(json);
  Map<String, dynamic> toJson() => _$CreateRoomParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/talk/createRoom/createRoomParams.g.dart
+++ b/lib/api/marianumcloud/talk/createRoom/createRoomParams.g.dart
@@ -8,7 +8,7 @@ part of 'createRoomParams.dart';

 CreateRoomParams _$CreateRoomParamsFromJson(Map<String, dynamic> json) =>
    CreateRoomParams(
-      roomType: (json['roomType'] as num).toInt(),
+      roomType: json['roomType'] as int,
      invite: json['invite'] as String,
      source: json['source'] as String?,
      roomName: json['roomName'] as String?,
--- a/lib/api/marianumcloud/talk/deleteMessage/deleteMessage.dart
+++ b/lib/api/marianumcloud/talk/deleteMessage/deleteMessage.dart
@@ -10,9 +10,13 @@ class DeleteMessage extends TalkApi {
  DeleteMessage(this.chatToken, this.messageId) : super('v1/chat/$chatToken/$messageId', null);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
+  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
+    return http.delete(uri, headers: headers);
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessage.dart
+++ b/lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessage.dart
@@ -11,7 +11,9 @@ class DeleteReactMessage extends TalkApi {
  DeleteReactMessage({required this.chatToken, required this.messageId, required DeleteReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
@@ -21,4 +23,4 @@ class DeleteReactMessage extends TalkApi {
    return null;
  }

-}
+}
--- a/lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessageParams.dart
+++ b/lib/api/marianumcloud/talk/deleteReactMessage/deleteReactMessageParams.dart
@@ -12,4 +12,4 @@ class DeleteReactMessageParams extends ApiParams {

  factory DeleteReactMessageParams.fromJson(Map<String, dynamic> json) => _$DeleteReactMessageParamsFromJson(json);
  Map<String, dynamic> toJson() => _$DeleteReactMessageParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipants.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipants.dart
@@ -10,9 +10,13 @@ class GetParticipants extends TalkApi<GetParticipantsResponse> {
  GetParticipants(this.token) : super('v4/room/$token/participants', null);

  @override
-  GetParticipantsResponse assemble(String raw) => GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
+  GetParticipantsResponse assemble(String raw) {
+    return GetParticipantsResponse.fromJson(jsonDecode(raw)['ocs']);
+  }

  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
+  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) {
+    return http.get(uri, headers: headers);
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipantsCache.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipantsCache.dart
@@ -8,15 +8,19 @@ class GetParticipantsCache extends RequestCache<GetParticipantsResponse> {
  String chatToken;

  GetParticipantsCache({required onUpdate, required this.chatToken}) : super(RequestCache.cacheNothing, onUpdate) {
-    start('nc-chat-participants-$chatToken');
+    start('MarianumMobile', 'nc-chat-participants-$chatToken');
  }

  @override
-  Future<GetParticipantsResponse> onLoad() => GetParticipants(
+  Future<GetParticipantsResponse> onLoad() {
+    return GetParticipants(
        chatToken,
    ).run();
+  }

  @override
-  GetParticipantsResponse onLocalData(String json) => GetParticipantsResponse.fromJson(jsonDecode(json));
+  GetParticipantsResponse onLocalData(String json) {
+    return GetParticipantsResponse.fromJson(jsonDecode(json));
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.dart
@@ -55,15 +55,12 @@ class GetParticipantsResponseObject {
 }

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

 enum GetParticipantsResponseObjectParticipantsInCallFlags {
@@ -72,4 +69,4 @@ enum GetParticipantsResponseObjectParticipantsInCallFlags {
  @JsonValue(2) providesAudio,
  @JsonValue(3) providesVideo,
  @JsonValue(4) usesSipDialIn
-}
+}
--- a/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.g.dart
+++ b/lib/api/marianumcloud/talk/getParticipants/getParticipantsResponse.g.dart
@@ -18,26 +18,34 @@ GetParticipantsResponse _$GetParticipantsResponseFromJson(
      );

 Map<String, dynamic> _$GetParticipantsResponseToJson(
-        GetParticipantsResponse instance) =>
-    <String, dynamic>{
-      if (instance.headers case final value?) 'headers': value,
-      'data': instance.data.map((e) => e.toJson()).toList(),
-    };
+    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 num).toInt(),
+      json['attendeeId'] as int,
      json['actorType'] as String,
      json['actorId'] as String,
      json['displayName'] as String,
      $enumDecode(_$GetParticipantsResponseObjectParticipantTypeEnumMap,
          json['participantType']),
-      (json['lastPing'] as num).toInt(),
+      json['lastPing'] as int,
      $enumDecode(_$GetParticipantsResponseObjectParticipantsInCallFlagsEnumMap,
          json['inCall']),
-      (json['permissions'] as num).toInt(),
-      (json['attendeePermissions'] as num).toInt(),
+      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?,
--- a/lib/api/marianumcloud/talk/getReactions/getReactions.dart
+++ b/lib/api/marianumcloud/talk/getReactions/getReactions.dart
@@ -13,9 +13,13 @@ class GetReactions extends TalkApi<GetReactionsResponse> {
  GetReactions({required this.chatToken, required this.messageId}) : super('v1/reaction/$chatToken/$messageId', null);

  @override
-  assemble(String raw) => GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
+  assemble(String raw) {
+    return GetReactionsResponse.fromJson(jsonDecode(raw)['ocs']);
+  }

  @override
-  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) => http.get(uri, headers: headers);
+  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
+    return http.get(uri, headers: headers);
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.dart
+++ b/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.dart
@@ -30,4 +30,4 @@ class GetReactionsResponseObject {
 enum GetReactionsResponseObjectActorType {
  @JsonValue('guests') guests,
  @JsonValue('users') users,
-}
+}
--- a/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.g.dart
+++ b/lib/api/marianumcloud/talk/getReactions/getReactionsResponse.g.dart
@@ -22,12 +22,20 @@ GetReactionsResponse _$GetReactionsResponseFromJson(
      );

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

 Map<String, dynamic> _$GetReactionsResponseObjectToJson(
--- a/lib/api/marianumcloud/talk/leaveRoom/leaveRoom.dart
+++ b/lib/api/marianumcloud/talk/leaveRoom/leaveRoom.dart
@@ -9,8 +9,12 @@ class LeaveRoom extends TalkApi {
  LeaveRoom(this.chatToken) : super('v4/room/$chatToken/participants/self', null);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
-  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.delete(uri, headers: headers);
-}
+  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
+    return http.delete(uri, headers: headers);
+  }
+}
--- a/lib/api/marianumcloud/talk/reactMessage/reactMessage.dart
+++ b/lib/api/marianumcloud/talk/reactMessage/reactMessage.dart
@@ -11,7 +11,9 @@ class ReactMessage extends TalkApi {
  ReactMessage({required this.chatToken, required this.messageId, required ReactMessageParams params}) : super('v1/reaction/$chatToken/$messageId', params);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
@@ -21,4 +23,4 @@ class ReactMessage extends TalkApi {
    return null;
  }

-}
+}
--- a/lib/api/marianumcloud/talk/reactMessage/reactMessageParams.dart
+++ b/lib/api/marianumcloud/talk/reactMessage/reactMessageParams.dart
@@ -12,4 +12,4 @@ class ReactMessageParams extends ApiParams {

  factory ReactMessageParams.fromJson(Map<String, dynamic> json) => _$ReactMessageParamsFromJson(json);
  Map<String, dynamic> toJson() => _$ReactMessageParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/talk/room/getRoom.dart
+++ b/lib/api/marianumcloud/talk/room/getRoom.dart
@@ -14,9 +14,13 @@ class GetRoom extends TalkApi<GetRoomResponse> {


  @override
-  GetRoomResponse assemble(String raw) => GetRoomResponse.fromJson(jsonDecode(raw)['ocs']);
+  GetRoomResponse assemble(String raw) {
+    return GetRoomResponse.fromJson(jsonDecode(raw)['ocs']);
+  }

  @override
-  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) => http.get(uri, headers: headers);
+  Future<http.Response> request(Uri uri, Object? body, Map<String, String>? headers) {
+    return http.get(uri, headers: headers);
+  }

-}
+}
--- a/lib/api/marianumcloud/talk/room/getRoomCache.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomCache.dart
@@ -8,16 +8,20 @@ import 'getRoomResponse.dart';

 class GetRoomCache extends RequestCache<GetRoomResponse> {
  GetRoomCache({onUpdate, renew}) : super(RequestCache.cacheMinute, onUpdate, renew: renew) {
-    start('nc-rooms');
+    start('MarianumMobile', 'nc-rooms');
  }

  @override
-  GetRoomResponse onLocalData(String json) => GetRoomResponse.fromJson(jsonDecode(json));
+  GetRoomResponse onLocalData(String json) {
+    return GetRoomResponse.fromJson(jsonDecode(json));
+  }

  @override
-  Future<GetRoomResponse> onLoad() => GetRoom(
+  Future<GetRoomResponse> onLoad() {
+    return GetRoom(
      GetRoomParams(
        includeStatus: true,
      )
    ).run();
-}
+  }
+}
--- a/lib/api/marianumcloud/talk/room/getRoomParams.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomParams.dart
@@ -22,4 +22,4 @@ class GetRoomParams extends ApiParams {
 enum GetRoomParamsStatusUpdate {
  @JsonValue(0) defaults,
  @JsonValue(1) keepAlive,
-}
+}
--- a/lib/api/marianumcloud/talk/room/getRoomParams.g.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomParams.g.dart
@@ -11,7 +11,7 @@ GetRoomParams _$GetRoomParamsFromJson(Map<String, dynamic> json) =>
      noStatusUpdate: $enumDecodeNullable(
          _$GetRoomParamsStatusUpdateEnumMap, json['noStatusUpdate']),
      includeStatus: json['includeStatus'] as bool?,
-      modifiedSince: (json['modifiedSince'] as num?)?.toInt(),
+      modifiedSince: json['modifiedSince'] as int?,
    );

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

 enum GetRoomResponseObjectParticipantNotificationLevel {
@@ -165,4 +164,4 @@ enum GetRoomResponseObjectMessageType {
  @JsonValue('comment_deleted') deletedComment,
  @JsonValue('system') system,
  @JsonValue('command') command,
-}
+}
--- a/lib/api/marianumcloud/talk/room/getRoomResponse.g.dart
+++ b/lib/api/marianumcloud/talk/room/getRoomResponse.g.dart
@@ -15,42 +15,50 @@ GetRoomResponse _$GetRoomResponseFromJson(Map<String, dynamic> json) =>
        (k, e) => MapEntry(k, e as String),
      );

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

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

 const _$GetRoomResponseObjectParticipantNotificationLevelEnumMap = {
--- a/lib/api/marianumcloud/talk/sendMessage/sendMessage.dart
+++ b/lib/api/marianumcloud/talk/sendMessage/sendMessage.dart
@@ -10,7 +10,9 @@ class SendMessage extends TalkApi {
  SendMessage(this.chatToken, SendMessageParams params) : super('v1/chat/$chatToken', params);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response>? request(Uri uri, ApiParams? body, Map<String, String>? headers) {
@@ -20,4 +22,4 @@ class SendMessage extends TalkApi {
    return null;
  }
  
-}
+}
--- a/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.dart
+++ b/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.dart
@@ -7,10 +7,10 @@ part 'sendMessageParams.g.dart';
@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class SendMessageParams extends ApiParams {
  String message;
-  String? replyTo;
+  int? replyTo;

  SendMessageParams(this.message, {this.replyTo});

  factory SendMessageParams.fromJson(Map<String, dynamic> json) => _$SendMessageParamsFromJson(json);
  Map<String, dynamic> toJson() => _$SendMessageParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.g.dart
+++ b/lib/api/marianumcloud/talk/sendMessage/sendMessageParams.g.dart
@@ -9,11 +9,20 @@ part of 'sendMessageParams.dart';
 SendMessageParams _$SendMessageParamsFromJson(Map<String, dynamic> json) =>
    SendMessageParams(
      json['message'] as String,
-      replyTo: json['replyTo'] as String?,
+      replyTo: json['replyTo'] as int?,
    );

-Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) =>
-    <String, dynamic>{
-      'message': instance.message,
-      if (instance.replyTo case final value?) 'replyTo': value,
-    };
+Map<String, dynamic> _$SendMessageParamsToJson(SendMessageParams instance) {
+  final val = <String, dynamic>{
+    'message': instance.message,
+  };
+
+  void writeNotNull(String key, dynamic value) {
+    if (value != null) {
+      val[key] = value;
+    }
+  }
+
+  writeNotNull('replyTo', instance.replyTo);
+  return val;
+}
--- a/lib/api/marianumcloud/talk/sendMessage/sendMessageResponse.dart
+++ b/lib/api/marianumcloud/talk/sendMessage/sendMessageResponse.dart
@@ -2,4 +2,4 @@ import '../../../apiResponse.dart';

 class SendMessageResponse extends ApiResponse {

-}
+}
--- a/lib/api/marianumcloud/talk/setFavorite/setFavorite.dart
+++ b/lib/api/marianumcloud/talk/setFavorite/setFavorite.dart
@@ -11,7 +11,9 @@ class SetFavorite extends TalkApi {
  SetFavorite(this.chatToken, this.favoriteState) : super('v4/room/$chatToken/favorite', null);

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
@@ -22,4 +24,4 @@ class SetFavorite extends TalkApi {
    }
  }

-}
+}
--- a/lib/api/marianumcloud/talk/setReadMarker/setReadMarker.dart
+++ b/lib/api/marianumcloud/talk/setReadMarker/setReadMarker.dart
@@ -15,7 +15,9 @@ class SetReadMarker extends TalkApi {
  }

  @override
-  assemble(String raw) => null;
+  assemble(String raw) {
+    return null;
+  }

  @override
  Future<Response> request(Uri uri, Object? body, Map<String, String>? headers) {
@@ -27,4 +29,4 @@ class SetReadMarker extends TalkApi {
    }
  }

-}
+}
--- a/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.dart
+++ b/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.dart
@@ -14,4 +14,4 @@ class SetReadMarkerParams extends ApiParams {

  factory SetReadMarkerParams.fromJson(Map<String, dynamic> json) => _$SetReadMarkerParamsFromJson(json);
  Map<String, dynamic> toJson() => _$SetReadMarkerParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.g.dart
+++ b/lib/api/marianumcloud/talk/setReadMarker/setReadMarkerParams.g.dart
@@ -8,7 +8,7 @@ part of 'setReadMarkerParams.dart';

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

 Map<String, dynamic> _$SetReadMarkerParamsToJson(
--- a/lib/api/marianumcloud/talk/talkApi.dart
+++ b/lib/api/marianumcloud/talk/talkApi.dart
@@ -34,7 +34,7 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
      getParameters?.update(key, (value) => value.toString());
    });

-    var endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/spreed/api/$path', getParameters);
+    Uri endpoint = Uri.https('${AccountData().buildHttpAuthString()}@${EndpointData().nextcloud().domain}', '${EndpointData().nextcloud().path}/ocs/v2.php/apps/spreed/api/$path', getParameters);

    headers ??= {};
    headers?.putIfAbsent('Accept', () => 'application/json');
@@ -58,9 +58,11 @@ abstract class TalkApi<T extends ApiResponse?> extends ApiRequest {
      assembled?.headers = data.headers;
      return assembled;
    } catch (e) {
-      var message = 'Error assembling Talk API ${T.toString()} message: ${e.toString()} response with request body: $body and request headers: ${headers.toString()}';
-      log(message);
-      throw Exception(message);
+      // TODO report error
+      log('Error assembling Talk API ${T.toString()} message: ${e.toString()} response on ${endpoint.path} with request body: $body and request headers: ${headers.toString()}');
    }
+
+    throw Exception('Error assembling Talk API response');
  }
-}
+
+}
--- a/lib/api/marianumcloud/talk/talkError.dart
+++ b/lib/api/marianumcloud/talk/talkError.dart
@@ -6,5 +6,7 @@ class TalkError {
  TalkError(this.status, this.code, this.message);

  @override
-  String toString() => 'Talk - $status - ($code): $message';
-}
+  String toString() {
+    return 'Talk - $status - ($code): $message';
+  }
+}
--- a/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFile.dart
+++ b/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFile.dart
@@ -19,4 +19,4 @@ class DownloadFile extends WebdavApi<DownloadFileParams> {
    // OpenFile.open(localPath);
    throw UnimplementedError();
  }
-}
+}
--- a/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileParams.dart
+++ b/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileParams.dart
@@ -14,4 +14,4 @@ class DownloadFileParams extends ApiParams {

  factory DownloadFileParams.fromJson(Map<String, dynamic> json) => _$DownloadFileParamsFromJson(json);
  Map<String, dynamic> toJson() => _$DownloadFileParamsToJson(this);
-}
+}
--- a/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileResponse.dart
+++ b/lib/api/marianumcloud/webdav/queries/downloadFile/downloadFileResponse.dart
@@ -11,4 +11,4 @@ class DownloadFileResponse {

  factory DownloadFileResponse.fromJson(Map<String, dynamic> json) => _$DownloadFileResponseFromJson(json);
  Map<String, dynamic> toJson() => _$DownloadFileResponseToJson(this);
-}
+}
--- a/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart
+++ b/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.dart
@@ -34,4 +34,4 @@ class CacheableFile {

  factory CacheableFile.fromJson(Map<String, dynamic> json) => _$CacheableFileFromJson(json);
  Map<String, dynamic> toJson() => _$CacheableFileToJson(this);
-}
+}
--- a/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.g.dart
+++ b/lib/api/marianumcloud/webdav/queries/listFiles/cacheableFile.g.dart
@@ -12,7 +12,7 @@ CacheableFile _$CacheableFileFromJson(Map<String, dynamic> json) =>
      isDirectory: json['isDirectory'] as bool,
      name: json['name'] as String,
      mimeType: json['mimeType'] as String?,
-      size: (json['size'] as num?)?.toInt(),
+      size: json['size'] as int?,
      eTag: json['eTag'] as String?,
      createdAt: json['createdAt'] == null
          ? null
--- a/lib/api/marianumcloud/webdav/queries/listFiles/listFiles.dart
+++ b/lib/api/marianumcloud/webdav/queries/listFiles/listFiles.dart
@@ -13,8 +13,8 @@ class ListFiles extends WebdavApi<ListFilesParams> {

  @override
  Future<ListFilesResponse> run() async {
-    var davFiles = (await (await WebdavApi.webdav).propfind(PathUri.parse(params.path))).toWebDavFiles();
-    var files = davFiles.map(CacheableFile.fromDavFile).toSet();
+    List<WebDavFile> davFiles = (await (await WebdavApi.webdav).propfind(PathUri.parse(params.path))).toWebDavFiles();
+    Set<CacheableFile> files = davFiles.map(CacheableFile.fromDavFile).toSet();

    // webdav handles subdirectories wrong, this is a fix
    // currently this fix is not needed anymore
@@ -30,4 +30,4 @@ class ListFiles extends WebdavApi<ListFilesParams> {

    return ListFilesResponse(files);
  }
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elias Müller	5d264f7651	added notes for next tasks	2024-03-30 18:33:52 +01:00
Elias Müller	a6f7c09671	wip	2024-03-29 21:58:51 +01:00
Elias Müller	eaf6d9f547	updated new linter rules	2024-03-29 18:47:54 +01:00
Elias Müller	5b34afd6cb	Merge branch 'develop' into feature-highEduGraduationCalculator # Conflicts: # lib/view/pages/overhang.dart	2024-03-29 18:32:59 +01:00
Elias Müller	25d901d093	WIP lk select dialog	2024-03-29 17:29:31 +01:00
Elias Müller	6237a2e9cf	Merge branch 'develop' into feature-highEduGraduationCalculator # Conflicts: # lib/view/pages/overhang.dart	2024-03-24 14:21:01 +01:00
Elias Müller	c4f5be2205	WIP high education graduation calculator	2024-03-23 15:42:31 +01:00