diff --git a/.bettercodehub.yml b/.bettercodehub.yml
index 349f7675a..d7be51695 100644
--- a/.bettercodehub.yml
+++ b/.bettercodehub.yml
@@ -1,3 +1,3 @@
-component_depth: 8
+component_depth: 10
 languages:
 - kotlin
diff --git a/.gitignore b/.gitignore
index 5c98a4cff..d3fb6e4e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,7 @@ captures/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/runConfigurations.xml
+.idea/discord.xml
 
 # Keystore files
 *.jks
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 15a4246be..cb2f41195 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,13 +1,19 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
diff --git a/.travis.yml b/.travis.yml
index fa81da66b..e383a74b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ jdk: oraclejdk8
 
 env:
  global:
-    - ANDROID_API_LEVEL=29
-    - ANDROID_BUILD_TOOLS_VERSION=29.0.2
+   - ANDROID_API_LEVEL=30
+   - ANDROID_BUILD_TOOLS_VERSION=30.0.2
 
 cache:
   directories:
@@ -14,7 +14,7 @@ cache:
 branches:
   only:
     - develop
-    - 0.14.2
+    - 0.22.0
 
 android:
  licenses:
@@ -28,40 +28,39 @@ android:
     - build-tools-$ANDROID_BUILD_TOOLS_VERSION
     # The SDK version used to compile your project
     - android-$ANDROID_API_LEVEL
-    # Additional components
+   # Additional components
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
     - addon-google_apis-google-$ANDROID_API_LEVEL
-    # Android emulator
+   # Android emulator
     - android-22
     - sys-img-armeabi-v7a-android-22
 
+before_install:
+  - yes | sdkmanager "platforms;android-30"
+  - yes | sdkmanager "build-tools;30.0.2"
+
 before_script:
-    # Launch emulator before the execution
-    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
-    - emulator -avd test -no-audio -no-window &
-    - android-wait-for-emulator
-    - adb shell input keyevent 82 &
-    - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
+  # Launch emulator before the execution
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+  - "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | sudo bash"
 
 script:
   - ./gradlew dependencies --stacktrace --daemon
   - fossa --no-ansi || true
-  #- ./gradlew lintPlayRelease -x fabricGenerateResourcesPlayRelease --stacktrace --daemon
-  - ./gradlew testPlayDebugUnitTest -x fabricGenerateResourcesPlay --stacktrace --daemon
-  - ./gradlew createFdroidDebugCoverageReport --stacktrace --daemon
-  - ./gradlew jacocoTestReport --stacktrace --daemon
-  - if [ -z ${SONAR_HOST+x} ]; then echo "sonar scan skipped"; else
-      git fetch --unshallow;
-      ./gradlew sonarqube -x test -x lint -x fabricGenerateResourcesPlayRelease -x fabricGenerateResourcesFdroidRelease -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_KEY -Dsonar.branch.name=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} --stacktrace --daemon;
-    fi
+  - ./gradlew -Pcoverage testFdroidDebugUnitTest --stacktrace --daemon
+  - ./gradlew -Pcoverage connectedFdroidDebugAndroidTest --stacktrace --daemon
+  - ./gradlew -Pcoverage jacocoTestReport --stacktrace --daemon
   - |
     if [ $TRAVIS_TAG ]; then
       gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/key.p12.gpg;
       gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg;
-      ./gradlew publishPlayRelease -PenableCrashlytics --stacktrace;
+      ./gradlew publishPlayRelease -PenableFirebase --stacktrace;
     fi
 
 after_success:
diff --git a/README.en.md b/README.en.md
index 7444cccae..4c5e53da8 100644
--- a/README.en.md
+++ b/README.en.md
@@ -32,14 +32,17 @@ Unofficial android VULCAN UONET+ register client for both students and their par
 
 ## Download
 
-You can download the current beta version from the Google Play or the F-Droid store
+You can download the current beta version from the Google Play, F-Droid or Huawei AppGallery store
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Get it on Google Play"
-      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+    alt="Get it on Google Play"
+    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+[<img src="appgallery_badge.png"
+    alt="Explore it on AppGallery"
+    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
     
 You can also download a [development version](https://wulkanowy.github.io/#download) that includes new features being prepared for the next release
 
@@ -47,7 +50,6 @@ You can also download a [development version](https://wulkanowy.github.io/#downl
 
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/sdk)
-* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/README.md b/README.md
index 61b13444a..9e29cdb6c 100644
--- a/README.md
+++ b/README.md
@@ -32,14 +32,17 @@ Nieoficjalny klient dziennika VULCAN UONET+ dla ucznia i rodzica
 
 ## Pobierz
 
-Aktualną wersję beta możesz pobrać ze sklepu Google Play lub F-Droid
+Aktualną wersję beta możesz pobrać ze sklepu Google Play, F-Droid lub Huawei AppGallery
 
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
-      alt="Pobierz z Google Play"
-      height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
+    alt="Pobierz z Google Play"
+    height="80">](https://play.google.com/store/apps/details?id=io.github.wulkanowy)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Pobierz z F-Droid"
     height="80">](https://f-droid.org/packages/io.github.wulkanowy/)
+[<img src="appgallery_badge.png"
+    alt="Odkrywaj w AppGallery"
+    height="80">](https://appgallery.cloud.huawei.com/ag/n/app/C101440411?channelId=Badge&id=1b3f7fbb700849a9be0dba6b520b2282&s=EB1D3BF9ED9D1564D869B7B94B18016D3CABFCA5AEFB8E29F675FA04E0DC131D&detailType=0&v=)
 
 
 Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#download), która zawiera nowe funkcje przygotowywane do następnego wydania
@@ -48,7 +51,6 @@ Możesz także pobrać [wersję rozwojową](https://wulkanowy.github.io/#downloa
 ## Zbudowana za pomocą
 
 * [Wulkanowy SDK](https://github.com/wulkanowy/SDK)
-* [RxJava 2](https://github.com/ReactiveX/RxJava)
 * [Dagger 2](https://github.com/google/dagger)
 * [Room](https://developer.android.com/topic/libraries/architecture/room)
 * [WorkManager](https://developer.android.com/topic/libraries/architecture/workmanager) 
diff --git a/app/build.gradle b/app/build.gradle
index 24a470ae0..b1ba7e62f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,34 +1,35 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'io.fabric'
+apply plugin: 'dagger.hilt.android.plugin'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 30
+    buildToolsVersion '30.0.2'
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 51
-        versionName "0.14.2"
+        minSdkVersion 17
+        targetSdkVersion 30
+        versionCode 73
+        versionName "0.22.0"
         multiDexEnabled true
+        resValue "string", "app_name", "Wulkanowy"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         manifestPlaceholders = [
-                fabric_api_key     : System.getenv("FABRIC_API_KEY") ?: "null",
-                crashlytics_enabled: project.hasProperty("enableCrashlytics")
+                firebase_enabled: project.hasProperty("enableFirebase")
         ]
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [
+                arguments += [
                         "room.schemaLocation": "$projectDir/schemas".toString(),
                         "room.incremental"   : "true"
                 ]
@@ -51,18 +52,17 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "true"
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
         debug {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", project.hasProperty("enableCrashlytics") ? "true" : "false"
+            resValue "string", "app_name", "Wulkanowy DEV " + defaultConfig.versionCode
             applicationIdSuffix ".dev"
             versionNameSuffix "-dev"
-            testCoverageEnabled = true
-            ext.enableCrashlytics = project.hasProperty("enableCrashlytics")
+            testCoverageEnabled = project.hasProperty('coverage')
+            ext.enableCrashlytics = project.hasProperty("enableFirebase")
         }
     }
 
@@ -74,32 +74,37 @@ android {
         }
 
         fdroid {
-            buildConfigField "boolean", "CRASHLYTICS_ENABLED", "false"
             dimension "platform"
         }
     }
 
+    buildFeatures {
+        viewBinding = true
+    }
+
     lintOptions {
         disable 'HardwareIds'
     }
 
     compileOptions {
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
         jvmTarget = "1.8"
+        freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
     }
 
     packagingOptions {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
-}
 
-androidExtensions {
-    experimental = true
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 play {
@@ -107,14 +112,15 @@ play {
     serviceAccountCredentials = file('key.p12')
     defaultToAppBundles = false
     track = 'alpha'
+    updatePriority = 0
 }
 
 ext {
-    work_manager = "2.3.0-rc01"
-    room = "2.2.3"
-    dagger = "2.25.4"
-    chucker = "2.0.4"
-    mockk = "1.9.2"
+    work_manager = "2.4.0"
+    room = "2.2.5"
+    chucker = "3.3.0"
+    mockk = "1.10.2"
+    moshi = "1.11.0"
 }
 
 configurations.all {
@@ -122,80 +128,85 @@ configurations.all {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:0.14.2"
+    implementation "io.github.wulkanowy:sdk:0.22.0"
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "androidx.core:core-ktx:1.2.0-rc01"
-    implementation "androidx.activity:activity-ktx:1.1.0-rc03"
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.appcompat:appcompat-resources:1.1.0"
-    implementation "androidx.fragment:fragment-ktx:1.2.0-rc05"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
+
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "androidx.activity:activity-ktx:1.1.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.appcompat:appcompat-resources:1.2.0"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
     implementation "androidx.annotation:annotation:1.1.0"
     implementation "androidx.multidex:multidex:2.0.1"
 
-    implementation "androidx.preference:preference-ktx:1.1.0"
+    implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
     implementation "androidx.viewpager:viewpager:1.0.0"
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.1"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
-    implementation "com.google.android.material:material:1.1.0-rc01"
-    implementation "com.github.wulkanowy:material-chips-input:2.0.1"
+    implementation "com.google.android.material:material:1.2.1"
+    implementation "com.github.wulkanowy:material-chips-input:2.1.1"
     implementation "com.github.PhilJay:MPAndroidChart:v3.1.0"
     implementation "me.zhanghai.android.materialprogressbar:library:1.6.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_manager"
-    implementation "androidx.work:work-rxjava2:$work_manager"
     implementation "androidx.work:work-gcm:$work_manager"
 
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0"
+
     implementation "androidx.room:room-runtime:$room"
-    implementation "androidx.room:room-rxjava2:$room"
     implementation "androidx.room:room-ktx:$room"
     kapt "androidx.room:room-compiler:$room"
 
-    implementation "com.google.dagger:dagger-android-support:$dagger"
-    kapt "com.google.dagger:dagger-compiler:$dagger"
-    kapt "com.google.dagger:dagger-android-processor:$dagger"
-    implementation "com.squareup.inject:assisted-inject-annotations-dagger2:0.5.2"
-    kapt "com.squareup.inject:assisted-inject-processor-dagger2:0.5.2"
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+    implementation 'androidx.hilt:hilt-work:1.0.0-alpha02'
+    kapt 'androidx.hilt:hilt-compiler:1.0.0-alpha02'
 
-    implementation "eu.davidea:flexible-adapter:5.1.0"
-    implementation "eu.davidea:flexible-adapter-ui:1.0.0"
     implementation "com.aurelhubert:ahbottomnavigation:2.3.4"
     implementation "com.ncapdevi:frag-nav:3.3.0"
-    implementation "com.github.YarikSOffice:lingver:1.1.0"
+    implementation "com.github.YarikSOffice:lingver:1.2.2"
 
-    implementation "com.github.pwittchen:reactivenetwork-rx2:3.0.6"
-    implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
-    implementation "io.reactivex.rxjava2:rxjava:2.2.16"
-
-    implementation "com.google.code.gson:gson:2.8.6"
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.1"
+    implementation "com.squareup.moshi:moshi:$moshi"
+    implementation "com.squareup.moshi:moshi-adapters:$moshi"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
-    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
+    implementation "fr.bipi.treessence:treessence:0.3.2"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
+    implementation "io.coil-kt:coil:1.0.0-rc3"
+    implementation "io.github.wulkanowy:AppKillerManager:3.0.0"
+    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
 
-    playImplementation "com.google.firebase:firebase-core:17.2.1"
-    playImplementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+    playImplementation 'com.google.firebase:firebase-analytics:17.6.0'
+    playImplementation 'com.google.firebase:firebase-inappmessaging-display-ktx:19.1.1'
+    playImplementation "com.google.firebase:firebase-inappmessaging-ktx:19.1.1"
+    playImplementation 'com.google.firebase:firebase-messaging:20.3.0'
+    playImplementation 'com.google.firebase:firebase-crashlytics:17.2.2'
+    playImplementation 'com.google.android.play:core-ktx:1.8.1'
+    playImplementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'
 
-    releaseImplementation "fr.o80.chucker:library-no-op:$chucker"
+    releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
 
-    debugImplementation "fr.o80.chucker:library:$chucker"
+    debugImplementation "com.github.ChuckerTeam.Chucker:library:$chucker"
     debugImplementation "com.amitshekhar.android:debug-db:1.0.6"
 
     testImplementation "junit:junit:4.13"
     testImplementation "io.mockk:mockk:$mockk"
-    testImplementation "org.threeten:threetenbp:1.4.0"
-    testImplementation "org.mockito:mockito-inline:3.2.4"
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9'
 
-    androidTestImplementation "androidx.test:core:1.2.0"
-    androidTestImplementation "androidx.test:runner:1.2.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.1"
+    androidTestImplementation "androidx.test:core:1.3.0"
+    androidTestImplementation "androidx.test:runner:1.3.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.2"
     androidTestImplementation "io.mockk:mockk-android:$mockk"
     androidTestImplementation "androidx.room:room-testing:$room"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    androidTestImplementation "org.mockito:mockito-android:3.2.4"
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/jacoco.gradle b/app/jacoco.gradle
index 48a8fed96..a5cf84e63 100644
--- a/app/jacoco.gradle
+++ b/app/jacoco.gradle
@@ -1,7 +1,7 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.4"
+    toolVersion "0.8.5"
     reportsDir = file("$buildDir/reports")
 }
 
@@ -35,13 +35,13 @@ task jacocoTestReport(type: JacocoReport) {
             dir: "$buildDir/intermediates/classes/debug",
             excludes: excludes
     ) + fileTree(
-            dir: "$buildDir/tmp/kotlin-classes/playDebug",
+            dir: "$buildDir/tmp/kotlin-classes/fdroidDebug",
             excludes: excludes
     ))
 
     sourceDirectories.setFrom(files([
             "src/main/java",
-            "src/play/java"
+            "src/fdroid/java"
     ]))
     executionData.setFrom(fileTree(
             dir: project.projectDir,
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 77339fe9e..7c7962575 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,16 +30,16 @@
 -dontwarn javax.annotation.**
 
 
-#Config for ReactiveNetwork
--dontwarn com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
--dontwarn io.reactivex.functions.Function
--dontwarn rx.internal.util.**
--dontwarn sun.misc.Unsafe
-
-
 #Config for MPAndroidChart
 -keep class com.github.mikephil.charting.** { *; }
 
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
+
+
+#Config for About Libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
new file mode 100644
index 000000000..925d787aa
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/20.json
@@ -0,0 +1,1634 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "37a216a7afcea922b66001ca5ed6cf74",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '37a216a7afcea922b66001ca5ed6cf74')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
new file mode 100644
index 000000000..dfad69f5d
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/21.json
@@ -0,0 +1,1652 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "f905d8a3ff4718d30ae7413a5a717b1f",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f905d8a3ff4718d30ae7413a5a717b1f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
new file mode 100644
index 000000000..1eb8bc19c
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/22.json
@@ -0,0 +1,1658 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "798956844fdb3f64073921184e3acbfd",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `category` TEXT NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '798956844fdb3f64073921184e3acbfd')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
new file mode 100644
index 000000000..f75a72acf
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/23.json
@@ -0,0 +1,1682 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "f2505bf0c76c3ae4567856536d790909",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f2505bf0c76c3ae4567856536d790909')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
new file mode 100644
index 000000000..17ae7d798
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/24.json
@@ -0,0 +1,1732 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 24,
+    "identityHash": "9bbf60310b56a855839164e2aae031f9",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9bbf60310b56a855839164e2aae031f9')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
new file mode 100644
index 000000000..474824df6
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/25.json
@@ -0,0 +1,1744 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 25,
+    "identityHash": "d101f5a26a024f62e6fee161e421b882",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd101f5a26a024f62e6fee161e421b882')"
+    ]
+  }
+}
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
new file mode 100644
index 000000000..21005f9c6
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/26.json
@@ -0,0 +1,1768 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "43f8777ffe95a5a2850ee981db3dbe2e",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '43f8777ffe95a5a2850ee981db3dbe2e')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
new file mode 100644
index 000000000..46b777513
--- /dev/null
+++ b/app/schemas/io.github.wulkanowy.data.db.AppDatabase/27.json
@@ -0,0 +1,1774 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 27,
+    "identityHash": "b24d2d9662e26dd31f2eea78a297558c",
+    "entities": [
+      {
+        "tableName": "Students",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `scrapper_base_url` TEXT NOT NULL, `mobile_base_url` TEXT NOT NULL, `login_type` TEXT NOT NULL, `login_mode` TEXT NOT NULL, `certificate_key` TEXT NOT NULL, `private_key` TEXT NOT NULL, `is_parent` INTEGER NOT NULL, `email` TEXT NOT NULL, `password` TEXT NOT NULL, `symbol` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `user_login_id` INTEGER NOT NULL, `user_name` TEXT NOT NULL, `student_name` TEXT NOT NULL, `school_id` TEXT NOT NULL, `school_short` TEXT NOT NULL, `school_name` TEXT NOT NULL, `class_name` TEXT NOT NULL, `class_id` INTEGER NOT NULL, `is_current` INTEGER NOT NULL, `registration_date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scrapperBaseUrl",
+            "columnName": "scrapper_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mobileBaseUrl",
+            "columnName": "mobile_base_url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginType",
+            "columnName": "login_type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginMode",
+            "columnName": "login_mode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "certificateKey",
+            "columnName": "certificate_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "privateKey",
+            "columnName": "private_key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isParent",
+            "columnName": "is_parent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "email",
+            "columnName": "email",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "password",
+            "columnName": "password",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userLoginId",
+            "columnName": "user_login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userName",
+            "columnName": "user_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentName",
+            "columnName": "student_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolSymbol",
+            "columnName": "school_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolShortName",
+            "columnName": "school_short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolName",
+            "columnName": "school_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "className",
+            "columnName": "class_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isCurrent",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "registrationDate",
+            "columnName": "registration_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Students_email_symbol_student_id_school_id_class_id",
+            "unique": true,
+            "columnNames": [
+              "email",
+              "symbol",
+              "student_id",
+              "school_id",
+              "class_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Students_email_symbol_student_id_school_id_class_id` ON `${TABLE_NAME}` (`email`, `symbol`, `student_id`, `school_id`, `class_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Semesters",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_current` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `diary_name` TEXT NOT NULL, `school_year` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `semester_name` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "is_current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryName",
+            "columnName": "diary_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "schoolYear",
+            "columnName": "school_year",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterName",
+            "columnName": "semester_name",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_Semesters_student_id_diary_id_semester_id",
+            "unique": true,
+            "columnNames": [
+              "student_id",
+              "diary_id",
+              "semester_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Semesters_student_id_diary_id_semester_id` ON `${TABLE_NAME}` (`student_id`, `diary_id`, `semester_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Exams",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `group` TEXT NOT NULL, `type` TEXT NOT NULL, `description` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Timetable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `number` INTEGER NOT NULL, `start` INTEGER NOT NULL, `end` INTEGER NOT NULL, `date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `subjectOld` TEXT NOT NULL, `group` TEXT NOT NULL, `room` TEXT NOT NULL, `roomOld` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacherOld` TEXT NOT NULL, `info` TEXT NOT NULL, `student_plan` INTEGER NOT NULL, `changes` INTEGER NOT NULL, `canceled` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "start",
+            "columnName": "start",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "end",
+            "columnName": "end",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectOld",
+            "columnName": "subjectOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "group",
+            "columnName": "group",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "room",
+            "columnName": "room",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roomOld",
+            "columnName": "roomOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherOld",
+            "columnName": "teacherOld",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "info",
+            "columnName": "info",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isStudentPlan",
+            "columnName": "student_plan",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "changes",
+            "columnName": "changes",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "canceled",
+            "columnName": "canceled",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Attendance",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `time_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `exemption` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `excused` INTEGER NOT NULL, `deleted` INTEGER NOT NULL, `excusable` INTEGER NOT NULL, `excuse_status` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeId",
+            "columnName": "time_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excused",
+            "columnName": "excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deleted",
+            "columnName": "deleted",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excusable",
+            "columnName": "excusable",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "excuseStatus",
+            "columnName": "excuse_status",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AttendanceSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `subject_id` INTEGER NOT NULL, `month` INTEGER NOT NULL, `presence` INTEGER NOT NULL, `absence` INTEGER NOT NULL, `absence_excused` INTEGER NOT NULL, `absence_for_school_reasons` INTEGER NOT NULL, `lateness` INTEGER NOT NULL, `lateness_excused` INTEGER NOT NULL, `exemption` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subjectId",
+            "columnName": "subject_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "month",
+            "columnName": "month",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "presence",
+            "columnName": "presence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceExcused",
+            "columnName": "absence_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absenceForSchoolReasons",
+            "columnName": "absence_for_school_reasons",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lateness",
+            "columnName": "lateness",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latenessExcused",
+            "columnName": "lateness_excused",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "exemption",
+            "columnName": "exemption",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Grades",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `entry` TEXT NOT NULL, `value` REAL NOT NULL, `modifier` REAL NOT NULL, `comment` TEXT NOT NULL, `color` TEXT NOT NULL, `grade_symbol` TEXT NOT NULL, `description` TEXT NOT NULL, `weight` TEXT NOT NULL, `weightValue` REAL NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entry",
+            "columnName": "entry",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "modifier",
+            "columnName": "modifier",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "comment",
+            "columnName": "comment",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "gradeSymbol",
+            "columnName": "grade_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weight",
+            "columnName": "weight",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "weightValue",
+            "columnName": "weightValue",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesSummary",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_predicted_grade_notified` INTEGER NOT NULL, `is_final_grade_notified` INTEGER NOT NULL, `predicted_grade_last_change` INTEGER NOT NULL, `final_grade_last_change` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `position` INTEGER NOT NULL, `subject` TEXT NOT NULL, `predicted_grade` TEXT NOT NULL, `final_grade` TEXT NOT NULL, `proposed_points` TEXT NOT NULL, `final_points` TEXT NOT NULL, `points_sum` TEXT NOT NULL, `average` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPredictedGradeNotified",
+            "columnName": "is_predicted_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isFinalGradeNotified",
+            "columnName": "is_final_grade_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGradeLastChange",
+            "columnName": "predicted_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGradeLastChange",
+            "columnName": "final_grade_last_change",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "predictedGrade",
+            "columnName": "predicted_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalGrade",
+            "columnName": "final_grade",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "proposedPoints",
+            "columnName": "proposed_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "finalPoints",
+            "columnName": "final_points",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pointsSum",
+            "columnName": "points_sum",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "average",
+            "columnName": "average",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `grade` INTEGER NOT NULL, `amount` INTEGER NOT NULL, `is_semester` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "grade",
+            "columnName": "grade",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "amount",
+            "columnName": "amount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semester",
+            "columnName": "is_semester",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "GradesPointsStatistics",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `others` REAL NOT NULL, `student` REAL NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "others",
+            "columnName": "others",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "student",
+            "columnName": "student",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Messages",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `content` TEXT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `recipient_name` TEXT NOT NULL, `subject` TEXT NOT NULL, `date` INTEGER NOT NULL, `folder_id` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `unread_by` INTEGER NOT NULL, `read_by` INTEGER NOT NULL, `removed` INTEGER NOT NULL, `has_attachments` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sender",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "recipient",
+            "columnName": "recipient_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "folderId",
+            "columnName": "folder_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unreadBy",
+            "columnName": "unread_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "readBy",
+            "columnName": "read_by",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "removed",
+            "columnName": "removed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hasAttachments",
+            "columnName": "has_attachments",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MessageAttachments",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`real_id` INTEGER NOT NULL, `message_id` INTEGER NOT NULL, `one_drive_id` TEXT NOT NULL, `url` TEXT NOT NULL, `filename` TEXT NOT NULL, PRIMARY KEY(`real_id`))",
+        "fields": [
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "messageId",
+            "columnName": "message_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "oneDriveId",
+            "columnName": "one_drive_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filename",
+            "columnName": "filename",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "real_id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Notes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_read` INTEGER NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `category` TEXT NOT NULL, `category_type` INTEGER NOT NULL, `is_points_show` INTEGER NOT NULL, `points` INTEGER NOT NULL, `content` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isRead",
+            "columnName": "is_read",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "categoryType",
+            "columnName": "category_type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPointsShow",
+            "columnName": "is_points_show",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "points",
+            "columnName": "points",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Homework",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_done` INTEGER NOT NULL, `semester_id` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `entry_date` INTEGER NOT NULL, `subject` TEXT NOT NULL, `content` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `attachments` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDone",
+            "columnName": "is_done",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "semesterId",
+            "columnName": "semester_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "entryDate",
+            "columnName": "entry_date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Subjects",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "LuckyNumbers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_notified` INTEGER NOT NULL, `student_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `lucky_number` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isNotified",
+            "columnName": "is_notified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "luckyNumber",
+            "columnName": "lucky_number",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CompletedLesson",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `diary_id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `number` INTEGER NOT NULL, `subject` TEXT NOT NULL, `topic` TEXT NOT NULL, `teacher` TEXT NOT NULL, `teacher_symbol` TEXT NOT NULL, `substitution` TEXT NOT NULL, `absence` TEXT NOT NULL, `resources` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "diaryId",
+            "columnName": "diary_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "number",
+            "columnName": "number",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacher",
+            "columnName": "teacher",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "teacherSymbol",
+            "columnName": "teacher_symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "substitution",
+            "columnName": "substitution",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "absence",
+            "columnName": "absence",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "resources",
+            "columnName": "resources",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ReportingUnits",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` INTEGER NOT NULL, `short` TEXT NOT NULL, `sender_id` INTEGER NOT NULL, `sender_name` TEXT NOT NULL, `roles` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderId",
+            "columnName": "sender_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "senderName",
+            "columnName": "sender_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "roles",
+            "columnName": "roles",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Recipients",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `real_id` TEXT NOT NULL, `name` TEXT NOT NULL, `real_name` TEXT NOT NULL, `login_id` INTEGER NOT NULL, `unit_id` INTEGER NOT NULL, `role` INTEGER NOT NULL, `hash` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realId",
+            "columnName": "real_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "realName",
+            "columnName": "real_name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "loginId",
+            "columnName": "login_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unitId",
+            "columnName": "unit_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "role",
+            "columnName": "role",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hash",
+            "columnName": "hash",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "MobileDevices",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `device_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `date` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "deviceId",
+            "columnName": "device_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "date",
+            "columnName": "date",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Teachers",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `subject` TEXT NOT NULL, `name` TEXT NOT NULL, `short_name` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subject",
+            "columnName": "subject",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortName",
+            "columnName": "short_name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "School",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `student_id` INTEGER NOT NULL, `class_id` INTEGER NOT NULL, `name` TEXT NOT NULL, `address` TEXT NOT NULL, `contact` TEXT NOT NULL, `headmaster` TEXT NOT NULL, `pedagogue` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "studentId",
+            "columnName": "student_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "classId",
+            "columnName": "class_id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address",
+            "columnName": "address",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contact",
+            "columnName": "contact",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "headmaster",
+            "columnName": "headmaster",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pedagogue",
+            "columnName": "pedagogue",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'b24d2d9662e26dd31f2eea78a297558c')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt b/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
new file mode 100644
index 000000000..8c4354d9a
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/TestDispatchersProvider.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data
+
+import io.github.wulkanowy.utils.DispatchersProvider
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+class TestDispatchersProvider : DispatchersProvider() {
+
+    override val backgroundThread: CoroutineDispatcher
+        get() = Dispatchers.Unconfined
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
index 0bbcc4271..b312048d5 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration12Test.kt
@@ -4,6 +4,7 @@ import android.content.ContentValues
 import android.database.sqlite.SQLiteDatabase.CONFLICT_FAIL
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.test.assertEquals
@@ -29,7 +30,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
+        val students = runBlocking { db.studentDao.loadAll() }
 
         assertEquals(2, students.size)
 
@@ -58,7 +59,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
+        val students = runBlocking { db.studentDao.loadAll() }
 
         assertEquals(1, students.size)
 
@@ -84,7 +85,7 @@ class Migration12Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 12, true, Migration12())
 
         val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
+        val students = runBlocking { db.studentDao.loadAll() }
 
         assertEquals(3, students.size)
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
index 8311f94b5..15e99f5f9 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration13Test.kt
@@ -5,11 +5,11 @@ import android.database.sqlite.SQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
 import io.github.wulkanowy.data.db.Converters
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
+import java.time.LocalDate.of
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -27,7 +27,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
+        val students = runBlocking { db.studentDao.loadAll() }
 
         assertEquals(3, students.size)
 
@@ -61,7 +61,7 @@ class Migration13Test : AbstractMigrationTest() {
         helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val db = getMigratedRoomDatabase()
-        val students = db.studentDao.loadAll().blockingGet()
+        val students = runBlocking { db.studentDao.loadAll() }
 
         assertEquals(2, students.size)
 
@@ -104,45 +104,45 @@ class Migration13Test : AbstractMigrationTest() {
         val db = helper.runMigrationsAndValidate(dbName, 13, true, Migration13())
 
         val semesters1 = getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 1 AND class_id = 5")
-        assertTrue { semesters1.single { it.isCurrent }.isCurrent }
+        assertTrue { semesters1.single { it.second }.second }
         semesters1[0].run {
-            assertFalse(isCurrent)
-            assertEquals(1, semesterId)
-            assertEquals(1, diaryId)
+            assertFalse(second)
+            assertEquals(1, first.semesterId)
+            assertEquals(1, first.diaryId)
         }
         semesters1[2].run {
-            assertFalse(isCurrent)
-            assertEquals(3, semesterId)
-            assertEquals(2, diaryId)
+            assertFalse(second)
+            assertEquals(3, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
         semesters1[3].run {
-            assertTrue(isCurrent)
-            assertEquals(4, semesterId)
-            assertEquals(2, diaryId)
+            assertTrue(second)
+            assertEquals(4, first.semesterId)
+            assertEquals(2, first.diaryId)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertEquals(1970, it[0].schoolYear)
-            assertEquals(of(1970, 1, 1), it[0].end)
-            assertEquals(of(1970, 1, 1), it[0].start)
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
+            assertTrue { semesters.single { it.second }.second }
+            assertEquals(1970, semesters[0].first.schoolYear)
+            assertEquals(of(1970, 1, 1), semesters[0].first.end)
+            assertEquals(of(1970, 1, 1), semesters[0].first.start)
+            assertFalse(semesters[0].second)
+            assertFalse(semesters[1].second)
+            assertFalse(semesters[2].second)
+            assertTrue(semesters[3].second)
         }
 
-        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let {
-            assertTrue { it.single { it.isCurrent }.isCurrent }
-            assertFalse(it[0].isCurrent)
-            assertFalse(it[1].isCurrent)
-            assertFalse(it[2].isCurrent)
-            assertTrue(it[3].isCurrent)
+        getSemesters(db, "SELECT * FROM Semesters WHERE student_id = 2 AND class_id = 5").let { semesters ->
+            assertTrue { semesters.single { it.second }.second }
+            assertFalse(semesters[0].second)
+            assertFalse(semesters[1].second)
+            assertFalse(semesters[2].second)
+            assertTrue(semesters[3].second)
         }
     }
 
-    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Semester> {
-        val semesters = mutableListOf<Semester>()
+    private fun getSemesters(db: SupportSQLiteDatabase, query: String): List<Pair<Semester, Boolean>> {
+        val semesters = mutableListOf<Pair<Semester, Boolean>>()
 
         val cursor = db.query(query)
         if (cursor.moveToFirst()) {
@@ -153,13 +153,12 @@ class Migration13Test : AbstractMigrationTest() {
                     diaryName = cursor.getString(3),
                     semesterId = cursor.getInt(4),
                     semesterName = cursor.getInt(5),
-                    isCurrent = cursor.getInt(6) == 1,
                     classId = cursor.getInt(7),
                     unitId = cursor.getInt(8),
                     schoolYear = cursor.getInt(9),
                     start = Converters().timestampToDate(cursor.getLong(10))!!,
                     end = Converters().timestampToDate(cursor.getLong(11))!!
-                ))
+                ) to (cursor.getInt(6) == 1))
             } while (cursor.moveToNext())
         }
         return semesters.toList()
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
new file mode 100644
index 000000000..759552589
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/db/migrations/Migration27Test.kt
@@ -0,0 +1,124 @@
+package io.github.wulkanowy.data.db.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import kotlin.random.Random
+
+class Migration27Test : AbstractMigrationTest() {
+
+    @Test
+    fun userWithoutCorrespondingUnit() {
+        with(helper.createDatabase(dbName, 26)) {
+            createStudent(this, 321, 123, "Jan Student")
+            createUnit(this, 9999, "Unit Jan")
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+
+        val db = getMigratedRoomDatabase()
+        val students = runBlocking { db.studentDao.loadAll() }
+
+        assertEquals(1, students.size)
+
+        with(students[0]) {
+            assertEquals(321, id)
+            assertEquals(123, userLoginId)
+            assertEquals("Student Jan", userName)
+        }
+    }
+
+    @Test
+    fun userWithCorrespondingUnit() {
+        with(helper.createDatabase(dbName, 26)) {
+            createStudent(this, 1, 2, "Jan Kowalski Student")
+            createUnit(this, 2, "Unit Jan")
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+
+        val db = getMigratedRoomDatabase()
+        val students = runBlocking { db.studentDao.loadAll() }
+
+        assertEquals(1, students.size)
+
+        with(students[0]) {
+            assertEquals(1, id)
+            assertEquals(2, userLoginId)
+            assertEquals("Unit Jan", userName)
+        }
+    }
+
+    @Test
+    fun studentAccountAndParentAccountWithCorrespondingUnits() {
+        with(helper.createDatabase(dbName, 26)) {
+            createStudent(this, 1, 222, "Jan Student")
+            createStudent(this, 2, 333, "Jan Parent")
+            createUnit(this, 222, "Unit Jan")
+            createUnit(this, 333, "Unit Tomasz")
+            close()
+        }
+
+        helper.runMigrationsAndValidate(dbName, 27, true, Migration27())
+
+        val db = getMigratedRoomDatabase()
+        val students = runBlocking { db.studentDao.loadAll() }
+
+        assertEquals(2, students.size)
+
+        with(students[0]) {
+            assertEquals(1, id)
+            assertEquals(222, userLoginId)
+            assertEquals("Unit Jan", userName)
+        }
+        with(students[1]) {
+            assertEquals(2, id)
+            assertEquals(333, userLoginId)
+            assertEquals("Unit Tomasz", userName)
+        }
+    }
+
+    private fun createStudent(db: SupportSQLiteDatabase, id: Long, userLoginId: Int, studentName: String) {
+        db.insert("Students", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("id", id)
+            put("scrapper_base_url", "https://fakelog.cf")
+            put("mobile_base_url", "")
+            put("login_mode", "SCRAPPER")
+            put("login_type", "STANDARD")
+            put("certificate_key", "")
+            put("private_key", "")
+            put("is_parent", false)
+            put("email", "jan@fakelog.cf")
+            put("password", "******")
+            put("symbol", "Default")
+            put("school_short", "")
+            put("class_name", "")
+            put("student_id", Random.nextInt())
+            put("class_id", Random.nextInt())
+            put("school_id", "123")
+            put("school_name", "Wulkan first class school")
+            put("is_current", false)
+            put("registration_date", "0")
+
+            put("user_login_id", userLoginId)
+            put("student_name", studentName)
+        })
+    }
+
+    private fun createUnit(db: SupportSQLiteDatabase, senderId: Int, senderName: String) {
+        db.insert("ReportingUnits", SQLiteDatabase.CONFLICT_FAIL, ContentValues().apply {
+            put("student_id", Random.nextInt())
+            put("real_id", Random.nextInt())
+            put("short", "SHORT")
+            put("roles", "[0]")
+
+            put("sender_id", senderId)
+            put("sender_name", senderName)
+        })
+    }
+}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
new file mode 100644
index 000000000..04d13be4b
--- /dev/null
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestEntityCreator.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.repositories
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import java.time.LocalDate.now
+import java.time.LocalDateTime
+
+fun getStudent(): Student {
+    return Student(
+        email = "test",
+        password = "test123",
+        schoolSymbol = "23",
+        scrapperBaseUrl = "fakelog.cf",
+        loginType = "AUTO",
+        isCurrent = true,
+        userName = "",
+        studentName = "",
+        schoolShortName = "",
+        schoolName = "",
+        studentId = 0,
+        classId = 1,
+        symbol = "",
+        registrationDate = LocalDateTime.now(),
+        className = "",
+        loginMode = "API",
+        certificateKey = "",
+        privateKey = "",
+        mobileBaseUrl = "",
+        userLoginId = 0,
+        isParent = false
+    )
+}
+
+fun getSemester() = Semester(
+    semesterId = 1,
+    studentId = 1,
+    classId = 1,
+    diaryId = 2,
+    diaryName = "",
+    end = now(),
+    schoolYear = 2019,
+    semesterName = 1,
+    start = now(),
+    unitId = 1
+)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
deleted file mode 100644
index 7dc93c4a4..000000000
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/TestInternetObservingStrategy.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
-import io.reactivex.Observable
-import io.reactivex.Single
-
-class TestInternetObservingStrategy : InternetObservingStrategy {
-
-    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
-        return Single.just(true)
-    }
-
-    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
-        return Observable.just(true)
-    }
-
-    override fun getDefaultPingHost() = "localhost"
-}
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
index 69502e742..fa1289869 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocalTest.kt
@@ -6,12 +6,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,20 +37,47 @@ class AttendanceLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        attendanceLocal.saveAttendance(listOf(
-                Attendance(1, 2, LocalDate.of(2018, 9, 10), 0, "", "", false, false, false, false, false, false),
-                Attendance(1, 2, LocalDate.of(2018, 9, 14), 0, "", "", false, false, false, false, false, false),
-                Attendance(1, 2, LocalDate.of(2018, 9, 17), 0, "", "", false, false, false, false, false, false)
-        ))
+        val list = listOf(
+            getAttendanceEntity(
+                of(2018, 9, 10),
+                SentExcuseStatus.ACCEPTED
+            ),
+            getAttendanceEntity(
+                of(2018, 9, 14),
+                SentExcuseStatus.WAITING
+            ),
+            getAttendanceEntity(
+                of(2018, 9, 17),
+                SentExcuseStatus.ACCEPTED
+            )
+        )
+        runBlocking { attendanceLocal.saveAttendance(list) }
 
-        val attendance = attendanceLocal
-            .getAttendance(Semester(1, 2, "", 1, 3, 2019, true, now(), now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
+        val attendance = runBlocking { attendanceLocal.getAttendance(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
         assertEquals(2, attendance.size)
-        assertEquals(attendance[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(attendance[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(attendance[0].date, of(2018, 9, 10))
+        assertEquals(attendance[1].date, of(2018, 9, 14))
     }
+
+    private fun getAttendanceEntity(
+        date: LocalDate,
+        excuseStatus: SentExcuseStatus
+    ) = Attendance(
+        studentId = 1,
+        diaryId = 2,
+        timeId = 3,
+        date = date,
+        number = 0,
+        subject = "",
+        name = "",
+        presence = false,
+        absence = false,
+        exemption = false,
+        lateness = false,
+        excused = false,
+        deleted = false,
+        excusable = false,
+        excuseStatus = excuseStatus.name
+    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
index 356073e8e..ca7d0b1be 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocalTest.kt
@@ -6,11 +6,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -22,7 +26,8 @@ class CompletedLessonsLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room
+            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         completedLessonsLocal = CompletedLessonsLocal(testDb.completedLessonsDao)
     }
@@ -34,21 +39,18 @@ class CompletedLessonsLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        completedLessonsLocal.saveCompletedLessons(listOf(
-            getCompletedLesson(LocalDate.of(2018, 9, 10), 1),
-            getCompletedLesson(LocalDate.of(2018, 9, 14), 2),
-            getCompletedLesson(LocalDate.of(2018, 9, 17), 3)
-        ))
+        val list = listOf(
+            getCompletedLesson(of(2018, 9, 10), 1),
+            getCompletedLesson(of(2018, 9, 14), 2),
+            getCompletedLesson(of(2018, 9, 17), 3)
+        )
+        runBlocking { completedLessonsLocal.saveCompletedLessons(list) }
 
-        val completed = completedLessonsLocal
-            .getCompletedLessons(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                LocalDate.of(2018, 9, 10),
-                LocalDate.of(2018, 9, 14)
-            )
-            .blockingGet()
+        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
+        val completed = runBlocking { completedLessonsLocal.getCompletedLessons(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
         assertEquals(2, completed.size)
-        assertEquals(completed[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(completed[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(completed[0].date, of(2018, 9, 10))
+        assertEquals(completed[1].date, of(2018, 9, 14))
     }
 
     private fun getCompletedLesson(date: LocalDate, number: Int): CompletedLesson {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
index fb76306d9..14b29c9f6 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/exam/ExamLocalTest.kt
@@ -6,11 +6,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -33,20 +36,17 @@ class ExamLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        examLocal.saveExams(listOf(
-                Exam(1, 2, LocalDate.of(2018, 9, 10), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 14), LocalDate.now(), "", "", "", "", "", ""),
-                Exam(1, 2, LocalDate.of(2018, 9, 17), LocalDate.now(), "", "", "", "", "", "")
-        ))
+        val list = listOf(
+            Exam(1, 2, of(2018, 9, 10), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 14), now(), "", "", "", "", "", ""),
+            Exam(1, 2, of(2018, 9, 17), now(), "", "", "", "", "", "")
+        )
+        runBlocking { examLocal.saveExams(list) }
 
-        val exams = examLocal
-            .getExams(Semester(1, 2, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-                        LocalDate.of(2018, 9, 10),
-                        LocalDate.of(2018, 9, 14)
-                )
-                .blockingGet()
+        val semester = Semester(1, 2, "", 1, 3, 2019, now(), now(), 1, 1)
+        val exams = runBlocking { examLocal.getExams(semester, of(2018, 9, 10), of(2018, 9, 14)).first() }
         assertEquals(2, exams.size)
-        assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
-        assertEquals(exams[1].date, LocalDate.of(2018, 9, 14))
+        assertEquals(exams[0].date, of(2018, 9, 10))
+        assertEquals(exams[1].date, of(2018, 9, 14))
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
index 954d0eea2..946ebf8ea 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeLocalTest.kt
@@ -5,12 +5,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
+import java.time.LocalDate
+import java.time.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -22,9 +24,10 @@ class GradeLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room
+            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
     }
 
     @After
@@ -34,17 +37,16 @@ class GradeLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        gradeLocal.saveGrades(listOf(
+        val list = listOf(
             createGradeLocal(5, 3.0, LocalDate.of(2018, 9, 10), "", 1),
             createGradeLocal(4, 4.0, LocalDate.of(2019, 2, 27), "", 2),
             createGradeLocal(3, 5.0, LocalDate.of(2019, 2, 28), "", 2)
-        ))
+        )
+        runBlocking { gradeLocal.saveGrades(list) }
 
-        val semester = Semester(1, 2, "", 2019, 2, 1, true, now(), now(), 1, 1)
+        val semester = Semester(1, 2, "", 2019, 2, 1, now(), now(), 1, 1)
 
-        val grades = gradeLocal
-            .getGrades(semester)
-            .blockingGet()
+        val grades = runBlocking { gradeLocal.getGradesDetails(semester).first() }
 
         assertEquals(2, grades.size)
         assertEquals(grades[0].date, LocalDate.of(2019, 2, 27))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
index 711e29118..5cf9c2196 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/GradeRepositoryTest.kt
@@ -5,26 +5,25 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.AppDatabase
+import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
 import io.github.wulkanowy.sdk.Sdk
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.impl.annotations.SpyK
-import io.mockk.just
-import io.mockk.runs
-import io.reactivex.Single
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate.of
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDate.of
+import java.time.LocalDateTime
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
@@ -33,19 +32,12 @@ import kotlin.test.assertTrue
 @RunWith(AndroidJUnit4::class)
 class GradeRepositoryTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(TestInternetObservingStrategy())
-        .build()
-
     @MockK
     private lateinit var semesterMock: Semester
 
-    @MockK
     private lateinit var studentMock: Student
 
+    @MockK
     private lateinit var gradeRemote: GradeRemote
 
     private lateinit var gradeLocal: GradeLocal
@@ -56,15 +48,13 @@ class GradeRepositoryTest {
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
-        gradeLocal = GradeLocal(testDb.gradeDao)
-        gradeRemote = GradeRemote(mockSdk)
+        gradeLocal = GradeLocal(testDb.gradeDao, testDb.gradeSummaryDao)
+        studentMock = getStudentMock()
 
-        every { studentMock.registrationDate } returns LocalDateTime.of(2019, 2, 27, 12, 0)
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
-        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -74,15 +64,18 @@ class GradeRepositoryTest {
 
     @Test
     fun markOlderThanRegisterDateAsRead() {
-        every { mockSdk.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
-            createGradeApi(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
-            createGradeApi(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
-            createGradeApi(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
-        ))
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
+            createGradeLocal(5, 4.0, of(2019, 2, 25), "Ocena pojawiła się"),
+            createGradeLocal(5, 4.0, of(2019, 2, 26), "przed zalogowanie w aplikacji"),
+            createGradeLocal(5, 4.0, of(2019, 2, 27), "Ocena z dnia logowania"),
+            createGradeLocal(5, 4.0, of(2019, 2, 28), "Ocena jeszcze nowsza")
+        ) to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
+        }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -92,21 +85,25 @@ class GradeRepositoryTest {
 
     @Test
     fun mitigateOldGradesNotifications() {
-        gradeLocal.saveGrades(listOf(
+        val list = listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Jedna ocena"),
             createGradeLocal(4, 4.0, of(2019, 2, 26), "Druga"),
             createGradeLocal(3, 5.0, of(2019, 2, 27), "Trzecia")
-        ))
+        )
+        runBlocking { gradeLocal.saveGrades(list) }
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
-            createGradeApi(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
-            createGradeApi(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
-            createGradeApi(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
-        ))
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
+            createGradeLocal(5, 2.0, of(2019, 2, 25), "Ocena ma datę, jest inna, ale nie zostanie powiadomiona"),
+            createGradeLocal(4, 3.0, of(2019, 2, 26), "starszą niż ostatnia lokalnie"),
+            createGradeLocal(3, 4.0, of(2019, 2, 27), "Ta jest z tego samego dnia co ostatnia lokalnie"),
+            createGradeLocal(2, 5.0, of(2019, 2, 28), "Ta jest już w ogóle nowa")
+        ) to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet().sortedByDescending { it.date }
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!.first.sortedByDescending { it.date }
+        }
 
         assertFalse { grades[0].isRead }
         assertFalse { grades[1].isRead }
@@ -116,70 +113,109 @@ class GradeRepositoryTest {
 
     @Test
     fun subtractLocaleDuplicateGrades() {
-        gradeLocal.saveGrades(listOf(
+        val list = listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        )
+        runBlocking { gradeLocal.saveGrades(list) }
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ) to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!
+        }
 
-        assertEquals(2, grades.size)
+        assertEquals(2, grades.first.size)
     }
 
     @Test
     fun subtractRemoteDuplicateGrades() {
-        gradeLocal.saveGrades(listOf(
+        val list = listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        )
+        runBlocking { gradeLocal.saveGrades(list) }
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ) to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!
+        }
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
     fun emptyLocal() {
-        gradeLocal.saveGrades(listOf())
+        runBlocking { gradeLocal.saveGrades(listOf()) }
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf(
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
-            createGradeApi(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (listOf(
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
+            createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
+        ) to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!
+        }
 
-        assertEquals(3, grades.size)
+        assertEquals(3, grades.first.size)
     }
 
     @Test
     fun emptyRemote() {
-        gradeLocal.saveGrades(listOf(
+        val list = listOf(
             createGradeLocal(5, 3.0, of(2019, 2, 25), "Taka sama ocena"),
             createGradeLocal(3, 5.0, of(2019, 2, 26), "Jakaś inna ocena")
-        ))
+        )
+        runBlocking { gradeLocal.saveGrades(list) }
 
-        every { mockSdk.getGrades(1) } returns Single.just(listOf())
+        coEvery { gradeRemote.getGrades(studentMock, semesterMock) } returns (emptyList<Grade>() to emptyList())
 
-        val grades = GradeRepository(settings, gradeLocal, gradeRemote)
-            .getGrades(studentMock, semesterMock, true).blockingGet()
+        val grades = runBlocking {
+            GradeRepository(gradeLocal, gradeRemote)
+                .getGrades(studentMock, semesterMock, true)
+                .filter { it.status == Status.SUCCESS }.first().data!!
+        }
 
-        assertEquals(0, grades.size)
+        assertEquals(0, grades.first.size)
     }
+
+    private fun getStudentMock() = Student(
+        scrapperBaseUrl = "http://fakelog.cf",
+        email = "jan@fakelog.cf",
+        certificateKey = "",
+        classId = 0,
+        className = "",
+        isCurrent = false,
+        isParent = false,
+        loginMode = Sdk.Mode.SCRAPPER.name,
+        loginType = "STANDARD",
+        mobileBaseUrl = "",
+        password = "",
+        privateKey = "",
+        registrationDate = LocalDateTime.of(2019, 2, 27, 12, 0),
+        schoolName = "",
+        schoolShortName = "test",
+        schoolSymbol = "",
+        studentId = 0,
+        studentName = "",
+        symbol = "",
+        userLoginId = 0,
+        userName = ""
+    )
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
index 9146934bf..629c24321 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/grade/TestGradeEntityCreator.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import io.github.wulkanowy.sdk.pojo.Grade as GradeRemote
 import io.github.wulkanowy.data.db.entities.Grade as GradeLocal
 
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
index f8aa58158..197d2d0ec 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocalTest.kt
@@ -7,11 +7,13 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,48 +37,45 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subject() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
+        val list = listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        ))
+        )
+        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Matematyka"
-        ).blockingGet()
+        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
         assertEquals(1, stats.size)
         assertEquals(stats[0].subject, "Matematyka")
     }
 
     @Test
     fun saveAndRead_all() {
-        gradeStatisticsLocal.saveGradesStatistics(listOf(
+        val list = listOf(
             getGradeStatistics("Matematyka", 2, 1),
             getGradeStatistics("Chemia", 2, 1),
             getGradeStatistics("Fizyka", 1, 2)
-        ))
+        )
+        runBlocking { gradeStatisticsLocal.saveGradesStatistics(list) }
 
-        val stats = gradeStatisticsLocal.getGradesStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1), false,
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(1, stats.size)
-        assertEquals(stats[0].subject, "Wszystkie")
+        val stats = runBlocking { gradeStatisticsLocal.getGradesStatistics(getSemester(), false).first() }
+        assertEquals(2, stats.size)
+//        assertEquals(3, stats.size)
+//        assertEquals(stats[0].subject, "Wszystkie") // now in main repo
+        assertEquals(stats[0].subject, "Matematyka")
+        assertEquals(stats[1].subject, "Chemia")
     }
 
     @Test
     fun saveAndRead_points() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf(
+        val list = listOf(
             getGradePointsStatistics("Matematyka", 2, 1),
             getGradePointsStatistics("Chemia", 2, 1),
             getGradePointsStatistics("Fizyka", 1, 2)
-        ))
+        )
+        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(list) }
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        with(stats) {
+        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
+        with(stats[0]) {
             assertEquals(subject, "Matematyka")
             assertEquals(others, 5.0)
             assertEquals(student, 5.0)
@@ -85,24 +84,22 @@ class GradeStatisticsLocalTest {
 
     @Test
     fun saveAndRead_subjectEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Matematyka"
-        ).blockingGet()
-        assertEquals(null, stats)
+        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
+        assertEquals(emptyList(), stats)
     }
 
     @Test
     fun saveAndRead_allEmpty() {
-        gradeStatisticsLocal.saveGradesPointsStatistics(listOf())
+        runBlocking { gradeStatisticsLocal.saveGradesPointsStatistics(listOf()) }
 
-        val stats = gradeStatisticsLocal.getGradesPointsStatistics(
-            Semester(2, 2, "", 2019, 1, 2, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            "Wszystkie"
-        ).blockingGet()
-        assertEquals(null, stats)
+        val stats = runBlocking { gradeStatisticsLocal.getGradesPointsStatistics(getSemester()).first() }
+        assertEquals(emptyList(), stats)
+    }
+
+    private fun getSemester(): Semester {
+        return Semester(2, 2, "", 2019, 1, 2, now(), now(), 1, 1)
     }
 
     private fun getGradeStatistics(subject: String, studentId: Int, semesterId: Int): GradeStatistics {
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
index 77ddafb9c..ca38b1fee 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocalTest.kt
@@ -5,12 +5,15 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
+import java.time.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -22,7 +25,8 @@ class LuckyNumberLocalTest {
 
     @Before
     fun createDb() {
-        testDb = Room.inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
+        testDb = Room
+            .inMemoryDatabaseBuilder(ApplicationProvider.getApplicationContext(), AppDatabase::class.java)
             .build()
         luckyNumberLocal = LuckyNumberLocal(testDb.luckyNumberDao)
     }
@@ -34,14 +38,14 @@ class LuckyNumberLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        luckyNumberLocal.saveLuckyNumber(LuckyNumber(1, LocalDate.of(2019, 1, 20), 14))
+        val number = LuckyNumber(1, LocalDate.of(2019, 1, 20), 14)
+        runBlocking { luckyNumberLocal.saveLuckyNumber(number) }
 
-        val luckyNumber = luckyNumberLocal.getLuckyNumber(Semester(1, 1, "", 1, 3, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            LocalDate.of(2019, 1, 20)
-        ).blockingGet()
+        val student = Student("", "", "", "", "", "", false, "", "", "", 1, 1, "", "", "", "", "", "", 1, false, now())
+        val luckyNumber = runBlocking { luckyNumberLocal.getLuckyNumber(student, LocalDate.of(2019, 1, 20)).first() }
 
-        assertEquals(1, luckyNumber.studentId)
-        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber.date)
-        assertEquals(14, luckyNumber.luckyNumber)
+        assertEquals(1, luckyNumber?.studentId)
+        assertEquals(LocalDate.of(2019, 1, 20), luckyNumber?.date)
+        assertEquals(14, luckyNumber?.luckyNumber)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
index a394927bd..6bd1959bd 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocalTest.kt
@@ -7,11 +7,12 @@ import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDateTime
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -35,17 +36,21 @@ class RecipientLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        recipientLocal.saveRecipients(listOf(
+        val list = listOf(
             Recipient(1, "2rPracownik", "Kowalski Jan", "Kowalski Jan [KJ] - Pracownik (Fake123456)", 3, 4, 2, "hash"),
             Recipient(1, "3rPracownik", "Kowalska Karolina", "Kowalska Karolina [KK] - Pracownik (Fake123456)", 4, 4, 2, "hash"),
             Recipient(1, "4rPracownik", "Krupa Stanisław", "Krupa Stanisław [KS] - Uczeń (Fake123456)", 5, 4, 1, "hash")
-        ))
+        )
+        runBlocking { recipientLocal.saveRecipients(list) }
 
-        val recipients = recipientLocal.getRecipients(
-            Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", 1, true, LocalDateTime.now()),
-            2,
-            ReportingUnit(1, 4, "", 0, "", emptyList())
-        ).blockingGet()
+        val student = Student("fakelog.cf", "AUTO", "", "", "", "", false, "", "", "", 1, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
+        val recipients = runBlocking {
+            recipientLocal.getRecipients(
+                student = student,
+                role = 2,
+                unit = ReportingUnit(1, 4, "", 0, "", emptyList())
+            )
+        }
 
         assertEquals(2, recipients.size)
         assertEquals(1, recipients[0].studentId)
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
index 6ae404b2b..d68f15a80 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/student/StudentLocalTest.kt
@@ -4,14 +4,14 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.github.wulkanowy.data.TestDispatchersProvider
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.repositories.getStudent
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDateTime.now
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -21,15 +21,14 @@ class StudentLocalTest {
 
     private lateinit var testDb: AppDatabase
 
-    private lateinit var sharedProvider: SharedPrefProvider
+    private val student = getStudent()
 
     @Before
     fun createDb() {
         val context = ApplicationProvider.getApplicationContext<Context>()
         testDb = Room.inMemoryDatabaseBuilder(context, AppDatabase::class.java)
             .build()
-        sharedProvider = SharedPrefProvider(context.getSharedPreferences("TEST", Context.MODE_PRIVATE))
-        studentLocal = StudentLocal(testDb.studentDao, context)
+        studentLocal = StudentLocal(testDb.studentDao, TestDispatchersProvider(), context)
     }
 
     @After
@@ -39,10 +38,9 @@ class StudentLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        studentLocal.saveStudents(listOf(Student(email = "test", password = "test123", schoolSymbol = "23", scrapperBaseUrl = "fakelog.cf", loginType = "AUTO", isCurrent = true, studentName = "", schoolName = "", studentId = 0, classId = 1, symbol = "", registrationDate = now(), className = "", loginMode = "API", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 0, isParent = false)))
-            .blockingGet()
+        runBlocking { studentLocal.saveStudents(listOf(student)) }
 
-        val student = studentLocal.getCurrentStudent(true).blockingGet()
-        assertEquals("23", student.schoolSymbol)
+        val student = runBlocking { studentLocal.getCurrentStudent(true) }
+        assertEquals("23", student?.schoolSymbol)
     }
 }
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
index e2ce2255c..dddf6464c 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TestTimetableEntityCreator.kt
@@ -1,9 +1,9 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.LocalDateTime.now
-import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
+import java.time.LocalDateTime
+import java.time.LocalDateTime.now
 import io.github.wulkanowy.data.db.entities.Timetable as TimetableLocal
+import io.github.wulkanowy.sdk.pojo.Timetable as TimetableRemote
 
 fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", subject: String = "", teacher: String = "", changes: Boolean = false): TimetableLocal {
     return TimetableLocal(
@@ -21,6 +21,7 @@ fun createTimetableLocal(start: LocalDateTime, number: Int, room: String = "", s
         teacher = teacher,
         teacherOld = "",
         info = "",
+        isStudentPlan = true,
         changes = changes,
         canceled = false
     )
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
index 6406d7435..e793212e6 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocalTest.kt
@@ -5,12 +5,14 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.entities.Semester
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.of
+import java.time.LocalDate
+import java.time.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @RunWith(AndroidJUnit4::class)
@@ -34,17 +36,21 @@ class TimetableLocalTest {
 
     @Test
     fun saveAndReadTest() {
-        timetableDb.saveTimetable(listOf(
+        val list = listOf(
             createTimetableLocal(of(2018, 9, 10, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 14, 0, 0, 0), 1),
             createTimetableLocal(of(2018, 9, 17, 0, 0, 0), 1)
-        ))
+        )
+        runBlocking { timetableDb.saveTimetable(list) }
 
-        val exams = timetableDb.getTimetable(
-            Semester(1, 2, "", 1, 1, 2019, true, LocalDate.now(), LocalDate.now(), 1, 1),
-            LocalDate.of(2018, 9, 10),
-            LocalDate.of(2018, 9, 14)
-        ).blockingGet()
+        val semester = Semester(1, 2, "", 1, 1, 2019, LocalDate.now(), LocalDate.now(), 1, 1)
+        val exams = runBlocking {
+            timetableDb.getTimetable(
+                semester = semester,
+                startDate = LocalDate.of(2018, 9, 10),
+                endDate = LocalDate.of(2018, 9, 14)
+            ).first()
+        }
 
         assertEquals(2, exams.size)
         assertEquals(exams[0].date, LocalDate.of(2018, 9, 10))
diff --git a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
index 565425d43..1bd3c4679 100644
--- a/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
+++ b/app/src/androidTest/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepositoryTest.kt
@@ -5,55 +5,48 @@ import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.AppDatabase
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.TestInternetObservingStrategy
-import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.data.repositories.getSemester
+import io.github.wulkanowy.data.repositories.getStudent
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.mockk.MockKAnnotations
-import io.mockk.every
+import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime.of
+import java.time.LocalDate
+import java.time.LocalDateTime.of
 import kotlin.test.assertEquals
 
 @SdkSuppress(minSdkVersion = P)
 @RunWith(AndroidJUnit4::class)
 class TimetableRepositoryTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
-
-    private val settings = InternetObservingSettings.builder()
-        .strategy(TestInternetObservingStrategy())
-        .build()
+    @MockK(relaxed = true)
+    private lateinit var timetableNotificationSchedulerHelper: TimetableNotificationSchedulerHelper
 
     @MockK
-    private lateinit var semesterMock: Semester
-
     private lateinit var timetableRemote: TimetableRemote
 
     private lateinit var timetableLocal: TimetableLocal
 
     private lateinit var testDb: AppDatabase
 
+    private val student = getStudent()
+
+    private val semester = getSemester()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
         testDb = Room.inMemoryDatabaseBuilder(getApplicationContext(), AppDatabase::class.java).build()
         timetableLocal = TimetableLocal(testDb.timetableDao)
-        timetableRemote = TimetableRemote(mockSdk)
-
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.diaryId } returns 2
-        every { semesterMock.schoolYear } returns 2019
-        every { semesterMock.semesterId } returns 1
-        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
     }
 
     @After
@@ -63,23 +56,31 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyRoomToCompletedFromPrevious() {
-        timetableLocal.saveTimetable(listOf(
-            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
-            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
-            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
-            createTimetableLocal(of(2019, 3, 5, 10, 30),3, "213", "W-F", "Jan Kowalski")
-        ))
+        runBlocking {
+            timetableLocal.saveTimetable(listOf(
+                createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "123", "Przyroda"),
+                createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "321", "Religia"),
+                createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "213", "W-F"),
+                createTimetableLocal(of(2019, 3, 5, 10, 30), 3, "213", "W-F", "Jan Kowalski")
+            ))
+        }
 
-        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
-            createTimetableRemote(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
-            createTimetableRemote(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
-            createTimetableRemote(of(2019, 3, 5, 10, 30), 4, "", "W-F")
-        ))
+        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
+            createTimetableLocal(of(2019, 3, 5, 8, 0), 1, "", "Przyroda"),
+            createTimetableLocal(of(2019, 3, 5, 8, 50), 2, "", "Religia"),
+            createTimetableLocal(of(2019, 3, 5, 9, 40), 3, "", "W-F"),
+            createTimetableLocal(of(2019, 3, 5, 10, 30), 4, "", "W-F")
+        )
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 3, 5), LocalDate.of(2019, 3, 5), true)
-            .blockingGet()
+        val lessons = runBlocking {
+            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
+                student = student,
+                semester = semester,
+                start = LocalDate.of(2019, 3, 5),
+                end = LocalDate.of(2019, 3, 5),
+                forceRefresh = true
+            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
+        }
 
         assertEquals(4, lessons.size)
         assertEquals("123", lessons[0].room)
@@ -89,7 +90,7 @@ class TimetableRepositoryTest {
 
     @Test
     fun copyTeacherToCompletedFromPrevious() {
-        timetableLocal.saveTimetable(listOf(
+        val list = listOf(
             createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Paweł Poniedziałkowski", false),
             createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Wtorkowska", true),
@@ -104,28 +105,35 @@ class TimetableRepositoryTest {
             createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "", false),
             createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "", true),
             createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "", true)
-        ))
+        )
+        runBlocking { timetableLocal.saveTimetable(list) }
 
-        every { mockSdk.getTimetable(any(), any()) } returns Single.just(listOf(
-            createTimetableRemote(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
-            createTimetableRemote(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
-            createTimetableRemote(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
-            createTimetableRemote(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
+        coEvery { timetableRemote.getTimetable(student, semester, any(), any()) } returns listOf(
+            createTimetableLocal(of(2019, 12, 23, 8, 0), 1, "123", "Matematyka", "Paweł Poniedziałkowski", false),
+            createTimetableLocal(of(2019, 12, 23, 8, 50), 2, "124", "Matematyka", "Jakub Wtorkowski", true),
+            createTimetableLocal(of(2019, 12, 23, 9, 40), 3, "125", "Język polski", "Joanna Poniedziałkowska", false),
+            createTimetableLocal(of(2019, 12, 23, 10, 40), 4, "126", "Język polski", "Joanna Wtorkowska", true),
 
-            createTimetableRemote(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
-            createTimetableRemote(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
-            createTimetableRemote(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
-            createTimetableRemote(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
+            createTimetableLocal(of(2019, 12, 24, 8, 0), 1, "123", "Język polski", "", false),
+            createTimetableLocal(of(2019, 12, 24, 8, 50), 2, "124", "Język polski", "", true),
+            createTimetableLocal(of(2019, 12, 24, 9, 40), 3, "125", "Język polski", "", false),
+            createTimetableLocal(of(2019, 12, 24, 10, 40), 4, "126", "Język polski", "", true),
 
-            createTimetableRemote(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
-            createTimetableRemote(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
-            createTimetableRemote(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
-            createTimetableRemote(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
-        ))
+            createTimetableLocal(of(2019, 12, 25, 8, 0), 1, "123", "Matematyka", "Paweł Środowski", false),
+            createTimetableLocal(of(2019, 12, 25, 8, 50), 2, "124", "Matematyka", "Paweł Czwartkowski", true),
+            createTimetableLocal(of(2019, 12, 25, 9, 40), 3, "125", "Matematyka", "Paweł Środowski", false),
+            createTimetableLocal(of(2019, 12, 25, 10, 40), 4, "126", "Matematyka", "Paweł Czwartkowski", true)
+        )
 
-        val lessons = TimetableRepository(settings, timetableLocal, timetableRemote)
-            .getTimetable(semesterMock, LocalDate.of(2019, 12, 23), LocalDate.of(2019, 12, 25), true)
-            .blockingGet()
+        val lessons = runBlocking {
+            TimetableRepository(timetableLocal, timetableRemote, timetableNotificationSchedulerHelper).getTimetable(
+                student = student,
+                semester = semester,
+                start = LocalDate.of(2019, 12, 23),
+                end = LocalDate.of(2019, 12, 25),
+                forceRefresh = true
+            ).filter { it.status == Status.SUCCESS }.first().data.orEmpty()
+        }
 
         assertEquals(12, lessons.size)
 
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml
new file mode 100644
index 000000000..832eba838
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_grade.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="30.434782"
+    android:viewportHeight="30.434782">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 8.131 2.131 C 7.601 2.131 7.092 2.342 6.717 2.717 C 6.342 3.092 6.131 3.601 6.131 4.131 L 6.131 18.131 C 6.131 18.661 6.342 19.17 6.717 19.545 C 7.092 19.92 7.601 20.131 8.131 20.131 L 16.918 20.131 C 17.252 19.39 17.712 18.714 18.277 18.131 L 8.131 18.131 L 8.131 4.131 L 22.131 4.131 L 22.131 16.1 C 22.516 16.034 22.906 16.001 23.297 16 C 23.576 16.002 23.854 16.02 24.131 16.055 L 24.131 4.131 C 24.131 3.601 23.92 3.092 23.545 2.717 C 23.17 2.342 22.661 2.131 22.131 2.131 L 8.131 2.131 Z M 2.131 6.131 L 2.131 22.131 C 2.131 22.661 2.342 23.17 2.717 23.545 C 3.092 23.92 3.601 24.131 4.131 24.131 L 16.391 24.131 C 16.329 23.757 16.297 23.379 16.297 23 C 16.299 22.709 16.319 22.419 16.357 22.131 L 4.131 22.131 L 4.131 6.131 L 2.131 6.131 Z M 14.131 6.131 C 13.601 6.131 13.092 6.342 12.717 6.717 C 12.342 7.092 12.131 7.601 12.131 8.131 L 12.131 14.131 C 12.131 15.231 13.031 16.131 14.131 16.131 L 16.131 16.131 C 16.661 16.131 17.17 15.92 17.545 15.545 C 17.92 15.17 18.131 14.661 18.131 14.131 L 18.131 12.131 C 18.131 11.601 17.92 11.092 17.545 10.717 C 17.17 10.342 16.661 10.131 16.131 10.131 L 14.131 10.131 L 14.131 8.131 L 18.131 8.131 L 18.131 6.131 L 14.131 6.131 Z M 14.131 12.131 L 16.131 12.131 L 16.131 14.131 L 14.131 14.131 L 14.131 12.131 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 20.174 28 L 20.174 18.521 L 23.091 18.521 Q 24.341 18.521 25.324 19.087 Q 26.314 19.647 26.867 20.689 Q 27.421 21.724 27.421 23.046 L 27.421 23.482 Q 27.421 24.803 26.874 25.832 Q 26.333 26.861 25.344 27.427 Q 24.354 27.993 23.111 28 Z M 22.128 20.103 L 22.128 26.431 L 23.072 26.431 Q 24.217 26.431 24.823 25.682 Q 25.428 24.934 25.441 23.54 L 25.441 23.039 Q 25.441 21.594 24.842 20.852 Q 24.243 20.103 23.091 20.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
new file mode 100644
index 000000000..4f3eb98e1
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 10.734 3.043 C 9.234 3.043 8.043 4.293 8.043 5.793 C 8.043 7.683 9.743 9.223 13.043 12.223 C 16.343 9.223 18.043 7.684 18.043 5.734 C 18.043 4.234 16.793 3.043 15.293 3.043 C 14.433 3.043 13.613 3.403 13.043 4.043 C 12.473 3.403 11.654 3.043 10.734 3.043 Z M 5.734 8.043 C 4.234 8.043 3.043 9.293 3.043 10.793 C 3.043 11.653 3.403 12.473 4.043 13.043 C 3.403 13.613 3.043 14.434 3.043 15.354 C 3.043 16.854 4.293 18.043 5.793 18.043 C 7.683 18.043 9.223 16.343 12.223 13.043 C 9.223 9.743 7.684 8.043 5.734 8.043 Z M 20.293 8.043 C 18.403 8.043 16.863 9.743 13.873 13.043 C 15.043 14.334 15.987 15.373 16.824 16.168 C 17.476 15.484 18.26 14.94 19.129 14.567 C 19.997 14.195 20.932 14.002 21.877 14 C 22.181 14.002 22.484 14.025 22.785 14.066 C 22.615 13.68 22.365 13.329 22.043 13.043 C 22.683 12.473 23.043 11.654 23.043 10.734 C 23.043 9.234 21.793 8.043 20.293 8.043 Z M 13.043 13.863 C 9.743 16.863 8.043 18.404 8.043 20.354 C 8.043 21.854 9.293 23.043 10.793 23.043 C 11.653 23.043 12.473 22.683 13.043 22.043 C 13.576 22.642 14.333 22.982 15.182 23.025 C 14.981 22.369 14.879 21.686 14.877 21 C 14.88 19.52 15.351 18.078 16.225 16.883 C 15.422 16.032 14.368 15.067 13.043 13.863 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml
new file mode 100644
index 000000000..8fe12de45
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_message.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 5.043 3.043 C 3.943 3.043 3.053 3.943 3.053 5.043 L 3.043 23.043 L 7.043 19.043 L 15.16 19.043 C 15.646 17.378 16.733 15.952 18.209 15.043 L 7.043 15.043 L 7.043 13.043 L 19.043 13.043 L 19.043 14.609 C 19.935 14.211 20.9 14.003 21.877 14 C 22.268 14.003 22.658 14.038 23.043 14.105 L 23.043 5.043 C 23.043 3.943 22.143 3.043 21.043 3.043 L 5.043 3.043 Z M 7.043 7.043 L 19.043 7.043 L 19.043 9.043 L 7.043 9.043 L 7.043 7.043 Z M 7.043 10.043 L 19.043 10.043 L 19.043 12.043 L 7.043 12.043 L 7.043 10.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml
new file mode 100644
index 000000000..d30f22336
--- /dev/null
+++ b/app/src/debug/res/drawable-anydpi-v24/ic_stat_note.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="28.26087"
+    android:viewportHeight="28.26087">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 3.043 3.043 L 3.043 12.043 C 3.043 13.043 4.043 14.043 5.043 14.043 L 7.244 14.043 C 7.644 16.043 8.943 17.743 12.043 18.043 L 12.043 20.143 C 9.843 20.343 9.043 21.444 9.043 22.744 L 9.043 23.043 L 15.188 23.043 C 14.983 22.381 14.879 21.693 14.877 21 C 14.877 20.763 14.888 20.527 14.912 20.291 C 14.649 20.226 14.364 20.172 14.043 20.143 L 14.043 18.043 C 14.68 17.981 15.224 17.848 15.717 17.678 C 16.382 16.446 17.401 15.442 18.643 14.795 C 18.725 14.551 18.792 14.299 18.844 14.043 L 21.043 14.043 C 22.043 14.043 23.043 13.043 23.043 12.043 L 23.043 3.043 L 19.043 3.043 C 18.143 3.043 17.043 4.043 17.043 5.043 L 9.043 5.043 C 9.043 4.043 7.943 3.043 7.043 3.043 L 3.043 3.043 Z M 5.043 5.043 L 7.043 5.043 L 7.043 12.043 L 5.043 12.043 L 5.043 5.043 Z M 19.043 5.043 L 21.043 5.043 L 21.043 12.043 L 19.043 12.043 L 19.043 5.043 Z" />
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M 18.754 26 L 18.754 16.521 L 21.671 16.521 Q 22.921 16.521 23.904 17.087 Q 24.893 17.647 25.447 18.689 Q 26 19.724 26 21.046 L 26 21.482 Q 26 22.803 25.453 23.832 Q 24.913 24.861 23.923 25.427 Q 22.934 25.993 21.69 26 Z M 20.707 18.103 L 20.707 24.431 L 21.651 24.431 Q 22.797 24.431 23.402 23.682 Q 24.008 22.934 24.021 21.54 L 24.021 21.039 Q 24.021 19.594 23.422 18.852 Q 22.823 18.103 21.671 18.103 Z" />
+</vector>
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_grade.png b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png
new file mode 100644
index 000000000..013b7ac49
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png
new file mode 100644
index 000000000..74a4d0c55
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_message.png b/app/src/debug/res/drawable-hdpi/ic_stat_message.png
new file mode 100644
index 000000000..be41e3434
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-hdpi/ic_stat_note.png b/app/src/debug/res/drawable-hdpi/ic_stat_note.png
new file mode 100644
index 000000000..1992edf25
Binary files /dev/null and b/app/src/debug/res/drawable-hdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_grade.png b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png
new file mode 100644
index 000000000..a5df2a359
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png
new file mode 100644
index 000000000..278ed2c66
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_message.png b/app/src/debug/res/drawable-mdpi/ic_stat_message.png
new file mode 100644
index 000000000..7327a02f3
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-mdpi/ic_stat_note.png b/app/src/debug/res/drawable-mdpi/ic_stat_note.png
new file mode 100644
index 000000000..2fb020982
Binary files /dev/null and b/app/src/debug/res/drawable-mdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png
new file mode 100644
index 000000000..c63f810fb
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png
new file mode 100644
index 000000000..4035ceba8
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png
new file mode 100644
index 000000000..c4140be89
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-xhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xhdpi/ic_stat_note.png
new file mode 100644
index 000000000..6b533c8ee
Binary files /dev/null and b/app/src/debug/res/drawable-xhdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png
new file mode 100644
index 000000000..13c26b772
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_grade.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png
new file mode 100644
index 000000000..da4357456
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_luckynumber.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png
new file mode 100644
index 000000000..9d0fa781c
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_message.png differ
diff --git a/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png b/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png
new file mode 100644
index 000000000..64da443fd
Binary files /dev/null and b/app/src/debug/res/drawable-xxhdpi/ic_stat_note.png differ
diff --git a/app/src/debug/res/values/preferences_defaults.xml b/app/src/debug/res/values/preferences_defaults.xml
new file mode 100644
index 000000000..f5a12464f
--- /dev/null
+++ b/app/src/debug/res/values/preferences_defaults.xml
@@ -0,0 +1,4 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+    <bool name="pref_default_notification_debug">true</bool>
+</resources>
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
deleted file mode 100644
index c90641ddb..000000000
--- a/app/src/debug/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">Wulkanowy DEV</string>
-</resources>
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index be4c0ebeb..d03a319a2 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -2,16 +2,12 @@
 
 package io.github.wulkanowy.utils
 
-import android.content.Context
 import timber.log.Timber
 
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    // do nothing
+open class TimberTreeNoOp : Timber.Tree() {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {}
 }
 
-class CrashlyticsTree : Timber.Tree() {
+class CrashlyticsTree : TimberTreeNoOp()
 
-    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        // do nothing
-    }
-}
+class CrashlyticsExceptionTree : TimberTreeNoOp()
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index 0b1274f15..f23645bc3 100644
--- a/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,13 +1,18 @@
 package io.github.wulkanowy.utils
 
+import android.app.Activity
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
+@Suppress("UNUSED_PARAMETER")
 class FirebaseAnalyticsHelper @Inject constructor() {
 
-    @Suppress("UNUSED_PARAMETER")
     fun logEvent(name: String, vararg params: Pair<String, Any?>) {
         // do nothing
     }
+
+    fun setCurrentScreen(activity: Activity, name: String?) {
+        // do nothing
+    }
 }
diff --git a/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt b/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt
new file mode 100644
index 000000000..3abab9629
--- /dev/null
+++ b/app/src/fdroid/java/io/github/wulkanowy/utils/UpdateHelper.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.view.View
+import javax.inject.Inject
+
+@Suppress("UNUSED_PARAMETER")
+class UpdateHelper @Inject constructor() {
+
+    lateinit var messageContainer: View
+
+    fun checkAndInstallUpdates(activity: Activity) {}
+
+    fun onActivityResult(requestCode: Int, resultCode: Int) {}
+
+    fun onResume(activity: Activity) {}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c644c8633..4ec2f7816 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
         <activity
             android:name=".ui.modules.splash.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/WulkanowyTheme.SplashScreen">
+            android:theme="@style/WulkanowyTheme.SplashScreen"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -38,13 +39,14 @@
             android:name=".ui.modules.main.MainActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/main_title"
-            android:theme="@style/WulkanowyTheme.NoActionBar" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.modules.message.send.SendMessageActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/send_message_title"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/WulkanowyTheme.NoActionBar" />
+            android:theme="@style/WulkanowyTheme.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.modules.timetablewidget.TimetableWidgetConfigureActivity"
             android:excludeFromRecents="true"
@@ -90,17 +92,58 @@
                 android:resource="@xml/provider_widget_lucky_number" />
         </receiver>
 
+        <receiver android:name=".services.alarm.TimetableNotificationReceiver" />
+
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
             android:exported="false"
             tools:node="remove" />
 
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
+        <!-- workaround for https://github.com/firebase/firebase-android-sdk/issues/473 enabled:false -->
+        <!-- https://firebase.googleblog.com/2017/03/take-control-of-your-firebase-init-on.html -->
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            android:enabled="${firebase_enabled}"
+            android:exported="false" />
+
         <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="${fabric_api_key}" />
+            android:name="firebase_analytics_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="${firebase_enabled}" />
+
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
-            android:value="${crashlytics_enabled}" />
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_messaging_auto_init_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="firebase_inapp_messaging_auto_data_collection_enabled"
+            android:value="${firebase_enabled}" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_stat_push" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="push_channel" />
     </application>
 </manifest>
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
new file mode 100644
index 000000000..40aff4c48
--- /dev/null
+++ b/app/src/main/assets/contributors.json
@@ -0,0 +1,38 @@
+[
+  {
+    "displayName": "Mikołaj Pich",
+    "githubUsername": "mklkj"
+  },
+  {
+    "displayName": "Rafał Borcz",
+    "githubUsername": "Faierbel"
+  },
+  {
+    "displayName": "Dominik Korsa",
+    "githubUsername": "dominik-korsa"
+  },
+  {
+    "displayName": "Kacper Ziubryniewicz",
+    "githubUsername": "kapi2289"
+  },
+  {
+    "displayName": "doteq",
+    "githubUsername": "doteq"
+  },
+  {
+    "displayName": "Paweł Krzyś",
+    "githubUsername": "pavuloff"
+  },
+  {
+    "displayName": "Piotr Romanowski",
+    "githubUsername": "v0idzz"
+  },
+  {
+    "displayName": "Dinolek",
+    "githubUsername": "Dinolek"
+  },
+  {
+    "displayName": "Mateusz Idziejczak",
+    "githubUsername": "PanTajemnic"
+  }
+]
diff --git a/app/src/main/assets/message-print-page.html b/app/src/main/assets/message-print-page.html
new file mode 100644
index 000000000..8da7dec6e
--- /dev/null
+++ b/app/src/main/assets/message-print-page.html
@@ -0,0 +1,94 @@
+<!doctype html>
+<html lang="pl">
+<head>
+    <meta charset="UTF-8">
+    <title>%SUBJECT% | Wulkanowy</title>
+    <style>
+        @page {
+            margin: 2.5cm;
+            size: A4;
+        }
+
+        body {
+            margin: 0;
+            font-family: sans-serif;
+        }
+
+        .title {
+            line-height: 1.5;
+            letter-spacing: 1pt;
+            font-size: 24pt;
+            font-weight: 200;
+            margin: 0 0 0.5cm;
+        }
+
+        .info {
+            margin: 0.5cm 0;
+        }
+
+        .info div {
+            font-size: 14pt;
+            font-weight: 400;
+            margin: 0.5cm 0;
+        }
+
+        h4 {
+            font-weight: 200;
+            text-transform: uppercase;
+            letter-spacing: 1pt;
+            font-size: 10pt;
+            margin: 0;
+            margin-bottom: 0.25cm;
+            font-family: sans-serif;
+        }
+
+        .content {
+            margin-top: 0.5cm;
+            font-size: 14pt;
+            font-weight: 400;
+            text-align: justify;
+            font-family: serif;
+            line-height: 1.5;
+        }
+
+        .content p {
+            page-break-after: auto;
+            page-break-inside: auto;
+            margin-bottom: 0.6cm;
+        }
+
+        .footer {
+            font-size: 11pt;
+            font-weight: 200;
+            display: flex;
+            align-items: center;
+            color: rgba(0, 0, 0, 0.5)
+            margin: 0;
+            margin-bottom: 0.5cm;
+        }
+        
+        .footer .logo {
+            height: 0.5cm;
+            width: 0.5cm;
+            display: block;
+            margin-right: 0.2cm;
+        }
+    </style>
+</head>
+<body>
+<h1 class="title">%SUBJECT%</h1>
+<hr>
+<div class="info">
+    %INFO%
+</div>
+<div class="footer">
+    <img src="wulkanowy-logo-black.svg" class="logo">
+    Wulkanowy Dzienniczek
+</div>
+<hr>
+<div class="content">
+    <h4>Treść wiadomości</h4>
+    %CONTENT%
+</div>
+</body>
+</html>
diff --git a/app/src/main/assets/wulkanowy-logo-black.svg b/app/src/main/assets/wulkanowy-logo-black.svg
new file mode 100644
index 000000000..9bfbe2c02
--- /dev/null
+++ b/app/src/main/assets/wulkanowy-logo-black.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 1024 1024"
+   xml:space="preserve"
+   width="1024"
+   height="1024"><metadata
+     id="metadata15"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs13" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#D32F2F;}
+	.st1{fill:#AD2A2A;}
+	.st2{fill:#FFFFFF;}
+</style><g
+     id="layer4"
+     style="display:none;fill:#808080"><rect
+       id="XMLID_57_"
+       x="0"
+       y="0"
+       class="st0"
+       width="3584"
+       height="1024"
+       style="display:inline;fill:#808080;stroke-width:1.02195609" /></g><g
+     id="layer3"
+     style="display:none;fill:#808080"><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 3046.8164,390.66602 3134.3164,542 v 91.33398 L 3524.9824,1024 H 3584 V 732.18359 L 3242.4824,390.66602 h -23.666 l -53.0352,94.63086 -94.6308,-94.63086 z"
+       id="path18992" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2746.9824,390.66602 62,242.66796 L 3199.6484,1024 H 3584 V 940.68359 L 3033.9824,390.66602 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
+       id="path18990" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2620.8164,387.33398 c -18.6667,0 -35.1667,4.60982 -49.5,13.83204 -14.3333,9.11111 -25.4451,22.22287 -33.334,39.33398 -7.7778,17 -11.666,36.5549 -11.666,58.66602 v 25 c 0,34.44444 8.7216,61.83463 26.166,82.16796 L 2970.1484,1024 h 323.168 l -623.166,-623.16602 c -14.2222,-9 -30.6673,-13.5 -49.334,-13.5 z"
+       id="path18988" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 2293.4824,390.66602 V 633.33398 L 2684.1484,1024 h 423.336 l -633.334,-633.33398 h -20.334 v 139.66601 l -139.666,-139.66601 z"
+       id="path18984" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 1864.8164,390.66602 V 633.33398 L 2255.4824,1024 h 413.334 l -633.334,-633.33398 h -25.832 l -60.584,63.75 -63.75,-63.75 z"
+       id="path18978" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 1684.8164,390.66602 V 633.33398 L 2075.4824,1024 h 263.334 l -633.334,-633.33398 z"
+       id="path18976" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 1133.6504,390.66602 62,242.66796 L 1586.3164,1024 h 467.668 l -633.334,-633.33398 h -21 l -21.9043,90.92773 -90.9277,-90.92773 h -18.5 l -25.4043,88.26367 -88.2637,-88.26367 z"
+       id="path19059" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="m 1456.4824,390.66602 v 167.16796 c 0.5556,24.66667 8.5007,44 23.834,58 L 1888.4824,1024 h 372.168 l -633.334,-633.33398 h -20.666 V 520.5 l -129.834,-129.83398 z"
+       id="path18966" /><path
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;display:inline;fill:#808080;fill-opacity:1;stroke:none"
+       d="M 2146.3164,390.66602 2054.4824,633.33398 2445.1484,1024 h 354.002 l -633.334,-633.33398 z"
+       id="path18982" /><path
+       style="display:inline;fill:#808080;stroke-width:0.78179646"
+       d="M 637.15234,214.95703 487.75,364.35742 466.01562,386.0918 c 0.31273,0.31271 0.54872,0.54666 0.70508,0.85937 0.0782,0.23454 0.23432,0.54671 0.3125,0.78125 0.31272,0.54726 0.47071,1.17339 0.47071,1.79883 0.0782,0.54726 -0.0799,1.01725 -0.31446,1.48633 -0.23454,0.54725 -0.70285,1.40597 -1.09375,1.79687 l 150.8086,149.71485 -23.68946,23.6875 -12.74414,-12.74219 -13.44726,-13.44727 -78.80469,-78.80664 -11.17969,-11.17968 -7.5039,-7.50391 -35.41602,-35.17969 -3.08984,-0.98047 -4.33594,4.26367 v 0.46876 c 0,7.34888 0.38998,15.00865 -1.48633,22.20117 -0.85998,3.28355 -2.34444,6.25595 -4.14258,8.91406 -0.15636,0.15636 -0.23627,0.23426 -0.31445,0.39062 -1.87631,2.57993 -4.06471,4.84619 -6.48828,6.95704 -5.3944,4.53442 -11.25752,8.67896 -17.27734,12.50976 -0.15637,0.0782 -0.23427,0.1562 -0.39063,0.23438 -2.11085,1.40723 -4.3012,2.7354 -6.49023,4.06445 -8.91248,5.39439 -18.37192,10.08772 -28.37891,13.13672 -1.25087,0.31272 -2.42317,-0.001 -3.36133,-0.70508 l -6.01953,5.94141 c 1.25087,0.62543 2.03136,1.87776 1.875,3.51953 -10e-6,0.15636 -0.0762,0.23231 -0.0762,0.38867 0,0.0782 -0.0781,0.23628 -0.0781,0.31445 -1.32905,4.45624 -2.34505,8.98897 -3.2832,13.60156 -0.15636,0.70363 -0.23622,1.33154 -0.39258,2.03516 -0.85997,4.37806 -1.64209,8.83288 -2.3457,13.21094 0.23453,5.3944 0.39263,11.0234 0.31445,16.65234 v 0.39258 c -0.0782,7.66161 -0.78373,15.32114 -2.8164,22.51367 -2.26721,8.28704 -6.64376,15.63728 -10.55274,23.22071 -0.0782,0.15636 -0.15815,0.23426 -0.23633,0.39062 -1.25088,2.42357 -2.49924,4.92399 -3.59375,7.50391 -4.84714,11.33605 -7.42749,23.92328 -10.55468,35.88476 -0.23454,0.70362 -0.39046,1.48578 -0.625,2.26758 0,0.15636 -0.0801,0.23427 -0.0801,0.39063 -2.97082,11.10151 -6.09819,22.28173 -10.94532,32.75781 -1.40724,2.97082 -2.81531,5.86322 -4.3789,8.75586 -0.15636,0.23454 -0.23231,0.46858 -0.38867,0.70312 -0.62544,1.09451 -1.25152,2.26871 -1.87696,3.44141 -0.0782,0.15636 -0.15619,0.23426 -0.23437,0.39062 -3.51809,6.25438 -7.27098,12.43118 -10.78906,18.68555 -5.0035,8.8343 -8.99075,18.13635 -13.83789,27.04883 -0.0782,0.15636 -0.1562,0.23426 -0.23438,0.39062 -0.70362,1.32905 -1.48579,2.65728 -2.26758,3.98633 -5.0035,8.20887 -10.63256,16.0279 -16.57422,23.61133 -0.15635,0.15636 -0.23426,0.3124 -0.39062,0.46875 -0.7818,1.01634 -1.48578,1.95443 -2.26758,2.89258 -3.90898,4.92532 -7.97378,9.85009 -11.96094,14.77539 -0.0782,0.15637 -0.23432,0.23622 -0.3125,0.39258 -8.75612,10.71061 -17.35628,21.49761 -24.54883,33.30273 0,0.70362 -0.15602,1.33159 -0.46874,1.95703 -1.25087,2.42357 -2.65734,4.68971 -3.90821,7.11328 -0.0782,0.15636 0.62511,1.24989 0.46875,1.40625 L 429.86133,1024 H 1463.0215 L 661.85547,222.92969 c -0.93816,2.11087 -5.23681,1.40935 -7.34766,-0.23242 -1.71995,-1.32906 -3.12603,-3.05147 -4.45508,-4.84961 -0.62544,-0.31271 -1.25168,-0.62288 -1.64257,-0.85743 -2.89265,-1.40723 -6.09933,-1.48632 -9.30469,-1.48632 -0.7818,-0.0782 -1.40588,-0.23416 -1.95313,-0.54688 z m -206.12304,191.41992 0.11914,-0.11523 -0.23438,0.0781 z"
+       id="XMLID_64_" /></g><g
+     id="layer2"
+     style="display:inline;fill:#000000;fill-opacity:0.49803922"><path
+       id="XMLID_42_"
+       d="m 295.17362,965.05417 c 1.0692,3.47527 0.5346,7.21786 -1.3367,10.29214 l -25.7972,41.83679 c -2.5396,4.1436 -7.2178,6.8169 -12.297,6.8169 H 14.345318 C 3.1176178,1024 -3.6991822,1012.2376 2.3157178,1003.4158 L 157.76692,774.44928 c 0.9356,-1.33663 1.4704,-2.80694 1.8713,-4.27723 l 71.2428,-304.21933 c 0.8021,-3.60893 3.2081,-6.6832 6.6833,-8.55449 l 96.5054,-52.93096 c 3.4753,-1.8713 5.8812,-4.94557 6.6832,-8.68816 l 12.9654,-56.53988 c 2.6733,-11.76242 19.5151,-14.30205 26.1981,-4.00991 l 4.6783,7.48519 c 2.0049,3.20793 2.5396,7.21785 1.2031,10.82678 l -87.9511,254.22895 c -0.6683,2.00497 -0.9355,4.1436 -0.5346,6.28223 l 21.9209,121.63426 c 0.401,2.40595 0.1334,4.94556 -0.9357,7.21785 l -52.2625,117.357 c -1.203,2.80696 -1.4704,5.88123 -0.5347,8.68817 z M 1009.7413,1024 H 843.46322 c -4.8117,0 -9.2228,-2.4059 -11.8959,-6.1485 L 719.69042,860.52891 c -0.6683,-1.0693 -1.3366,-2.13861 -1.7375,-3.3416 l -55.4707,-162.00078 c -1.0692,-3.20793 -3.6088,-6.01489 -6.8169,-7.61886 l -135.8026,-68.56965 c -3.7426,-1.87127 -6.4159,-5.34655 -7.2179,-9.22281 l -20.0495,-99.44603 c -0.2674,-1.60396 -0.9357,-3.20793 -2.005,-4.67824 l -46.1141,-67.76766 c -2.5396,-3.74259 -2.9405,-8.28717 -1.0693,-12.2971 l 28.0694,-60.01513 c 2.1387,-4.54457 6.817,-7.61886 12.1634,-7.88619 l 52.129,-3.07427 c 3.0742,-0.1337 5.8812,-1.20296 8.1536,-3.07427 l 38.3615,-29.80707 c 7.2178,-5.61388 18.1784,-3.20794 22.0546,4.67824 l 132.1937,268.93201 c 0.5346,1.20297 0.9357,2.40595 1.2029,3.60894 l 16.3072,108.13418 c 0.4009,2.53963 1.4701,4.8119 3.2079,6.6832 l 263.31808,288.17958 c 7.7525,8.5545 1.203,22.0546 -10.8269,22.0546 z M 363.20852,182.58501 c 0,-30.60907 19.3812,-56.94088 47.1834,-69.23798 -2.005,-3.3416 -3.2079,-6.95052 -3.2079,-10.82678 0,-14.836705 17.109,-26.866465 38.0942,-26.866465 0.5346,0 0.9356,0 1.4704,0 8.688,-14.43572 25.2624,-24.19318 44.2426,-24.19318 1.3367,0 2.6733,0 4.01,0.1337 1.7377,0.13369 3.4753,-0.66833 4.4109,-2.00497 14.0347,-21.38624 49.5894,-36.62394 91.159,-36.62394 15.3712,0 29.9406,2.13863 42.906,5.74756 3.0744,-5.07924 9.8911,-8.5545 17.7773,-8.5545 8.9556,0 16.5744,4.54458 18.8466,10.82678 10.9606,-12.69809 29.5398,-20.98524 50.6587,-20.98524 33.6834,0 60.9508,21.25257 60.9508,47.45072 0,3.20793 -0.401,6.2822 -1.203,9.35647 -0.5346,2.13864 0.6683,4.27725 2.9407,5.07924 21.5199,7.88618 36.0893,22.85655 36.0893,39.965535 0,19.51495 -18.8466,36.22296 -45.4458,42.77249 -2.1387,0.53466 -3.4753,2.40595 -3.4753,4.41092 0,0.1337 0,0.26731 0,0.40098 0,15.10404 -14.9704,27.5348 -34.218,28.87144 0.1333,0.66833 0.1333,1.33663 0.1333,2.13862 0,29.00509 -55.2031,52.3963 -123.2382,52.3963 -14.7029,0 -28.7377,-1.06932 -41.7031,-3.07427 0,0.26733 0,0.40099 0,0.66832 0,12.02975 -15.5051,21.78723 -34.4854,21.78723 -1.0692,0 -2.0049,0 -2.9405,-0.13369 1.3367,2.9406 2.005,6.01487 2.005,9.22281 0,18.71296 -23.6586,33.81699 -52.9311,33.81699 -3.2079,0 -6.2821,-0.1337 -9.3563,-0.53466 -2.4061,-0.26731 -4.6783,1.20299 -5.2131,3.47529 -2.5396,9.35647 -10.693,16.17333 -20.4504,16.17333 -11.7625,0 -21.119,-10.0248 -21.119,-22.32189 0,-5.74755 2.005,-10.96045 5.3466,-14.83671 1.203,-1.33663 1.6039,-3.20793 0.8019,-4.81191 -1.8713,-3.47526 -2.6733,-7.08419 -2.6733,-10.96044 v 0 c 0,-2.13862 -1.7376,-3.87626 -3.8763,-4.4109 -36.2228,-8.01985 -63.4903,-38.22792 -63.4903,-74.3172 z m 306.8925,726.06294 c 0.5348,1.60398 0.6683,3.20796 0.6683,4.94558 l -7.7525,97.97577 c -0.5346,6.9505 -6.6832,12.4307 -14.1683,12.4307 h -250.219 c -5.3466,0 -10.2921,-3.0743 -12.6982,-7.4852 l -41.3021,-76.72312 c -0.2673,-0.401 -0.401,-0.80199 -0.5347,-1.20298 l -38.8962,-94.23313 c -1.4702,-3.3416 -1.203,-7.21785 0.4011,-10.42581 l 64.5596,-126.31249 c 1.604,-3.07427 1.8712,-6.6832 0.6683,-9.89114 l -31.5447,-87.41626 c -1.0693,-3.07428 -0.9356,-6.54955 0.4011,-9.49015 l 52.6636,-112.14412 c 5.3464,-11.22778 22.8565,-10.29212 26.5991,1.47031 l 16.4407,51.05965 50.124,134.19868 c 1.3367,3.7426 4.5446,6.6832 8.5545,8.01985 l 106.9312,36.49027 c 4.1435,1.47032 7.3516,4.54458 8.6881,8.42084 z"
+       style="fill:#000000;stroke-width:0.78179646;fill-opacity:0.49803922" /><g
+       aria-label="WULKANOWY"
+       style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:341.33334351px;line-height:1.25;font-family:Roboto;-inkscape-font-specification:'Roboto Light';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:0.49803922;stroke:none"
+       id="text4752" /></g></svg>
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
index 90b3581c8..649958582 100644
--- a/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
+++ b/app/src/main/java/io/github/wulkanowy/WulkanowyApp.kt
@@ -1,34 +1,30 @@
 package io.github.wulkanowy
 
+import android.app.Application
 import android.content.Context
+import android.util.Log.DEBUG
 import android.util.Log.INFO
 import android.util.Log.VERBOSE
+import androidx.hilt.work.HiltWorkerFactory
 import androidx.multidex.MultiDex
 import androidx.work.Configuration
-import com.jakewharton.threetenabp.AndroidThreeTen
 import com.yariksoffice.lingver.Lingver
-import dagger.android.AndroidInjector
-import dagger.android.support.DaggerApplication
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.utils.Log
-import io.github.wulkanowy.di.DaggerAppComponent
-import io.github.wulkanowy.services.sync.SyncWorkerFactory
+import dagger.hilt.android.HiltAndroidApp
+import fr.bipi.tressence.file.FileLoggerTree
 import io.github.wulkanowy.ui.base.ThemeManager
 import io.github.wulkanowy.utils.ActivityLifecycleLogger
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.CrashlyticsExceptionTree
 import io.github.wulkanowy.utils.CrashlyticsTree
 import io.github.wulkanowy.utils.DebugLogTree
-import io.github.wulkanowy.utils.initCrashlytics
-import io.reactivex.exceptions.UndeliverableException
-import io.reactivex.plugins.RxJavaPlugins
 import timber.log.Timber
-import java.io.IOException
 import javax.inject.Inject
 
-class WulkanowyApp : DaggerApplication(), Configuration.Provider {
+@HiltAndroidApp
+class WulkanowyApp : Application(), Configuration.Provider {
 
     @Inject
-    lateinit var workerFactory: SyncWorkerFactory
+    lateinit var workerFactory: HiltWorkerFactory
 
     @Inject
     lateinit var themeManager: ThemeManager
@@ -43,37 +39,29 @@ class WulkanowyApp : DaggerApplication(), Configuration.Provider {
 
     override fun onCreate() {
         super.onCreate()
-        AndroidThreeTen.init(this)
-        RxJavaPlugins.setErrorHandler(::onError)
         Lingver.init(this)
         themeManager.applyDefaultTheme()
 
         initLogging()
-        initCrashlytics(this, appInfo)
     }
 
     private fun initLogging() {
         if (appInfo.isDebug) {
             Timber.plant(DebugLogTree())
-            FlexibleAdapter.enableLogs(Log.Level.DEBUG)
+            Timber.plant(FileLoggerTree.Builder()
+                .withFileName("wulkanowy.%g.log")
+                .withDirName(applicationContext.filesDir.absolutePath)
+                .withFileLimit(10)
+                .withMinPriority(DEBUG)
+                .build()
+            )
         } else {
+            Timber.plant(CrashlyticsExceptionTree())
             Timber.plant(CrashlyticsTree())
         }
         registerActivityLifecycleCallbacks(ActivityLifecycleLogger())
     }
 
-    private fun onError(error: Throwable) {
-        //RxJava's too deep stack traces may cause SOE on older android devices
-        val cause = error.cause
-        if (error is UndeliverableException && cause is IOException || cause is InterruptedException || cause is StackOverflowError) {
-            Timber.e(cause, "An undeliverable error occurred")
-        } else throw error
-    }
-
-    override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
-        return DaggerAppComponent.factory().create(this)
-    }
-
     override fun getWorkManagerConfiguration() = Configuration.Builder()
         .setWorkerFactory(workerFactory)
         .setMinimumLoggingLevel(if (appInfo.isDebug) VERBOSE else INFO)
diff --git a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
index 1bc4eb616..6486cab97 100644
--- a/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/RepositoryModule.kt
@@ -2,15 +2,17 @@ package io.github.wulkanowy.data
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.AssetManager
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.strategy.WalledGardenInternetObservingStrategy
-import com.readystatesoftware.chuck.api.ChuckCollector
-import com.readystatesoftware.chuck.api.ChuckInterceptor
-import com.readystatesoftware.chuck.api.RetentionManager
+import com.chuckerteam.chucker.api.ChuckerCollector
+import com.chuckerteam.chucker.api.ChuckerInterceptor
+import com.chuckerteam.chucker.api.RetentionManager
 import dagger.Module
 import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.AppDatabase
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -19,48 +21,51 @@ import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
+@InstallIn(ApplicationComponent::class)
 internal class RepositoryModule {
 
     @Singleton
     @Provides
-    fun provideInternetObservingSettings(): InternetObservingSettings {
-        return InternetObservingSettings.builder()
-            .strategy(WalledGardenInternetObservingStrategy())
-            .build()
-    }
-
-    @Singleton
-    @Provides
-    fun provideSdk(chuckCollector: ChuckCollector, context: Context): Sdk {
+    fun provideSdk(chuckerCollector: ChuckerCollector, @ApplicationContext context: Context): Sdk {
         return Sdk().apply {
             androidVersion = android.os.Build.VERSION.RELEASE
             buildTag = android.os.Build.MODEL
             setSimpleHttpLogger { Timber.d(it) }
 
             // for debug only
-            addInterceptor(ChuckInterceptor(context, chuckCollector).maxContentLength(250000L), true)
+            addInterceptor(ChuckerInterceptor(
+                context = context,
+                collector = chuckerCollector,
+                alwaysReadResponseBody = true
+            ), true)
         }
     }
 
     @Singleton
     @Provides
-    fun provideChuckCollector(context: Context, prefRepository: PreferencesRepository): ChuckCollector {
-        return ChuckCollector(context)
-            .showNotification(prefRepository.isDebugNotificationEnable)
-            .retentionManager(RetentionManager(context, ChuckCollector.Period.ONE_HOUR))
+    fun provideChuckerCollector(@ApplicationContext context: Context, prefRepository: PreferencesRepository): ChuckerCollector {
+        return ChuckerCollector(
+            context = context,
+            showNotification = prefRepository.isDebugNotificationEnable,
+            retentionPeriod = RetentionManager.Period.ONE_HOUR
+        )
     }
 
     @Singleton
     @Provides
-    fun provideDatabase(context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
+    fun provideDatabase(@ApplicationContext context: Context, sharedPrefProvider: SharedPrefProvider) = AppDatabase.newInstance(context, sharedPrefProvider)
 
     @Singleton
     @Provides
-    fun provideResources(context: Context): Resources = context.resources
+    fun provideResources(@ApplicationContext context: Context): Resources = context.resources
 
     @Singleton
     @Provides
-    fun provideSharedPref(context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+    fun provideAssets(@ApplicationContext context: Context): AssetManager = context.assets
+
+    @Singleton
+    @Provides
+    fun provideSharedPref(@ApplicationContext context: Context): SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
     @Singleton
     @Provides
@@ -90,6 +95,10 @@ internal class RepositoryModule {
     @Provides
     fun provideMessagesDao(database: AppDatabase) = database.messagesDao
 
+    @Singleton
+    @Provides
+    fun provideMessageAttachmentsDao(database: AppDatabase) = database.messageAttachmentDao
+
     @Singleton
     @Provides
     fun provideExamDao(database: AppDatabase) = database.examsDao
diff --git a/app/src/main/java/io/github/wulkanowy/data/Resource.kt b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
new file mode 100644
index 000000000..406440c83
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/Resource.kt
@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data
+
+data class Resource<T>(val status: Status, val data: T?, val error: Throwable?) {
+    companion object {
+        fun <T> success(data: T?): Resource<T> {
+            return Resource(Status.SUCCESS, data, null)
+        }
+
+        fun <T> error(error: Throwable?, data: T? = null): Resource<T> {
+            return Resource(Status.ERROR, data, error)
+        }
+
+        fun <T> loading(data: T? = null): Resource<T> {
+            return Resource(Status.LOADING, data, null)
+        }
+    }
+}
+
+enum class Status {
+    LOADING,
+    SUCCESS,
+    ERROR
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt b/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt
deleted file mode 100644
index 901712594..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/SdkHelper.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package io.github.wulkanowy.data
-
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.sdk.Sdk
-import javax.inject.Inject
-
-class SdkHelper @Inject constructor(private val sdk: Sdk) {
-
-    fun init(student: Student) {
-        sdk.apply {
-            email = student.email
-            password = student.password
-            symbol = student.symbol
-            schoolSymbol = student.schoolSymbol
-            studentId = student.studentId
-            classId = student.classId
-
-            if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
-                scrapperBaseUrl = student.scrapperBaseUrl
-                loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
-            }
-            loginId = student.userLoginId
-
-            mode = Sdk.Mode.valueOf(student.loginMode)
-            mobileBaseUrl = student.mobileBaseUrl
-            certKey = student.certificateKey
-            privateKey = student.privateKey
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
index 9ee1b263d..ebd5119fa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt
@@ -17,6 +17,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.dao.NoteDao
@@ -39,6 +40,7 @@ import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Recipient
@@ -60,6 +62,14 @@ import io.github.wulkanowy.data.db.migrations.Migration17
 import io.github.wulkanowy.data.db.migrations.Migration18
 import io.github.wulkanowy.data.db.migrations.Migration19
 import io.github.wulkanowy.data.db.migrations.Migration2
+import io.github.wulkanowy.data.db.migrations.Migration20
+import io.github.wulkanowy.data.db.migrations.Migration21
+import io.github.wulkanowy.data.db.migrations.Migration22
+import io.github.wulkanowy.data.db.migrations.Migration23
+import io.github.wulkanowy.data.db.migrations.Migration24
+import io.github.wulkanowy.data.db.migrations.Migration25
+import io.github.wulkanowy.data.db.migrations.Migration26
+import io.github.wulkanowy.data.db.migrations.Migration27
 import io.github.wulkanowy.data.db.migrations.Migration3
 import io.github.wulkanowy.data.db.migrations.Migration4
 import io.github.wulkanowy.data.db.migrations.Migration5
@@ -83,6 +93,7 @@ import javax.inject.Singleton
         GradeStatistics::class,
         GradePointsStatistics::class,
         Message::class,
+        MessageAttachment::class,
         Note::class,
         Homework::class,
         Subject::class,
@@ -101,7 +112,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 19
+        const val VERSION_SCHEMA = 27
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider): Array<Migration> {
             return arrayOf(
@@ -122,7 +133,15 @@ abstract class AppDatabase : RoomDatabase() {
                 Migration16(),
                 Migration17(),
                 Migration18(),
-                Migration19(sharedPrefProvider)
+                Migration19(sharedPrefProvider),
+                Migration20(),
+                Migration21(),
+                Migration22(),
+                Migration23(),
+                Migration24(),
+                Migration25(),
+                Migration26(),
+                Migration27(),
             )
         }
 
@@ -158,6 +177,8 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract val messagesDao: MessagesDao
 
+    abstract val messageAttachmentDao: MessageAttachmentDao
+
     abstract val noteDao: NoteDao
 
     abstract val homeworkDao: HomeworkDao
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
index 73a04d236..def0b3715 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/Converters.kt
@@ -1,21 +1,31 @@
 package io.github.wulkanowy.data.db
 
 import androidx.room.TypeConverter
-import com.google.gson.Gson
-import com.google.gson.reflect.TypeToken
-import org.threeten.bp.DateTimeUtils
-import org.threeten.bp.Instant
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.Month
-import org.threeten.bp.ZoneOffset
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import io.github.wulkanowy.data.db.adapters.PairAdapterFactory
+import java.time.Instant
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.Month
+import java.time.ZoneOffset
 import java.util.Date
 
 class Converters {
 
+    private val moshi by lazy { Moshi.Builder().add(PairAdapterFactory).build() }
+
+    private val integerListAdapter by lazy {
+        moshi.adapter<List<Int>>(Types.newParameterizedType(List::class.java, Integer::class.java))
+    }
+
+    private val stringListPairAdapter by lazy {
+        moshi.adapter<List<Pair<String, String>>>(Types.newParameterizedType(List::class.java, Pair::class.java, String::class.java, String::class.java))
+    }
+
     @TypeConverter
     fun timestampToDate(value: Long?): LocalDate? = value?.run {
-        DateTimeUtils.toInstant(Date(value)).atZone(ZoneOffset.UTC).toLocalDate()
+        Date(value).toInstant().atZone(ZoneOffset.UTC).toLocalDate()
     }
 
     @TypeConverter
@@ -40,12 +50,22 @@ class Converters {
     fun intToMonth(value: Int?) = value?.let { Month.of(it) }
 
     @TypeConverter
-    fun intListToGson(list: List<Int>): String {
-        return Gson().toJson(list)
+    fun intListToJson(list: List<Int>): String {
+        return integerListAdapter.toJson(list)
     }
 
     @TypeConverter
-    fun gsonToIntList(value: String): List<Int> {
-        return Gson().fromJson(value, object : TypeToken<List<Int>>() {}.type)
+    fun jsonToIntList(value: String): List<Int> {
+        return integerListAdapter.fromJson(value).orEmpty()
+    }
+
+    @TypeConverter
+    fun stringPairListToJson(list: List<Pair<String, String>>): String {
+        return stringListPairAdapter.toJson(list)
+    }
+
+    @TypeConverter
+    fun jsonToStringPairList(value: String): List<Pair<String, String>> {
+        return stringListPairAdapter.fromJson(value).orEmpty()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt b/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt
new file mode 100644
index 000000000..4a9b168dd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/adapters/PairAdapterFactory.kt
@@ -0,0 +1,68 @@
+package io.github.wulkanowy.data.db.adapters
+
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+object PairAdapterFactory : JsonAdapter.Factory {
+
+    override fun create(type: Type, annotations: MutableSet<out Annotation>, moshi: Moshi): JsonAdapter<*>? {
+        if (type !is ParameterizedType || List::class.java != type.rawType) return null
+        if (type.actualTypeArguments[0] != Pair::class.java) return null
+
+        val listType = Types.newParameterizedType(List::class.java, Map::class.java, String::class.java)
+        val listAdapter = moshi.adapter<List<Map<String, String>>>(listType)
+
+        val mapType = Types.newParameterizedType(MutableMap::class.java, String::class.java, String::class.java)
+        val mapAdapter = moshi.adapter<Map<String, String>>(mapType)
+
+        return PairAdapter(listAdapter, mapAdapter)
+    }
+
+    private class PairAdapter(
+        private val listAdapter: JsonAdapter<List<Map<String, String>>>,
+        private val mapAdapter: JsonAdapter<Map<String, String>>,
+    ) : JsonAdapter<List<Pair<String, String>>>() {
+
+        override fun toJson(writer: JsonWriter, value: List<Pair<String, String>>?) {
+            writer.beginArray()
+            value?.forEach {
+                writer.beginObject()
+                writer.name("first").value(it.first)
+                writer.name("second").value(it.second)
+                writer.endObject()
+            }
+            writer.endArray()
+        }
+
+        override fun fromJson(reader: JsonReader): List<Pair<String, String>>? {
+            return if (reader.peek() == JsonReader.Token.BEGIN_OBJECT) deserializeMoshiMap(reader)
+            else deserializeGsonPair(reader)
+        }
+
+        // for compatibility with 0.21.0
+        private fun deserializeMoshiMap(reader: JsonReader): List<Pair<String, String>>? {
+            val map = mapAdapter.fromJson(reader) ?: return null
+
+            return map.entries.map {
+                it.key to it.value
+            }
+        }
+
+        private fun deserializeGsonPair(reader: JsonReader): List<Pair<String, String>>? {
+            val list = listAdapter.fromJson(reader) ?: return null
+
+            return list.map {
+                require(it.size == 2) {
+                    "pair with more or less than two elements: $list"
+                }
+
+                it["first"].orEmpty() to it["second"].orEmpty()
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
index 3eb57473d..8ef3fd446 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Attendance
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface AttendanceDao : BaseDao<Attendance> {
 
     @Query("SELECT * FROM Attendance WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Attendance>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Attendance>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
index fd58533f1..4218855ca 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/AttendanceSummaryDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface AttendanceSummaryDao : BaseDao<AttendanceSummary> {
 
     @Query("SELECT * FROM AttendanceSummary WHERE diary_id = :diaryId AND student_id = :studentId AND subject_id = :subjectId")
-    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Maybe<List<AttendanceSummary>>
+    fun loadAll(diaryId: Int, studentId: Int, subjectId: Int): Flow<List<AttendanceSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
index 32dbadb86..048e9e3cd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/BaseDao.kt
@@ -7,11 +7,11 @@ import androidx.room.Update
 interface BaseDao<T> {
 
     @Insert
-    fun insertAll(items: List<T>): List<Long>
+    suspend fun insertAll(items: List<T>): List<Long>
 
     @Update
-    fun updateAll(items: List<T>)
+    suspend fun updateAll(items: List<T>)
 
     @Delete
-    fun deleteAll(items: List<T>)
+    suspend fun deleteAll(items: List<T>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
index e13e569b6..8c03609d6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/CompletedLessonsDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface CompletedLessonsDao : BaseDao<CompletedLesson> {
 
     @Query("SELECT * FROM CompletedLesson WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<CompletedLesson>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
index ca6b32dfc..311eeb9c5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ExamDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Exam
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface ExamDao : BaseDao<Exam> {
 
     @Query("SELECT * FROM Exams WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Exam>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Exam>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
index c74d1937f..12e70bde6 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Grade
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,6 +11,5 @@ import javax.inject.Singleton
 interface GradeDao : BaseDao<Grade> {
 
     @Query("SELECT * FROM Grades WHERE semester_id = :semesterId AND student_id = :studentId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<Grade>>
-
+    fun loadAll(semesterId: Int, studentId: Int): Flow<List<Grade>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
index 376092865..e8074f003 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradePointsStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradePointsStatisticsDao : BaseDao<GradePointsStatistics> {
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Maybe<GradePointsStatistics>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String): Flow<List<GradePointsStatistics>>
 
     @Query("SELECT * FROM GradesPointsStatistics WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradePointsStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradePointsStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
index 6faa35d0b..b462ad5db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeStatisticsDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeStatistics
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +11,8 @@ import javax.inject.Singleton
 interface GradeStatisticsDao : BaseDao<GradeStatistics> {
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND subject = :subjectName AND is_semester = :isSemester")
-    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Maybe<List<GradeStatistics>>
+    fun loadSubject(semesterId: Int, studentId: Int, subjectName: String, isSemester: Boolean): Flow<List<GradeStatistics>>
 
     @Query("SELECT * FROM GradesStatistics WHERE student_id = :studentId AND semester_id = :semesterId AND is_semester = :isSemester")
-    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Maybe<List<GradeStatistics>>
+    fun loadAll(semesterId: Int, studentId: Int, isSemester: Boolean): Flow<List<GradeStatistics>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
index 1165ef07f..fc9ad66ed 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/GradeSummaryDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface GradeSummaryDao : BaseDao<GradeSummary> {
 
     @Query("SELECT * FROM GradesSummary WHERE student_id = :studentId AND semester_id = :semesterId")
-    fun loadAll(semesterId: Int, studentId: Int): Maybe<List<GradeSummary>>
+    fun loadAll(semesterId: Int, studentId: Int): Flow<List<GradeSummary>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
index 1947a0dfe..2092de49d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/HomeworkDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Homework
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface HomeworkDao : BaseDao<Homework> {
 
     @Query("SELECT * FROM Homework WHERE semester_id = :semesterId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Homework>>
+    fun loadAll(semesterId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Homework>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
index f16c28d9e..57f3005ad 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/LuckyNumberDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface LuckyNumberDao : BaseDao<LuckyNumber> {
 
     @Query("SELECT * FROM LuckyNumbers WHERE student_id = :studentId AND date = :date")
-    fun load(studentId: Int, date: LocalDate): Maybe<LuckyNumber>
+    fun load(studentId: Int, date: LocalDate): Flow<LuckyNumber?>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
new file mode 100644
index 000000000..b69083a1a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessageAttachmentDao.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+
+@Dao
+interface MessageAttachmentDao : BaseDao<MessageAttachment> {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAttachments(items: List<MessageAttachment>): List<Long>
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
index 6d14ad016..729ba6a68 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MessagesDao.kt
@@ -2,18 +2,18 @@ package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
 import androidx.room.Query
+import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Message
-import io.reactivex.Maybe
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MessagesDao : BaseDao<Message> {
 
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder AND removed = 0 ORDER BY date DESC")
-    fun loadAll(studentId: Int, folder: Int): Maybe<List<Message>>
+    @Transaction
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND message_id = :messageId")
+    fun loadMessageWithAttachment(studentId: Int, messageId: Int): Flow<MessageWithAttachment?>
 
-    @Query("SELECT * FROM Messages WHERE id = :id")
-    fun load(id: Long): Maybe<Message>
-
-    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND removed = 1 ORDER BY date DESC")
-    fun loadDeleted(studentId: Int): Maybe<List<Message>>
+    @Query("SELECT * FROM Messages WHERE student_id = :studentId AND folder_id = :folder ORDER BY date DESC")
+    fun loadAll(studentId: Int, folder: Int): Flow<List<Message>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
index b05b2d9cc..8baba2c30 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/MobileDeviceDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface MobileDeviceDao : BaseDao<MobileDevice> {
 
     @Query("SELECT * FROM MobileDevices WHERE student_id = :studentId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Maybe<List<MobileDevice>>
+    fun loadAll(studentId: Int): Flow<List<MobileDevice>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
index ea2fc6eb2..e89a4135a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/NoteDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Note
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface NoteDao : BaseDao<Note> {
 
     @Query("SELECT * FROM Notes WHERE student_id = :studentId")
-    fun loadAll(studentId: Int): Maybe<List<Note>>
+    fun loadAll(studentId: Int): Flow<List<Note>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
index afb941b1a..419efde0d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/RecipientDao.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Recipient
-import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +10,5 @@ import javax.inject.Singleton
 interface RecipientDao : BaseDao<Recipient> {
 
     @Query("SELECT * FROM Recipients WHERE student_id = :studentId AND role = :role AND unit_id = :unitId")
-    fun load(studentId: Int, role: Int, unitId: Int): Maybe<List<Recipient>>
+    suspend fun load(studentId: Int, role: Int, unitId: Int): List<Recipient>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
index 6ddfd4941..ca697eda8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/ReportingUnitDao.kt
@@ -3,7 +3,6 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.ReportingUnit
-import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
@@ -11,8 +10,8 @@ import javax.inject.Singleton
 interface ReportingUnitDao : BaseDao<ReportingUnit> {
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId")
-    fun load(studentId: Int): Maybe<List<ReportingUnit>>
+    suspend fun load(studentId: Int): List<ReportingUnit>
 
     @Query("SELECT * FROM ReportingUnits WHERE student_id = :studentId AND real_id = :unitId")
-    fun loadOne(studentId: Int, unitId: Int): Maybe<ReportingUnit>
+    suspend fun loadOne(studentId: Int, unitId: Int): ReportingUnit?
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
index e9bd67557..f39791f63 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.School
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface SchoolDao : BaseDao<School> {
 
     @Query("SELECT * FROM School WHERE student_id = :studentId AND class_id = :classId")
-    fun load(studentId: Int, classId: Int): Maybe<School>
+    fun load(studentId: Int, classId: Int): Flow<School?>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
index 654b80f38..4d171907c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SemesterDao.kt
@@ -1,15 +1,19 @@
 package io.github.wulkanowy.data.db.dao
 
 import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
 import javax.inject.Singleton
 
 @Singleton
 @Dao
 interface SemesterDao : BaseDao<Semester> {
 
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    suspend fun insertSemesters(items: List<Semester>): List<Long>
+
     @Query("SELECT * FROM Semesters WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Semester>>
+    suspend fun loadAll(studentId: Int, classId: Int): List<Semester>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
index 57bf25fb8..d7237ea8a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt
@@ -5,8 +5,9 @@ import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy.ABORT
 import androidx.room.Query
+import androidx.room.Transaction
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import javax.inject.Singleton
 
 @Singleton
@@ -14,20 +15,27 @@ import javax.inject.Singleton
 interface StudentDao {
 
     @Insert(onConflict = ABORT)
-    fun insertAll(student: List<Student>): List<Long>
+    suspend fun insertAll(student: List<Student>): List<Long>
 
     @Delete
-    fun delete(student: Student)
+    suspend fun delete(student: Student)
 
     @Query("SELECT * FROM Students WHERE is_current = 1")
-    fun loadCurrent(): Maybe<Student>
+    suspend fun loadCurrent(): Student?
+
+    @Query("SELECT * FROM Students WHERE id = :id")
+    suspend fun loadById(id: Int): Student?
 
     @Query("SELECT * FROM Students")
-    fun loadAll(): Maybe<List<Student>>
+    suspend fun loadAll(): List<Student>
+
+    @Transaction
+    @Query("SELECT * FROM Students")
+    suspend fun loadStudentsWithSemesters(): List<StudentWithSemesters>
 
     @Query("UPDATE Students SET is_current = 1 WHERE id = :id")
-    fun updateCurrent(id: Long)
+    suspend fun updateCurrent(id: Long)
 
     @Query("UPDATE Students SET is_current = 0")
-    fun resetCurrent()
+    suspend fun resetCurrent()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
index 525a7129a..4cd742b56 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/SubjectDao.kt
@@ -3,11 +3,11 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Subject
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SubjectDao : BaseDao<Subject> {
 
     @Query("SELECT * FROM Subjects WHERE diary_id = :diaryId AND student_id = :studentId")
-    fun loadAll(diaryId: Int, studentId: Int): Maybe<List<Subject>>
+    fun loadAll(diaryId: Int, studentId: Int): Flow<List<Subject>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
index 5ea237a84..6adac220d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TeacherDao.kt
@@ -3,7 +3,7 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Singleton
 
 @Singleton
@@ -11,5 +11,5 @@ import javax.inject.Singleton
 interface TeacherDao : BaseDao<Teacher> {
 
     @Query("SELECT * FROM Teachers WHERE student_id = :studentId AND class_id = :classId")
-    fun loadAll(studentId: Int, classId: Int): Maybe<List<Teacher>>
+    fun loadAll(studentId: Int, classId: Int): Flow<List<Teacher>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
index 6b62cc82a..5e6eec668 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/TimetableDao.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.dao
 import androidx.room.Dao
 import androidx.room.Query
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Singleton
 
 @Singleton
@@ -12,5 +12,5 @@ import javax.inject.Singleton
 interface TimetableDao : BaseDao<Timetable> {
 
     @Query("SELECT * FROM Timetable WHERE diary_id = :diaryId AND student_id = :studentId AND date >= :from AND date <= :end")
-    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Maybe<List<Timetable>>
+    fun loadAll(diaryId: Int, studentId: Int, from: LocalDate, end: LocalDate): Flow<List<Timetable>>
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
index 3c58971ae..f141d5d52 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Attendance.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Attendance")
 data class Attendance(
@@ -15,6 +15,9 @@ data class Attendance(
     @ColumnInfo(name = "diary_id")
     val diaryId: Int,
 
+    @ColumnInfo(name = "time_id")
+    val timeId: Int,
+
     val date: LocalDate,
 
     val number: Int,
@@ -33,7 +36,13 @@ data class Attendance(
 
     val excused: Boolean,
 
-    val deleted: Boolean
+    val deleted: Boolean,
+
+    val excusable: Boolean,
+
+    @ColumnInfo(name = "excuse_status")
+    val excuseStatus: String?
+
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
index d2e1f174e..7d628ebaa 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/AttendanceSummary.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.Month
 import java.io.Serializable
+import java.time.Month
 
 @Entity(tableName = "AttendanceSummary")
 data class AttendanceSummary(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
index 775f3f558..e305d467a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/CompletedLesson.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "CompletedLesson")
 data class CompletedLesson(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
index 9ae795e71..50ed343a9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Exam.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Exams")
 data class Exam(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
index 3f69c61b1..a0f1c3a6d 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Grade.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Grades")
 data class Grade(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
index 6e29112b2..fb7b60bbc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/GradeSummary.kt
@@ -3,6 +3,7 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import java.time.LocalDateTime
 
 @Entity(tableName = "GradesSummary")
 data class GradeSummary(
@@ -36,4 +37,16 @@ data class GradeSummary(
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_predicted_grade_notified")
+    var isPredictedGradeNotified: Boolean = true
+
+    @ColumnInfo(name = "is_final_grade_notified")
+    var isFinalGradeNotified: Boolean = true
+
+    @ColumnInfo(name = "predicted_grade_last_change")
+    var predictedGradeLastChange: LocalDateTime = LocalDateTime.now()
+
+    @ColumnInfo(name = "final_grade_last_change")
+    var finalGradeLastChange: LocalDateTime = LocalDateTime.now()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
index a22df0961..5b21445b4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Homework.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Homework")
 data class Homework(
@@ -27,10 +27,14 @@ data class Homework(
     val teacher: String,
 
     @ColumnInfo(name = "teacher_symbol")
-    val teacherSymbol: String
+    val teacherSymbol: String,
 
+    val attachments: List<Pair<String, String>>
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+    @ColumnInfo(name = "is_done")
+    var isDone: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
index 5b9130f5d..7c24c8f5c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/LuckyNumber.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "LuckyNumbers")
 data class LuckyNumber (
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
index 93e254c3b..1f10a1645 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Message.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
 import java.io.Serializable
+import java.time.LocalDateTime
 
 @Entity(tableName = "Messages")
 data class Message(
@@ -29,8 +29,6 @@ data class Message(
 
     val subject: String,
 
-    var content: String,
-
     val date: LocalDateTime,
 
     @ColumnInfo(name = "folder_id")
@@ -38,13 +36,10 @@ data class Message(
 
     var unread: Boolean,
 
-    @ColumnInfo(name = "unread_by")
-    val unreadBy: Int,
+    val removed: Boolean,
 
-    @ColumnInfo(name = "read_by")
-    val readBy: Int,
-
-    val removed: Boolean
+    @ColumnInfo(name = "has_attachments")
+    val hasAttachments: Boolean
 ) : Serializable {
 
     @PrimaryKey(autoGenerate = true)
@@ -52,4 +47,12 @@ data class Message(
 
     @ColumnInfo(name = "is_notified")
     var isNotified: Boolean = true
+
+    @ColumnInfo(name = "unread_by")
+    var unreadBy: Int = 0
+
+    @ColumnInfo(name = "read_by")
+    var readBy: Int = 0
+
+    var content: String = ""
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
new file mode 100644
index 000000000..d1886e910
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageAttachment.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import java.io.Serializable
+
+@Entity(tableName = "MessageAttachments")
+data class MessageAttachment(
+
+    @PrimaryKey
+    @ColumnInfo(name = "real_id")
+    val realId: Int,
+
+    @ColumnInfo(name = "message_id")
+    val messageId: Int,
+
+    @ColumnInfo(name = "one_drive_id")
+    val oneDriveId: String,
+
+    @ColumnInfo(name = "url")
+    val url: String,
+
+    @ColumnInfo(name = "filename")
+    val filename: String
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
new file mode 100644
index 000000000..2e7af0f40
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MessageWithAttachment.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class MessageWithAttachment(
+    @Embedded
+    val message: Message,
+
+    @Relation(parentColumn = "message_id", entityColumn = "message_id")
+    val attachments: List<MessageAttachment>
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
index f67ed599f..9d8f11625 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/MobileDevice.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
 import java.io.Serializable
+import java.time.LocalDateTime
 
 @Entity(tableName = "MobileDevices")
 data class MobileDevice(
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
index 5f3a92ab6..cfd549625 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Note.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
 import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Notes")
 data class Note(
@@ -16,8 +16,19 @@ data class Note(
 
     val teacher: String,
 
+    @ColumnInfo(name = "teacher_symbol")
+    val teacherSymbol: String,
+
     val category: String,
 
+    @ColumnInfo(name = "category_type")
+    val categoryType: Int,
+
+    @ColumnInfo(name = "is_points_show")
+    val isPointsShow: Boolean,
+
+    val points: Int,
+
     val content: String
 ) : Serializable {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
index 6c06be111..3b1f0add5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Semester.kt
@@ -4,7 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
+import java.io.Serializable
+import java.time.LocalDate
 
 @Entity(tableName = "Semesters", indices = [Index(value = ["student_id", "diary_id", "semester_id"], unique = true)])
 data class Semester(
@@ -27,9 +28,6 @@ data class Semester(
     @ColumnInfo(name = "semester_name")
     val semesterName: Int,
 
-    @ColumnInfo(name = "is_current")
-    val isCurrent: Boolean,
-
     val start: LocalDate,
 
     val end: LocalDate,
@@ -39,8 +37,12 @@ data class Semester(
 
     @ColumnInfo(name = "unit_id")
     val unitId: Int
-) {
+): Serializable {
 
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
+
+
+    @ColumnInfo(name = "is_current")
+    var current: Boolean = false
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
index fe0283f87..b6c75ff8f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Student.kt
@@ -4,8 +4,8 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDateTime
 import java.io.Serializable
+import java.time.LocalDateTime
 
 @Entity(tableName = "Students", indices = [Index(value = ["email", "symbol", "student_id", "school_id", "class_id"], unique = true)])
 data class Student(
@@ -43,12 +43,18 @@ data class Student(
     @ColumnInfo(name = "user_login_id")
     val userLoginId: Int,
 
+    @ColumnInfo(name = "user_name")
+    val userName: String,
+
     @ColumnInfo(name = "student_name")
     val studentName: String,
 
     @ColumnInfo(name = "school_id")
     val schoolSymbol: String,
 
+    @ColumnInfo(name ="school_short")
+    val schoolShortName: String,
+
     @ColumnInfo(name = "school_name")
     val schoolName: String,
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
new file mode 100644
index 000000000..9362a954e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/StudentWithSemesters.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.data.db.entities
+
+import androidx.room.Embedded
+import androidx.room.Relation
+import java.io.Serializable
+
+data class StudentWithSemesters(
+    @Embedded
+    val student: Student,
+
+    @Relation(parentColumn = "student_id", entityColumn = "student_id")
+    val semesters: List<Semester>
+) : Serializable
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
index 9bc3d2140..1bf159efd 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/entities/Timetable.kt
@@ -3,9 +3,9 @@ package io.github.wulkanowy.data.db.entities
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
 import java.io.Serializable
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 @Entity(tableName = "Timetable")
 data class Timetable(
@@ -40,6 +40,9 @@ data class Timetable(
 
     val info: String,
 
+    @ColumnInfo(name = "student_plan")
+    val isStudentPlan: Boolean,
+
     val changes: Boolean,
 
     val canceled: Boolean
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt
new file mode 100644
index 000000000..2fcfc183d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration20.kt
@@ -0,0 +1,42 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration20 : Migration(19, 20) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        migrateTimetable(database)
+        truncateSubjects(database)
+    }
+
+    private fun migrateTimetable(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE Timetable")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS `Timetable` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `student_id` INTEGER NOT NULL,
+                `diary_id` INTEGER NOT NULL,
+                `number` INTEGER NOT NULL,
+                `start` INTEGER NOT NULL,
+                `end` INTEGER NOT NULL,
+                `date` INTEGER NOT NULL,
+                `subject` TEXT NOT NULL,
+                `subjectOld` TEXT NOT NULL,
+                `group` TEXT NOT NULL,
+                `room` TEXT NOT NULL,
+                `roomOld` TEXT NOT NULL,
+                `teacher` TEXT NOT NULL,
+                `teacherOld` TEXT NOT NULL,
+                `info` TEXT NOT NULL,
+                `student_plan` INTEGER NOT NULL,
+                `changes` INTEGER NOT NULL,
+                `canceled` INTEGER NOT NULL
+            )
+        """)
+    }
+
+    private fun truncateSubjects(database: SupportSQLiteDatabase) {
+        database.execSQL("DELETE FROM Subjects")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt
new file mode 100644
index 000000000..bc0ff900c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration21.kt
@@ -0,0 +1,15 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration21 : Migration(20, 21) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excusable INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN time_id INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Attendance ADD COLUMN excuse_status TEXT DEFAULT NULL")
+
+        database.execSQL("DELETE FROM Semesters")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
new file mode 100644
index 000000000..cf50a6c3e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration22.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration22 : Migration(21, 22) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN school_short TEXT NOT NULL DEFAULT ''")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
new file mode 100644
index 000000000..22de94c3f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration23.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration23 : Migration(22, 23) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Notes ADD COLUMN teacher_symbol TEXT NOT NULL DEFAULT ''")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN category_type INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN is_points_show INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Notes ADD COLUMN points INTEGER NOT NULL DEFAULT 0")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
new file mode 100644
index 000000000..604ed4875
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration24.kt
@@ -0,0 +1,21 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration24 : Migration(23, 24) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Messages ADD COLUMN has_attachments INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("""
+            CREATE TABLE IF NOT EXISTS MessageAttachments (
+                real_id INTEGER NOT NULL,
+                message_id INTEGER NOT NULL,
+                one_drive_id TEXT NOT NULL,
+                url TEXT NOT NULL,
+                filename TEXT NOT NULL,
+                PRIMARY KEY(real_id)
+            )
+        """)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
new file mode 100644
index 000000000..4749bac73
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration25.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration25 : Migration(24, 25) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Homework ADD COLUMN is_done INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE Homework ADD COLUMN attachments TEXT NOT NULL DEFAULT \"[]\"")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
new file mode 100644
index 000000000..7130d86d8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration26.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration26 : Migration(25, 26) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_predicted_grade_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN is_final_grade_notified INTEGER NOT NULL DEFAULT 1")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN predicted_grade_last_change INTEGER NOT NULL DEFAULT 0")
+        database.execSQL("ALTER TABLE GradesSummary ADD COLUMN final_grade_last_change INTEGER NOT NULL DEFAULT 0")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
new file mode 100644
index 000000000..6592228a1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration27.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration27 : Migration(26, 27) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Students ADD COLUMN user_name TEXT NOT NULL DEFAULT \"\"")
+
+        val students = getStudentsIdsAndNames(database)
+        val units = getReportingUnits(database)
+
+        students.forEach { (id, userLoginId, studentName) ->
+            val userNameFromUnits = units.singleOrNull { (senderId, _) -> senderId == userLoginId }?.second
+            val normalizedStudentName = studentName.split(" ").asReversed().joinToString(" ")
+
+            val userName = userNameFromUnits ?: normalizedStudentName
+            database.execSQL("UPDATE Students SET user_name = '$userName' WHERE id = '$id'")
+        }
+    }
+
+    private fun getStudentsIdsAndNames(database: SupportSQLiteDatabase): MutableList<Triple<Long, Int, String>> {
+        val students = mutableListOf<Triple<Long, Int, String>>()
+        val studentsCursor = database.query("SELECT id, user_login_id, student_name FROM Students")
+        if (studentsCursor.moveToFirst()) {
+            do {
+                students.add(Triple(studentsCursor.getLong(0), studentsCursor.getInt(1), studentsCursor.getString(2)))
+            } while (studentsCursor.moveToNext())
+        }
+        return students
+    }
+
+    private fun getReportingUnits(database: SupportSQLiteDatabase): MutableList<Pair<Int, String>> {
+        val units = mutableListOf<Pair<Int, String>>()
+        val unitsCursor = database.query("SELECT sender_id, sender_name FROM ReportingUnits")
+        if (unitsCursor.moveToFirst()) {
+            do {
+                units.add(unitsCursor.getInt(0) to unitsCursor.getString(1))
+            } while (unitsCursor.moveToNext())
+        }
+
+        return units
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
index fe0dec48f..dbcd916ba 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration5.kt
@@ -2,8 +2,8 @@ package io.github.wulkanowy.data.db.migrations
 
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import org.threeten.bp.LocalDateTime.now
-import org.threeten.bp.ZoneOffset
+import java.time.LocalDateTime.now
+import java.time.ZoneOffset
 
 class Migration5 : Migration(4, 5) {
 
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
new file mode 100644
index 000000000..acd93a91a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/SemesterMapper.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.sdk.pojo.Semester as SdkSemester
+
+fun List<SdkSemester>.mapToEntities(studentId: Int) = map {
+    Semester(
+        studentId = studentId,
+        diaryId = it.diaryId,
+        diaryName = it.diaryName,
+        schoolYear = it.schoolYear,
+        semesterId = it.semesterId,
+        semesterName = it.semesterNumber,
+        start = it.start,
+        end = it.end,
+        classId = it.classId,
+        unitId = it.unitId
+    )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
new file mode 100644
index 000000000..67f56c628
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/mappers/StudentMapper.kt
@@ -0,0 +1,35 @@
+package io.github.wulkanowy.data.mappers
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import java.time.LocalDateTime
+import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
+
+fun List<SdkStudent>.mapToEntities(password: String = "") = map {
+    StudentWithSemesters(
+        student = Student(
+            email = it.email,
+            password = password,
+            isParent = it.isParent,
+            symbol = it.symbol,
+            studentId = it.studentId,
+            userLoginId = it.userLoginId,
+            userName = it.userName,
+            studentName = it.studentName + " " + it.studentSurname,
+            schoolSymbol = it.schoolSymbol,
+            schoolShortName = it.schoolShortName,
+            schoolName = it.schoolName,
+            className = it.className,
+            classId = it.classId,
+            scrapperBaseUrl = it.scrapperBaseUrl,
+            loginType = it.loginType.name,
+            isCurrent = false,
+            registrationDate = LocalDateTime.now(),
+            mobileBaseUrl = it.mobileBaseUrl,
+            privateKey = it.privateKey,
+            certificateKey = it.certificateKey,
+            loginMode = it.loginMode.name
+        ),
+        semesters = it.semesters.mapToEntities(it.studentId)
+    )
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
new file mode 100644
index 000000000..d2338c281
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/Contributor.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.data.pojos
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class Contributor(
+    val displayName: String,
+    val githubUsername: String
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
new file mode 100644
index 000000000..34b62abdb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/pojos/GradeStatisticsItem.kt
@@ -0,0 +1,14 @@
+package io.github.wulkanowy.data.pojos
+
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
+
+data class GradeStatisticsItem(
+
+    val type: ViewType,
+
+    val partial: List<GradeStatistics>,
+
+    val points: GradePointsStatistics?
+)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
new file mode 100644
index 000000000..ff538969b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/appcreator/AppCreatorRepository.kt
@@ -0,0 +1,24 @@
+package io.github.wulkanowy.data.repositories.appcreator
+
+import android.content.res.AssetManager
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.utils.DispatchersProvider
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class AppCreatorRepository @Inject constructor(
+    private val assets: AssetManager,
+    private val dispatchers: DispatchersProvider
+) {
+
+    suspend fun getAppCreators() = withContext(dispatchers.backgroundThread) {
+        val moshi = Moshi.Builder().build()
+        val type = Types.newParameterizedType(List::class.java, Contributor::class.java)
+        val adapter = moshi.adapter<List<Contributor>>(type)
+        adapter.fromJson(assets.open("contributors.json").bufferedReader().use { it.readText() })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
index 0f5873766..9aaa52304 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.attendance
 import io.github.wulkanowy.data.db.dao.AttendanceDao
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceLocal @Inject constructor(private val attendanceDb: AttendanceDao) {
 
-    fun saveAttendance(attendance: List<Attendance>) {
+    suspend fun saveAttendance(attendance: List<Attendance>) {
         attendanceDb.insertAll(attendance)
     }
 
-    fun deleteAttendance(attendance: List<Attendance>) {
+    suspend fun deleteAttendance(attendance: List<Attendance>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Attendance>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Attendance>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
index cd7702c10..870690ec0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemote.kt
@@ -2,34 +2,49 @@ package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.sdk.pojo.Absent
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Attendance>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendance(startDate, endDate, semester.semesterId)
-            .map { attendance ->
-                attendance.map {
-                    Attendance(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        date = it.date,
-                        number = it.number,
-                        subject = it.subject,
-                        name = it.name,
-                        presence = it.presence,
-                        absence = it.absence,
-                        exemption = it.exemption,
-                        lateness = it.lateness,
-                        excused = it.excused,
-                        deleted = it.deleted
-                    )
-                }
+    suspend fun getAttendance(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Attendance> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendance(startDate, endDate, semester.semesterId)
+            .map {
+                Attendance(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    date = it.date,
+                    timeId = it.timeId,
+                    number = it.number,
+                    subject = it.subject,
+                    name = it.name,
+                    presence = it.presence,
+                    absence = it.absence,
+                    exemption = it.exemption,
+                    lateness = it.lateness,
+                    excused = it.excused,
+                    deleted = it.deleted,
+                    excusable = it.excusable,
+                    excuseStatus = it.excuseStatus?.name
+                )
             }
     }
+
+    suspend fun excuseAbsence(student: Student, semester: Semester, absenceList: List<Attendance>, reason: String?): Boolean {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).excuseForAbsence(absenceList.map { attendance ->
+            Absent(
+                date = LocalDateTime.of(attendance.date, LocalTime.of(0, 0)),
+                timeId = attendance.timeId
+            )
+        }, reason)
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
index 85102b3c5..60f864f27 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRepository.kt
@@ -1,44 +1,34 @@
 package io.github.wulkanowy.data.repositories.attendance
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: AttendanceLocal,
     private val remote: AttendanceRemote
 ) {
 
-    fun getAttendance(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean)
-        : Single<List<Attendance>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getAttendance(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                        if (it) remote.getAttendance(semester, dates.first, dates.second)
-                        else Single.error(UnknownHostException())
-                    }.flatMap { newAttendance ->
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                            .doOnSuccess { oldAttendance ->
-                                local.deleteAttendance(oldAttendance.uniqueSubtract(newAttendance))
-                                local.saveAttendance(newAttendance.uniqueSubtract(oldAttendance))
-                            }
-                    }.flatMap {
-                        local.getAttendance(semester, dates.first, dates.second)
-                            .toSingle(emptyList())
-                    }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
+    fun getAttendance(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getAttendance(semester, start.monday, end.sunday) },
+        fetch = { remote.getAttendance(student, semester, start.monday, end.sunday) },
+        saveFetchResult = { old, new ->
+            local.deleteAttendance(old uniqueSubtract new)
+            local.saveAttendance(new uniqueSubtract old)
+        },
+        filterResult = { it.filter { item -> item.date in start..end } }
+    )
+
+    suspend fun excuseForAbsence(student: Student, semester: Semester, attendanceList: List<Attendance>, reason: String? = null) {
+        remote.excuseAbsence(student, semester, attendanceList, reason)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
new file mode 100644
index 000000000..50d6b8ed5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendance/SentExcuseStatus.kt
@@ -0,0 +1,7 @@
+package io.github.wulkanowy.data.repositories.attendance
+
+enum class SentExcuseStatus(val id: Int = 0) {
+    WAITING,
+    ACCEPTED,
+    DENIED
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
index 2e9a10067..703bc9474 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 import io.github.wulkanowy.data.db.dao.AttendanceSummaryDao
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryLocal @Inject constructor(private val attendanceDb: AttendanceSummaryDao) {
 
-    fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
+    suspend fun saveAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.insertAll(attendance)
     }
 
-    fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
+    suspend fun deleteAttendanceSummary(attendance: List<AttendanceSummary>) {
         attendanceDb.deleteAll(attendance)
     }
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Maybe<List<AttendanceSummary>> {
-        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId).filter { it.isNotEmpty() }
+    fun getAttendanceSummary(semester: Semester, subjectId: Int): Flow<List<AttendanceSummary>> {
+        return attendanceDb.loadAll(semester.diaryId, semester.studentId, subjectId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
index c167427f7..29a0b9a7b 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRemote.kt
@@ -2,32 +2,32 @@ package io.github.wulkanowy.data.repositories.attendancesummary
 
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int): Single<List<AttendanceSummary>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getAttendanceSummary(subjectId)
-            .map { attendance ->
-                attendance.map {
-                    AttendanceSummary(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        subjectId = subjectId,
-                        month = it.month,
-                        presence = it.presence,
-                        absence = it.absence,
-                        absenceExcused = it.absenceExcused,
-                        absenceForSchoolReasons = it.absenceForSchoolReasons,
-                        lateness = it.lateness,
-                        latenessExcused = it.latenessExcused,
-                        exemption = it.exemption
-                    )
-                }
+    suspend fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int): List<AttendanceSummary> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getAttendanceSummary(subjectId)
+            .map {
+                AttendanceSummary(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    subjectId = subjectId,
+                    month = it.month,
+                    presence = it.presence,
+                    absence = it.absence,
+                    absenceExcused = it.absenceExcused,
+                    absenceForSchoolReasons = it.absenceForSchoolReasons,
+                    lateness = it.lateness,
+                    latenessExcused = it.latenessExcused,
+                    exemption = it.exemption
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
index c65870508..5dbe1ab05 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/attendancesummary/AttendanceSummaryRepository.kt
@@ -1,34 +1,25 @@
 package io.github.wulkanowy.data.repositories.attendancesummary
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class AttendanceSummaryRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: AttendanceSummaryLocal,
     private val remote: AttendanceSummaryRemote
 ) {
 
-    fun getAttendanceSummary(semester: Semester, subjectId: Int, forceRefresh: Boolean = false): Single<List<AttendanceSummary>> {
-        return local.getAttendanceSummary(semester, subjectId).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getAttendanceSummary(semester, subjectId)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getAttendanceSummary(semester, subjectId).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteAttendanceSummary(old.uniqueSubtract(new))
-                            local.saveAttendanceSummary(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getAttendanceSummary(semester, subjectId).toSingle(emptyList()) })
-    }
+    fun getAttendanceSummary(student: Student, semester: Semester, subjectId: Int, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getAttendanceSummary(semester, subjectId) },
+        fetch = { remote.getAttendanceSummary(student, semester, subjectId) },
+        saveFetchResult = { old, new ->
+            local.deleteAttendanceSummary(old uniqueSubtract new)
+            local.saveAttendanceSummary(new uniqueSubtract old)
+        }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
index 9b275908e..51a1bdbfc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.completedlessons
 import io.github.wulkanowy.data.db.dao.CompletedLessonsDao
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsLocal @Inject constructor(private val completedLessonsDb: CompletedLessonsDao) {
 
-    fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
+    suspend fun saveCompletedLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.insertAll(completedLessons)
     }
 
-    fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
+    suspend fun deleteCompleteLessons(completedLessons: List<CompletedLesson>) {
         completedLessonsDb.deleteAll(completedLessons)
     }
 
-    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Maybe<List<CompletedLesson>> {
-        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end).filter { it.isNotEmpty() }
+    fun getCompletedLessons(semester: Semester, start: LocalDate, end: LocalDate): Flow<List<CompletedLesson>> {
+        return completedLessonsDb.loadAll(semester.diaryId, semester.studentId, start, end)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
index ca680f209..d15a27623 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemote.kt
@@ -2,34 +2,34 @@ package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<CompletedLesson>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getCompletedLessons(startDate, endDate)
-            .map { lessons ->
-                lessons.map {
-                    it.absence
-                    CompletedLesson(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        date = it.date,
-                        number = it.number,
-                        subject = it.subject,
-                        topic = it.topic,
-                        teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol,
-                        substitution = it.substitution,
-                        absence = it.absence,
-                        resources = it.resources
-                    )
-                }
+    suspend fun getCompletedLessons(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<CompletedLesson> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getCompletedLessons(startDate, endDate)
+            .map {
+                it.absence
+                CompletedLesson(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    date = it.date,
+                    number = it.number,
+                    subject = it.subject,
+                    topic = it.topic,
+                    teacher = it.teacher,
+                    teacherSymbol = it.teacherSymbol,
+                    substitution = it.substitution,
+                    absence = it.absence,
+                    resources = it.resources
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
index c22fabc39..61268a66a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRepository.kt
@@ -1,44 +1,29 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class CompletedLessonsRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: CompletedLessonsLocal,
     private val remote: CompletedLessonsRemote
 ) {
 
-    fun getCompletedLessons(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<CompletedLesson>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getCompletedLessons(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getCompletedLessons(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteCompleteLessons(old.uniqueSubtract(new))
-                                    local.saveCompletedLessons(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getCompletedLessons(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
-    }
+    fun getCompletedLessons(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getCompletedLessons(semester, start.monday, end.sunday) },
+        fetch = { remote.getCompletedLessons(student, semester, start.monday, end.sunday) },
+        saveFetchResult = { old, new ->
+            local.deleteCompleteLessons(old uniqueSubtract new)
+            local.saveCompletedLessons(new uniqueSubtract old)
+        },
+        filterResult = { it.filter { item -> item.date in start..end } }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
index 0f484d323..acc55b5ec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamLocal.kt
@@ -3,24 +3,23 @@ package io.github.wulkanowy.data.repositories.exam
 import io.github.wulkanowy.data.db.dao.ExamDao
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamLocal @Inject constructor(private val examDb: ExamDao) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Exam>> {
+    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Exam>> {
         return examDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
-                .filter { !it.isEmpty() }
     }
 
-    fun saveExams(exams: List<Exam>) {
+    suspend fun saveExams(exams: List<Exam>) {
         examDb.insertAll(exams)
     }
 
-    fun deleteExams(exams: List<Exam>) {
+    suspend fun deleteExams(exams: List<Exam>) {
         examDb.deleteAll(exams)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
index ea7ec9441..ac4aa93d7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRemote.kt
@@ -2,32 +2,32 @@ package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Exam>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getExams(startDate, endDate, semester.semesterId)
-            .map { exams ->
-                exams.map {
-                    Exam(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        date = it.date,
-                        entryDate = it.entryDate,
-                        subject = it.subject,
-                        group = it.group,
-                        type = it.type,
-                        description = it.description,
-                        teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol
-                    )
-                }
+    suspend fun getExams(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Exam> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getExams(startDate, endDate, semester.semesterId)
+            .map {
+                Exam(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    date = it.date,
+                    entryDate = it.entryDate,
+                    subject = it.subject,
+                    group = it.group,
+                    type = it.type,
+                    description = it.description,
+                    teacher = it.teacher,
+                    teacherSymbol = it.teacherSymbol
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
index be60eaecd..3f4591a25 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/exam/ExamRepository.kt
@@ -1,44 +1,29 @@
 package io.github.wulkanowy.data.repositories.exam
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.endExamsDay
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.startExamsDay
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ExamRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: ExamLocal,
     private val remote: ExamRemote
 ) {
 
-    fun getExams(semester: Semester, startDate: LocalDate, endDate: LocalDate, forceRefresh: Boolean = false): Single<List<Exam>> {
-        return Single.fromCallable { startDate.monday to endDate.friday }
-            .flatMap { dates ->
-                local.getExams(semester, dates.first, dates.second).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getExams(semester, dates.first, dates.second)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteExams(old.uniqueSubtract(new))
-                                    local.saveExams(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getExams(semester, dates.first, dates.second)
-                                .toSingle(emptyList())
-                        }).map { list -> list.filter { it.date in startDate..endDate } }
-            }
-    }
+    fun getExams(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getExams(semester, start.startExamsDay, start.endExamsDay) },
+        fetch = { remote.getExams(student, semester, start.startExamsDay, start.endExamsDay) },
+        saveFetchResult = { old, new ->
+            local.deleteExams(old uniqueSubtract new)
+            local.saveExams(new uniqueSubtract old)
+        },
+        filterResult = { it.filter { item -> item.date in start..end } }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
index 4983a4740..ed3635423 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeLocal.kt
@@ -1,28 +1,49 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.dao.GradeDao
+import io.github.wulkanowy.data.db.dao.GradeSummaryDao
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class GradeLocal @Inject constructor(private val gradeDb: GradeDao) {
+class GradeLocal @Inject constructor(
+    private val gradeDb: GradeDao,
+    private val gradeSummaryDb: GradeSummaryDao
+) {
 
-    fun saveGrades(grades: List<Grade>) {
+    suspend fun saveGrades(grades: List<Grade>) {
         gradeDb.insertAll(grades)
     }
 
-    fun deleteGrades(grades: List<Grade>) {
+    suspend fun deleteGrades(grades: List<Grade>) {
         gradeDb.deleteAll(grades)
     }
 
-    fun updateGrades(grades: List<Grade>) {
+    suspend fun updateGrades(grades: List<Grade>) {
         gradeDb.updateAll(grades)
     }
 
-    fun getGrades(semester: Semester): Maybe<List<Grade>> {
-        return gradeDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.updateAll(gradesSummary)
+    }
+
+    fun getGradesDetails(semester: Semester): Flow<List<Grade>> {
+        return gradeDb.loadAll(semester.semesterId, semester.studentId)
+    }
+
+    suspend fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.insertAll(gradesSummary)
+    }
+
+    suspend fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
+        gradeSummaryDb.deleteAll(gradesSummary)
+    }
+
+    fun getGradesSummary(semester: Semester): Flow<List<GradeSummary>> {
+        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
index d07ac6d1c..9534a8910 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRemote.kt
@@ -1,36 +1,53 @@
 package io.github.wulkanowy.data.repositories.grade
 
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGrades(semester: Semester): Single<List<Grade>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGrades(semester.semesterId)
-            .map { grades ->
-                grades.map {
-                    Grade(
-                        studentId = semester.studentId,
-                        semesterId = semester.semesterId,
-                        subject = it.subject,
-                        entry = it.entry,
-                        value = it.value,
-                        modifier = it.modifier,
-                        comment = it.comment,
-                        color = it.color,
-                        gradeSymbol = it.symbol,
-                        description = it.description,
-                        weight = it.weight,
-                        weightValue = it.weightValue,
-                        date = it.date,
-                        teacher = it.teacher
-                    )
-                }
-            }
+    suspend fun getGrades(student: Student, semester: Semester): Pair<List<Grade>, List<GradeSummary>> {
+        val (details, summary) = sdk
+            .init(student)
+            .switchDiary(semester.diaryId, semester.schoolYear)
+            .getGrades(semester.semesterId)
+
+        return details.map {
+            Grade(
+                studentId = semester.studentId,
+                semesterId = semester.semesterId,
+                subject = it.subject,
+                entry = it.entry,
+                value = it.value,
+                modifier = it.modifier,
+                comment = it.comment,
+                color = it.color,
+                gradeSymbol = it.symbol,
+                description = it.description,
+                weight = it.weight,
+                weightValue = it.weightValue,
+                date = it.date,
+                teacher = it.teacher
+            )
+        } to summary.map {
+            GradeSummary(
+                semesterId = semester.semesterId,
+                studentId = semester.studentId,
+                position = 0,
+                subject = it.name,
+                predictedGrade = it.predicted,
+                finalGrade = it.final,
+                pointsSum = it.pointsSum,
+                proposedPoints = it.proposedPoints,
+                finalPoints = it.finalPoints,
+                average = it.average
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
index 7f8e92a2e..8cbbfdfb0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/grade/GradeRepository.kt
@@ -1,59 +1,98 @@
 package io.github.wulkanowy.data.repositories.grade
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.map
+import java.time.LocalDateTime
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: GradeLocal,
     private val remote: GradeRemote
 ) {
 
-    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Grade>> {
-        return local.getGrades(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGrades(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGrades(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            val notifyBreakDate = old.maxBy { it.date }?.date ?: student.registrationDate.toLocalDate()
-                            local.deleteGrades(old.uniqueSubtract(new))
-                            local.saveGrades(new.uniqueSubtract(old)
-                                .onEach {
-                                    if (it.date >= notifyBreakDate) it.apply {
-                                        isRead = false
-                                        if (notify) isNotified = false
-                                    }
-                                })
-                        }
-                }.flatMap { local.getGrades(semester).toSingle(emptyList()) })
+    fun getGrades(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        shouldFetch = { (details, summaries) -> details.isEmpty() || summaries.isEmpty() || forceRefresh },
+        query = { local.getGradesDetails(semester).combine(local.getGradesSummary(semester)) { details, summaries -> details to summaries } },
+        fetch = { remote.getGrades(student, semester) },
+        saveFetchResult = { old, new ->
+            refreshGradeDetails(student, old.first, new.first, notify)
+            refreshGradeSummaries(old.second, new.second, notify)
+        }
+    )
+
+    private suspend fun refreshGradeDetails(student: Student, oldGrades: List<Grade>, newDetails: List<Grade>, notify: Boolean) {
+        val notifyBreakDate = oldGrades.maxByOrNull { it.date }?.date ?: student.registrationDate.toLocalDate()
+        local.deleteGrades(oldGrades uniqueSubtract newDetails)
+        local.saveGrades((newDetails uniqueSubtract oldGrades).onEach {
+            if (it.date >= notifyBreakDate) it.apply {
+                isRead = false
+                if (notify) isNotified = false
+            }
+        })
     }
 
-    fun getUnreadGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isRead } }.toSingle(emptyList())
+    private suspend fun refreshGradeSummaries(oldSummaries: List<GradeSummary>, newSummary: List<GradeSummary>, notify: Boolean) {
+        local.deleteGradesSummary(oldSummaries uniqueSubtract newSummary)
+        local.saveGradesSummary((newSummary uniqueSubtract oldSummaries).onEach { summary ->
+            val oldSummary = oldSummaries.find { oldSummary -> oldSummary.subject == summary.subject }
+            summary.isPredictedGradeNotified = when {
+                summary.predictedGrade.isEmpty() -> true
+                notify && oldSummary?.predictedGrade != summary.predictedGrade -> false
+                else -> true
+            }
+            summary.isFinalGradeNotified = when {
+                summary.finalGrade.isEmpty() -> true
+                notify && oldSummary?.finalGrade != summary.finalGrade -> false
+                else -> true
+            }
+
+            summary.predictedGradeLastChange = when {
+                oldSummary == null -> LocalDateTime.now()
+                summary.predictedGrade != oldSummary.predictedGrade -> LocalDateTime.now()
+                else -> oldSummary.predictedGradeLastChange
+            }
+            summary.finalGradeLastChange = when {
+                oldSummary == null -> LocalDateTime.now()
+                summary.finalGrade != oldSummary.finalGrade -> LocalDateTime.now()
+                else -> oldSummary.finalGradeLastChange
+            }
+        })
     }
 
-    fun getNotNotifiedGrades(semester: Semester): Single<List<Grade>> {
-        return local.getGrades(semester).map { it.filter { grade -> !grade.isNotified } }.toSingle(emptyList())
+    fun getUnreadGrades(semester: Semester): Flow<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isRead } }
     }
 
-    fun updateGrade(grade: Grade): Completable {
-        return Completable.fromCallable { local.updateGrades(listOf(grade)) }
+    fun getNotNotifiedGrades(semester: Semester): Flow<List<Grade>> {
+        return local.getGradesDetails(semester).map { it.filter { grade -> !grade.isNotified } }
     }
 
-    fun updateGrades(grades: List<Grade>): Completable {
-        return Completable.fromCallable { local.updateGrades(grades) }
+    fun getNotNotifiedPredictedGrades(semester: Semester): Flow<List<GradeSummary>> {
+        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isPredictedGradeNotified } }
+    }
+
+    fun getNotNotifiedFinalGrades(semester: Semester): Flow<List<GradeSummary>> {
+        return local.getGradesSummary(semester).map { it.filter { gradeSummary -> !gradeSummary.isFinalGradeNotified } }
+    }
+
+    suspend fun updateGrade(grade: Grade) {
+        return local.updateGrades(listOf(grade))
+    }
+
+    suspend fun updateGrades(grades: List<Grade>) {
+        return local.updateGrades(grades)
+    }
+
+    suspend fun updateGradesSummary(gradesSummary: List<GradeSummary>) {
+        return local.updateGradesSummary(gradesSummary)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
deleted file mode 100644
index e74641d3a..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryLocal.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.data.db.dao.GradeSummaryDao
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryLocal @Inject constructor(private val gradeSummaryDb: GradeSummaryDao) {
-
-    fun saveGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.insertAll(gradesSummary)
-    }
-
-    fun deleteGradesSummary(gradesSummary: List<GradeSummary>) {
-        gradeSummaryDb.deleteAll(gradesSummary)
-    }
-
-    fun getGradesSummary(semester: Semester): Maybe<List<GradeSummary>> {
-        return gradeSummaryDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
deleted file mode 100644
index 2681fe058..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRemote.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryRemote @Inject constructor(private val sdk: Sdk) {
-
-    fun getGradeSummary(semester: Semester): Single<List<GradeSummary>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesSummary(semester.semesterId)
-            .map { gradesSummary ->
-                gradesSummary.map {
-                    GradeSummary(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        position = 0,
-                        subject = it.name,
-                        predictedGrade = it.predicted,
-                        finalGrade = it.final,
-                        pointsSum = it.pointsSum,
-                        proposedPoints = it.proposedPoints,
-                        finalPoints = it.finalPoints,
-                        average = it.average
-                    )
-                }
-            }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
deleted file mode 100644
index 660a032c2..000000000
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradessummary/GradeSummaryRepository.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.github.wulkanowy.data.repositories.gradessummary
-
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GradeSummaryRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
-    private val local: GradeSummaryLocal,
-    private val remote: GradeSummaryRemote
-) {
-
-    fun getGradesSummary(semester: Semester, forceRefresh: Boolean = false): Single<List<GradeSummary>> {
-        return local.getGradesSummary(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGradeSummary(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesSummary(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesSummary(old.uniqueSubtract(new))
-                            local.saveGradesSummary(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesSummary(semester).toSingle(emptyList()) })
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
index d636b91ac..e0e2cd4db 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsLocal.kt
@@ -5,7 +5,7 @@ import io.github.wulkanowy.data.db.dao.GradeStatisticsDao
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -15,52 +15,27 @@ class GradeStatisticsLocal @Inject constructor(
     private val gradePointsStatisticsDb: GradePointsStatisticsDao
 ) {
 
-    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Maybe<List<GradeStatistics>> {
-        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).filter { it.isNotEmpty() }
+    fun getGradesStatistics(semester: Semester, isSemester: Boolean): Flow<List<GradeStatistics>> {
+        return gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester)
     }
 
-    fun getGradesPointsStatistics(semester: Semester): Maybe<List<GradePointsStatistics>> {
-        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).filter { it.isNotEmpty() }
+    fun getGradesPointsStatistics(semester: Semester): Flow<List<GradePointsStatistics>> {
+        return gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId)
     }
 
-    fun getGradesStatistics(semester: Semester, isSemester: Boolean, subjectName: String): Maybe<List<GradeStatistics>> {
-        return when (subjectName) {
-            "Wszystkie" -> gradeStatisticsDb.loadAll(semester.semesterId, semester.studentId, isSemester).map { list ->
-                list.groupBy { it.grade }.map {
-                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
-                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
-                }
-            }
-            else -> gradeStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName, isSemester)
-        }.filter { it.isNotEmpty() }
-    }
-
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String): Maybe<GradePointsStatistics> {
-        return when (subjectName) {
-            "Wszystkie" -> gradePointsStatisticsDb.loadAll(semester.semesterId, semester.studentId).flatMap { list ->
-                if (list.isEmpty()) return@flatMap Maybe.empty<GradePointsStatistics>()
-                Maybe.just(GradePointsStatistics(semester.studentId, semester.semesterId, subjectName,
-                    list.fold(.0) { acc, e -> acc + e.others },
-                    list.fold(.0) { acc, e -> acc + e.student })
-                )
-            }
-            else -> gradePointsStatisticsDb.loadSubject(semester.semesterId, semester.studentId, subjectName)
-        }
-    }
-
-    fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    suspend fun saveGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.insertAll(gradesStatistics)
     }
 
-    fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
+    suspend fun saveGradesPointsStatistics(gradePointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.insertAll(gradePointsStatistics)
     }
 
-    fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
+    suspend fun deleteGradesStatistics(gradesStatistics: List<GradeStatistics>) {
         gradeStatisticsDb.deleteAll(gradesStatistics)
     }
 
-    fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
+    suspend fun deleteGradesPointsStatistics(gradesPointsStatistics: List<GradePointsStatistics>) {
         gradePointsStatisticsDb.deleteAll(gradesPointsStatistics)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
index f10f30369..1ff8132fc 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemote.kt
@@ -3,44 +3,42 @@ package io.github.wulkanowy.data.repositories.gradestatistics
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getGradeStatistics(semester: Semester, isSemester: Boolean): Single<List<GradeStatistics>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).let {
+    suspend fun getGradeStatistics(student: Student, semester: Semester, isSemester: Boolean): List<GradeStatistics> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear).let {
             if (isSemester) it.getGradesAnnualStatistics(semester.semesterId)
             else it.getGradesPartialStatistics(semester.semesterId)
-        }.map { gradeStatistics ->
-            gradeStatistics.map {
-                GradeStatistics(
-                    semesterId = semester.semesterId,
-                    studentId = semester.studentId,
-                    subject = it.subject,
-                    grade = it.gradeValue,
-                    amount = it.amount,
-                    semester = isSemester
-                )
-            }
+        }.map {
+            GradeStatistics(
+                semesterId = semester.semesterId,
+                studentId = semester.studentId,
+                subject = it.subject,
+                grade = it.gradeValue,
+                amount = it.amount,
+                semester = isSemester
+            )
         }
     }
 
-    fun getGradePointsStatistics(semester: Semester): Single<List<GradePointsStatistics>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getGradesPointsStatistics(semester.semesterId)
-            .map { gradePointsStatistics ->
-                gradePointsStatistics.map {
-                    GradePointsStatistics(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        subject = it.subject,
-                        others = it.others,
-                        student = it.student
-                    )
-                }
+    suspend fun getGradePointsStatistics(student: Student, semester: Semester): List<GradePointsStatistics> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getGradesPointsStatistics(semester.semesterId)
+            .map {
+                GradePointsStatistics(
+                    semesterId = semester.semesterId,
+                    studentId = semester.studentId,
+                    subject = it.subject,
+                    others = it.others,
+                    student = it.student
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
index 9335d1d21..52ca705f7 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRepository.kt
@@ -1,51 +1,72 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.GradePointsStatistics
 import io.github.wulkanowy.data.db.entities.GradeStatistics
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.ui.modules.grade.statistics.ViewType
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class GradeStatisticsRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: GradeStatisticsLocal,
     private val remote: GradeStatisticsRemote
 ) {
 
-    fun getGradesStatistics(semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false): Single<List<GradeStatistics>> {
-        return local.getGradesStatistics(semester, isSemester, subjectName).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getGradeStatistics(semester, isSemester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesStatistics(semester, isSemester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesStatistics(old.uniqueSubtract(new))
-                            local.saveGradesStatistics(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesStatistics(semester, isSemester, subjectName).toSingle(emptyList()) })
+    fun getGradesStatistics(student: Student, semester: Semester, subjectName: String, isSemester: Boolean, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getGradesStatistics(semester, isSemester) },
+        fetch = { remote.getGradeStatistics(student, semester, isSemester) },
+        saveFetchResult = { old, new ->
+            local.deleteGradesStatistics(old uniqueSubtract new)
+            local.saveGradesStatistics(new uniqueSubtract old)
+        },
+        mapResult = { items ->
+            when (subjectName) {
+                "Wszystkie" -> items.groupBy { it.grade }.map {
+                    GradeStatistics(semester.studentId, semester.semesterId, subjectName, it.key,
+                        it.value.fold(0) { acc, e -> acc + e.amount }, false)
+                } + items
+                else -> items.filter { it.subject == subjectName }
+            }.mapToStatisticItems()
+        }
+    )
+
+    fun getGradesPointsStatistics(student: Student, semester: Semester, subjectName: String, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getGradesPointsStatistics(semester) },
+        fetch = { remote.getGradePointsStatistics(student, semester) },
+        saveFetchResult = { old, new ->
+            local.deleteGradesPointsStatistics(old uniqueSubtract new)
+            local.saveGradesPointsStatistics(new uniqueSubtract old)
+        },
+        mapResult = { items ->
+            when (subjectName) {
+                "Wszystkie" -> items
+                else -> items.filter { it.subject == subjectName }
+            }.mapToStatisticsItem()
+        }
+    )
+
+    private fun List<GradeStatistics>.mapToStatisticItems() = groupBy { it.subject }.map {
+        GradeStatisticsItem(
+            type = ViewType.PARTIAL,
+            partial = it.value
+                .sortedByDescending { item -> item.grade }
+                .filter { item -> item.amount != 0 },
+            points = null
+        )
     }
 
-    fun getGradesPointsStatistics(semester: Semester, subjectName: String, forceRefresh: Boolean): Maybe<GradePointsStatistics> {
-        return local.getGradesPointsStatistics(semester, subjectName).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMapMaybe {
-                    if (it) remote.getGradePointsStatistics(semester).toMaybe()
-                    else Maybe.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getGradesPointsStatistics(semester).defaultIfEmpty(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteGradesPointsStatistics(old.uniqueSubtract(new))
-                            local.saveGradesPointsStatistics(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getGradesPointsStatistics(semester, subjectName) })
+    private fun List<GradePointsStatistics>.mapToStatisticsItem() = map {
+        GradeStatisticsItem(
+            type = ViewType.POINTS,
+            partial = emptyList(),
+            points = it
+        )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
index 671ecafd7..f2cbb8031 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkLocal.kt
@@ -3,24 +3,27 @@ package io.github.wulkanowy.data.repositories.homework
 import io.github.wulkanowy.data.db.dao.HomeworkDao
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkLocal @Inject constructor(private val homeworkDb: HomeworkDao) {
 
-    fun saveHomework(homework: List<Homework>) {
+    suspend fun saveHomework(homework: List<Homework>) {
         homeworkDb.insertAll(homework)
     }
 
-    fun deleteHomework(homework: List<Homework>) {
+    suspend fun deleteHomework(homework: List<Homework>) {
         homeworkDb.deleteAll(homework)
     }
 
-    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Homework>> {
+    suspend fun updateHomework(homework: List<Homework>) {
+        homeworkDb.updateAll(homework)
+    }
+
+    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Homework>> {
         return homeworkDb.loadAll(semester.semesterId, semester.studentId, startDate, endDate)
-            .filter { it.isNotEmpty() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
index 189499dbe..32109877a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRemote.kt
@@ -2,30 +2,31 @@ package io.github.wulkanowy.data.repositories.homework
 
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getHomework(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Homework>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getHomework(startDate, endDate)
-            .map { homework ->
-                homework.map {
-                    Homework(
-                        semesterId = semester.semesterId,
-                        studentId = semester.studentId,
-                        date = it.date,
-                        entryDate = it.entryDate,
-                        subject = it.subject,
-                        content = it.content,
-                        teacher = it.teacher,
-                        teacherSymbol = it.teacherSymbol
-                    )
-                }
+    suspend fun getHomework(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Homework> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getHomework(startDate, endDate)
+            .map {
+                Homework(
+                    semesterId = semester.semesterId,
+                    studentId = semester.studentId,
+                    date = it.date,
+                    entryDate = it.entryDate,
+                    subject = it.subject,
+                    content = it.content,
+                    teacher = it.teacher,
+                    teacherSymbol = it.teacherSymbol,
+                    attachments = it.attachments.map { attachment -> attachment.url to attachment.name }
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
index 3f924944d..54397ea02 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/homework/HomeworkRepository.kt
@@ -1,39 +1,35 @@
 package io.github.wulkanowy.data.repositories.homework
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class HomeworkRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: HomeworkLocal,
     private val remote: HomeworkRemote
 ) {
 
-    fun getHomework(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Homework>> {
-        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
-            local.getHomework(semester, monday, friday).filter { !forceRefresh }
-                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                    .flatMap {
-                        if (it) remote.getHomework(semester, monday, friday)
-                        else Single.error(UnknownHostException())
-                    }.flatMap { new ->
-                        local.getHomework(semester, monday, friday).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteHomework(old.uniqueSubtract(new))
-                                local.saveHomework(new.uniqueSubtract(old))
-                            }
-                    }.flatMap { local.getHomework(semester, monday, friday).toSingle(emptyList()) })
+    fun getHomework(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getHomework(semester, start.monday, end.sunday) },
+        fetch = { remote.getHomework(student, semester, start.monday, end.sunday) },
+        saveFetchResult = { old, new ->
+            local.deleteHomework(old uniqueSubtract new)
+            local.saveHomework(new uniqueSubtract old)
         }
+    )
+
+    suspend fun toggleDone(homework: Homework) {
+        local.updateHomework(listOf(homework.apply {
+            isDone = !isDone
+        }))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
new file mode 100644
index 000000000..85168fee5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/logger/LoggerRepository.kt
@@ -0,0 +1,38 @@
+package io.github.wulkanowy.data.repositories.logger
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.utils.DispatchersProvider
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileNotFoundException
+import javax.inject.Inject
+
+class LoggerRepository @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val dispatchers: DispatchersProvider
+) {
+
+    suspend fun getLastLogLines() = getLastModified().readText().split("\n")
+
+    suspend fun getLogFiles() = withContext(dispatchers.backgroundThread) {
+        File(context.filesDir.absolutePath).listFiles(File::isFile)?.filter {
+            it.name.endsWith(".log")
+        }!!
+    }
+
+    private suspend fun getLastModified(): File {
+        return withContext(dispatchers.backgroundThread) {
+            var lastModifiedTime = Long.MIN_VALUE
+            var chosenFile: File? = null
+            File(context.filesDir.absolutePath).listFiles(File::isFile)?.forEach { file ->
+                if (file.lastModified() > lastModifiedTime) {
+                    lastModifiedTime = file.lastModified()
+                    chosenFile = file
+                }
+            }
+            if (chosenFile == null) throw FileNotFoundException("Log file not found")
+            chosenFile!!
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
index b461ca22a..0c3156d1e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberLocal.kt
@@ -2,28 +2,28 @@ package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.dao.LuckyNumberDao
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.data.db.entities.Student
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberLocal @Inject constructor(private val luckyNumberDb: LuckyNumberDao) {
 
-    fun saveLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.insertAll(listOf(luckyNumber))
+    suspend fun saveLuckyNumber(luckyNumber: LuckyNumber?) {
+        luckyNumberDb.insertAll(listOfNotNull(luckyNumber))
     }
 
-    fun updateLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.updateAll(listOf(luckyNumber))
+    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) {
+        luckyNumberDb.updateAll(listOfNotNull(luckyNumber))
     }
 
-    fun deleteLuckyNumber(luckyNumber: LuckyNumber) {
-        luckyNumberDb.deleteAll(listOf(luckyNumber))
+    suspend fun deleteLuckyNumber(luckyNumber: LuckyNumber?) {
+        luckyNumberDb.deleteAll(listOfNotNull(luckyNumber))
     }
 
-    fun getLuckyNumber(semester: Semester, date: LocalDate): Maybe<LuckyNumber> {
-        return luckyNumberDb.load(semester.studentId, date)
+    fun getLuckyNumber(student: Student, date: LocalDate): Flow<LuckyNumber?> {
+        return luckyNumberDb.load(student.studentId, date)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
index 75454143f..2872957d0 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemote.kt
@@ -1,24 +1,23 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
-        return sdk.getLuckyNumber()
-            .map {
-                LuckyNumber(
-                    studentId = semester.studentId,
-                    date = LocalDate.now(),
-                    luckyNumber = it
-                )
-            }
+    suspend fun getLuckyNumber(student: Student): LuckyNumber? {
+        return sdk.init(student).getLuckyNumber(student.schoolShortName)?.let {
+            LuckyNumber(
+                studentId = student.studentId,
+                date = LocalDate.now(),
+                luckyNumber = it
+            )
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
index 4036521f7..173ce7e45 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRepository.kt
@@ -1,54 +1,36 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.LuckyNumber
-import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate.now
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class LuckyNumberRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: LuckyNumberLocal,
     private val remote: LuckyNumberRemote
 ) {
 
-    fun getLuckyNumber(semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(semester, LocalDate.now()).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMapMaybe {
-                    if (it) remote.getLuckyNumber(semester)
-                    else Maybe.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getLuckyNumber(semester, LocalDate.now())
-                        .doOnSuccess { old ->
-                            if (new != old) {
-                                local.deleteLuckyNumber(old)
-                                local.saveLuckyNumber(new.apply {
-                                    if (notify) isNotified = false
-                                })
-                            }
-                        }
-                        .doOnComplete {
-                            local.saveLuckyNumber(new.apply {
-                                if (notify) isNotified = false
-                            })
-                        }
-                }.flatMap({ local.getLuckyNumber(semester, LocalDate.now()) }, { Maybe.error(it) },
-                    { local.getLuckyNumber(semester, LocalDate.now()) })
-            )
-    }
+    fun getLuckyNumber(student: Student, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        shouldFetch = { it == null || forceRefresh },
+        query = { local.getLuckyNumber(student, now()) },
+        fetch = { remote.getLuckyNumber(student) },
+        saveFetchResult = { old, new ->
+            if (new != old) {
+                old?.let { local.deleteLuckyNumber(it) }
+                local.saveLuckyNumber(new?.apply {
+                    if (notify) isNotified = false
+                })
+            }
+        }
+    )
 
-    fun getNotNotifiedLuckyNumber(semester: Semester): Maybe<LuckyNumber> {
-        return local.getLuckyNumber(semester, LocalDate.now()).filter { !it.isNotified }
-    }
+    suspend fun getNotNotifiedLuckyNumber(student: Student) =
+        local.getLuckyNumber(student, now()).map { if (it?.isNotified == false) it else null }.first()
 
-    fun updateLuckyNumber(luckyNumber: LuckyNumber): Completable {
-        return Completable.fromCallable { local.updateLuckyNumber(luckyNumber) }
-    }
+    suspend fun updateLuckyNumber(luckyNumber: LuckyNumber?) = local.updateLuckyNumber(luckyNumber)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
index ce08d13ec..f1c8eaf08 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageLocal.kt
@@ -1,36 +1,42 @@
 package io.github.wulkanowy.data.repositories.message
 
+import io.github.wulkanowy.data.db.dao.MessageAttachmentDao
 import io.github.wulkanowy.data.db.dao.MessagesDao
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class MessageLocal @Inject constructor(private val messagesDb: MessagesDao) {
+class MessageLocal @Inject constructor(
+    private val messagesDb: MessagesDao,
+    private val messageAttachmentDao: MessageAttachmentDao
+) {
 
-    fun saveMessages(messages: List<Message>) {
+    suspend fun saveMessages(messages: List<Message>) {
         messagesDb.insertAll(messages)
     }
 
-    fun updateMessages(messages: List<Message>) {
+    suspend fun updateMessages(messages: List<Message>) {
         messagesDb.updateAll(messages)
     }
 
-    fun deleteMessages(messages: List<Message>) {
+    suspend fun deleteMessages(messages: List<Message>) {
         messagesDb.deleteAll(messages)
     }
 
-    fun getMessage(id: Long): Maybe<Message> {
-        return messagesDb.load(id)
+    fun getMessageWithAttachment(student: Student, message: Message): Flow<MessageWithAttachment?> {
+        return messagesDb.loadMessageWithAttachment(student.id.toInt(), message.messageId)
     }
 
-    fun getMessages(student: Student, folder: MessageFolder): Maybe<List<Message>> {
-        return when (folder) {
-            TRASHED -> messagesDb.loadDeleted(student.id.toInt())
-            else -> messagesDb.loadAll(student.id.toInt(), folder.id)
-        }.filter { it.isNotEmpty() }
+    suspend fun saveMessageAttachments(attachments: List<MessageAttachment>) {
+        messageAttachmentDao.insertAttachments(attachments)
+    }
+
+    fun getMessages(student: Student, folder: MessageFolder): Flow<List<Message>> {
+        return messagesDb.loadAll(student.id.toInt(), folder.id)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
index d27eb904d..044a13a28 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRemote.kt
@@ -1,14 +1,15 @@
 package io.github.wulkanowy.data.repositories.message
 
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Folder
 import io.github.wulkanowy.sdk.pojo.SentMessage
-import io.reactivex.Single
-import org.threeten.bp.LocalDateTime.now
+import io.github.wulkanowy.utils.init
+import java.time.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -16,35 +17,45 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class MessageRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder): Single<List<Message>> {
-        return sdk.getMessages(Folder.valueOf(folder.name), semester.start.atStartOfDay(), semester.end.atStartOfDay()).map { messages ->
-            messages.map {
-                Message(
-                    studentId = student.id.toInt(),
-                    realId = it.id ?: 0,
-                    messageId = it.messageId ?: 0,
-                    sender = it.sender.orEmpty(),
-                    senderId = it.senderId ?: 0,
-                    recipient = it.recipient.orEmpty(),
-                    subject = it.subject.trim(),
-                    date = it.date ?: now(),
-                    content = it.content.orEmpty(),
-                    folderId = it.folderId,
-                    unread = it.unread ?: false,
-                    unreadBy = it.unreadBy ?: 0,
-                    readBy = it.readBy ?: 0,
-                    removed = it.removed
+    suspend fun getMessages(student: Student, semester: Semester, folder: MessageFolder): List<Message> {
+        return sdk.init(student).getMessages(Folder.valueOf(folder.name), now().minusMonths(3), now()).map {
+            Message(
+                studentId = student.id.toInt(),
+                realId = it.id ?: 0,
+                messageId = it.messageId ?: 0,
+                sender = it.sender?.name.orEmpty(),
+                senderId = it.sender?.loginId ?: 0,
+                recipient = it.recipients.singleOrNull()?.name ?: "Wielu adresatów",
+                subject = it.subject.trim(),
+                date = it.date ?: now(),
+                folderId = it.folderId,
+                unread = it.unread ?: false,
+                removed = it.removed,
+                hasAttachments = it.hasAttachments
+            ).apply {
+                content = it.content.orEmpty()
+                unreadBy = it.unreadBy ?: 0
+                readBy = it.readBy ?: 0
+            }
+        }
+    }
+
+    suspend fun getMessagesContentDetails(student: Student, message: Message, markAsRead: Boolean = false): Pair<String, List<MessageAttachment>> {
+        return sdk.init(student).getMessageDetails(message.messageId, message.folderId, markAsRead, message.realId).let { details ->
+            details.content to details.attachments.map {
+                MessageAttachment(
+                    realId = it.id,
+                    messageId = it.messageId,
+                    oneDriveId = it.oneDriveId,
+                    url = it.url,
+                    filename = it.filename
                 )
             }
         }
     }
 
-    fun getMessagesContent(message: Message, markAsRead: Boolean = false): Single<String> {
-        return sdk.getMessageContent(message.messageId, message.folderId, markAsRead, message.realId)
-    }
-
-    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return sdk.sendMessage(
+    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
+        return sdk.init(student).sendMessage(
             subject = subject,
             content = content,
             recipients = recipients.map {
@@ -61,7 +72,7 @@ class MessageRemote @Inject constructor(private val sdk: Sdk) {
         )
     }
 
-    fun deleteMessage(message: Message): Single<Boolean> {
-        return sdk.deleteMessages(listOf(Pair(message.realId, message.folderId)))
+    suspend fun deleteMessage(student: Student, message: Message): Boolean {
+        return sdk.init(student).deleteMessages(listOf(message.messageId), message.folderId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
index 0dfdd72fe..bb9326992 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/message/MessageRepository.kt
@@ -1,111 +1,76 @@
 package io.github.wulkanowy.data.repositories.message
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.sdk.pojo.SentMessage
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: MessageLocal,
-    private val remote: MessageRemote,
-    private val sdkHelper: SdkHelper
+    private val remote: MessageRemote
 ) {
 
-    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Message>> {
-        return Single.just(sdkHelper.init(student))
-            .flatMap { _ ->
-                local.getMessages(student, folder).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getMessages(student, semester, folder)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getMessages(student, folder).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteMessages(old.uniqueSubtract(new))
-                                    local.saveMessages(new.uniqueSubtract(old)
-                                        .onEach {
-                                            it.isNotified = !notify
-                                        })
-                                }
-                        }.flatMap { local.getMessages(student, folder).toSingle(emptyList()) }
-                    )
-            }
+    fun getMessages(student: Student, semester: Semester, folder: MessageFolder, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getMessages(student, folder) },
+        fetch = { remote.getMessages(student, semester, folder) },
+        saveFetchResult = { old, new ->
+            local.deleteMessages(old uniqueSubtract new)
+            local.saveMessages((new uniqueSubtract old).onEach {
+                it.isNotified = !notify
+            })
+        }
+    )
+
+    fun getMessage(student: Student, message: Message, markAsRead: Boolean = false) = networkBoundResource(
+        shouldFetch = {
+            checkNotNull(it, { "This message no longer exist!" })
+            Timber.d("Message content in db empty: ${it.message.content.isEmpty()}")
+            it.message.unread || it.message.content.isEmpty()
+        },
+        query = { local.getMessageWithAttachment(student, message) },
+        fetch = { remote.getMessagesContentDetails(student, it!!.message, markAsRead) },
+        saveFetchResult = { old, (downloadedMessage, attachments) ->
+            checkNotNull(old, { "Fetched message no longer exist!" })
+            local.updateMessages(listOf(old.message.copy(unread = !markAsRead).apply {
+                id = old.message.id
+                content = content.ifBlank { downloadedMessage }
+            }))
+            local.saveMessageAttachments(attachments)
+            Timber.d("Message ${message.messageId} with blank content: ${old.message.content.isBlank()}, marked as read")
+        }
+    )
+
+    fun getNotNotifiedMessages(student: Student): Flow<List<Message>> {
+        return local.getMessages(student, RECEIVED).map { it.filter { message -> !message.isNotified && message.unread } }
     }
 
-    fun getMessage(student: Student, messageDbId: Long, markAsRead: Boolean = false): Single<Message> {
-        return Single.just(sdkHelper.init(student))
-            .flatMap { _ ->
-                local.getMessage(messageDbId)
-                    .filter { it.content.isNotEmpty() }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) local.getMessage(messageDbId).toSingle()
-                            else Single.error(UnknownHostException())
-                        }
-                        .flatMap { dbMessage ->
-                            remote.getMessagesContent(dbMessage, markAsRead).doOnSuccess {
-                                local.updateMessages(listOf(dbMessage.copy(unread = false).apply {
-                                    id = dbMessage.id
-                                    content = content.ifBlank { it }
-                                }))
-                            }
-                        }.flatMap {
-                            local.getMessage(messageDbId).toSingle()
-                        }
-                    )
-            }
+    suspend fun updateMessages(messages: List<Message>) {
+        return local.updateMessages(messages)
     }
 
-    fun getNotNotifiedMessages(student: Student): Single<List<Message>> {
-        return local.getMessages(student, RECEIVED)
-            .map { it.filter { message -> !message.isNotified && message.unread } }
-            .toSingle(emptyList())
+    suspend fun sendMessage(student: Student, subject: String, content: String, recipients: List<Recipient>): SentMessage {
+        return remote.sendMessage(student, subject, content, recipients)
     }
 
-    fun updateMessage(message: Message): Completable {
-        return Completable.fromCallable { local.updateMessages(listOf(message)) }
-    }
+    suspend fun deleteMessage(student: Student, message: Message) {
+        val isDeleted = remote.deleteMessage(student, message)
 
-    fun updateMessages(messages: List<Message>): Completable {
-        return Completable.fromCallable { local.updateMessages(messages) }
-    }
-
-    fun sendMessage(subject: String, content: String, recipients: List<Recipient>): Single<SentMessage> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.sendMessage(subject, content, recipients)
-                else Single.error(UnknownHostException())
-            }
-    }
-
-    fun deleteMessage(message: Message): Maybe<Boolean> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.deleteMessage(message)
-                else Single.error(UnknownHostException())
-            }
-            .filter { it }
-            .doOnSuccess {
-                if (!message.removed) local.updateMessages(listOf(message.copy(removed = true).apply {
-                    id = message.id
-                    content = message.content
-                }))
-                else local.deleteMessages(listOf(message))
-            }
+        if (message.folderId != MessageFolder.TRASHED.id) {
+            if (isDeleted) local.updateMessages(listOf(message.copy(folderId = MessageFolder.TRASHED.id).apply {
+                id = message.id
+                content = message.content
+            }))
+        } else local.deleteMessages(listOf(message))
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
index 473ffa7fe..0ccb3d7ef 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceLocal.kt
@@ -3,22 +3,22 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 import io.github.wulkanowy.data.db.dao.MobileDeviceDao
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceLocal @Inject constructor(private val mobileDb: MobileDeviceDao) {
 
-    fun saveDevices(devices: List<MobileDevice>) {
+    suspend fun saveDevices(devices: List<MobileDevice>) {
         mobileDb.insertAll(devices)
     }
 
-    fun deleteDevices(devices: List<MobileDevice>) {
+    suspend fun deleteDevices(devices: List<MobileDevice>) {
         mobileDb.deleteAll(devices)
     }
 
-    fun getDevices(semester: Semester): Maybe<List<MobileDevice>> {
-        return mobileDb.loadAll(semester.studentId).filter { it.isNotEmpty() }
+    fun getDevices(semester: Semester): Flow<List<MobileDevice>> {
+        return mobileDb.loadAll(semester.studentId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
index c43c3f21e..907e965ce 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRemote.kt
@@ -2,36 +2,38 @@ package io.github.wulkanowy.data.repositories.mobiledevice
 
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getDevices(semester: Semester): Single<List<MobileDevice>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getRegisteredDevices()
-            .map { devices ->
-                devices.map {
-                    MobileDevice(
-                        studentId = semester.studentId,
-                        date = it.date,
-                        deviceId = it.id,
-                        name = it.name
-                    )
-                }
+    suspend fun getDevices(student: Student, semester: Semester): List<MobileDevice> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getRegisteredDevices()
+            .map {
+                MobileDevice(
+                    studentId = semester.studentId,
+                    date = it.createDate,
+                    deviceId = it.id,
+                    name = it.name
+                )
             }
     }
 
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).unregisterDevice(device.deviceId)
+    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice): Boolean {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .unregisterDevice(device.deviceId)
     }
 
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getToken()
-            .map {
+    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getToken()
+            .let {
                 MobileDeviceToken(
                     token = it.token,
                     symbol = it.symbol,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
index ac450ff46..65526ef86 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepository.kt
@@ -1,52 +1,36 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MobileDeviceRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: MobileDeviceLocal,
     private val remote: MobileDeviceRemote
 ) {
 
-    fun getDevices(semester: Semester, forceRefresh: Boolean = false): Single<List<MobileDevice>> {
-        return local.getDevices(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getDevices(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getDevices(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteDevices(old uniqueSubtract new)
-                            local.saveDevices(new uniqueSubtract old)
-                        }
-                }
-            ).flatMap { local.getDevices(semester).toSingle(emptyList()) }
+    fun getDevices(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getDevices(semester) },
+        fetch = { remote.getDevices(student, semester) },
+        saveFetchResult = { old, new ->
+            local.deleteDevices(old uniqueSubtract new)
+            local.saveDevices(new uniqueSubtract old)
+        }
+    )
+
+    suspend fun unregisterDevice(student: Student, semester: Semester, device: MobileDevice) {
+        remote.unregisterDevice(student, semester, device)
+        local.deleteDevices(listOf(device))
     }
 
-    fun unregisterDevice(semester: Semester, device: MobileDevice): Single<Boolean> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.unregisterDevice(semester, device)
-                else Single.error(UnknownHostException())
-            }
-    }
-
-    fun getToken(semester: Semester): Single<MobileDeviceToken> {
-        return ReactiveNetwork.checkInternetConnectivity(settings)
-            .flatMap {
-                if (it) remote.getToken(semester)
-                else Single.error(UnknownHostException())
-            }
+    suspend fun getToken(student: Student, semester: Semester): MobileDeviceToken {
+        return remote.getToken(student, semester)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
index 784e61f0f..85ba5e223 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteLocal.kt
@@ -3,26 +3,26 @@ package io.github.wulkanowy.data.repositories.note
 import io.github.wulkanowy.data.db.dao.NoteDao
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteLocal @Inject constructor(private val noteDb: NoteDao) {
 
-    fun saveNotes(notes: List<Note>) {
+    suspend fun saveNotes(notes: List<Note>) {
         noteDb.insertAll(notes)
     }
 
-    fun updateNotes(notes: List<Note>) {
+    suspend fun updateNotes(notes: List<Note>) {
         noteDb.updateAll(notes)
     }
 
-    fun deleteNotes(notes: List<Note>) {
+    suspend fun deleteNotes(notes: List<Note>) {
         noteDb.deleteAll(notes)
     }
 
-    fun getNotes(student: Student): Maybe<List<Note>> {
-        return noteDb.loadAll(student.studentId).filter { it.isNotEmpty() }
+    fun getNotes(student: Student): Flow<List<Note>> {
+        return noteDb.loadAll(student.studentId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
index 503575b69..0e488b7d9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRemote.kt
@@ -2,26 +2,30 @@ package io.github.wulkanowy.data.repositories.note
 
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getNotes(semester: Semester): Single<List<Note>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getNotes(semester.semesterId)
-            .map { notes ->
-                notes.map {
-                    Note(
-                        studentId = semester.studentId,
-                        date = it.date,
-                        teacher = it.teacher,
-                        category = it.category,
-                        content = it.content
-                    )
-                }
+    suspend fun getNotes(student: Student, semester: Semester): List<Note> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getNotes(semester.semesterId)
+            .map {
+                Note(
+                    studentId = semester.studentId,
+                    date = it.date,
+                    teacher = it.teacher,
+                    teacherSymbol = it.teacherSymbol,
+                    category = it.category,
+                    categoryType = it.categoryType.id,
+                    isPointsShow = it.showPoints,
+                    points = it.points,
+                    content = it.content
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
index 52cb2d0f5..6cf62ba22 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/note/NoteRepository.kt
@@ -1,54 +1,45 @@
 package io.github.wulkanowy.data.repositories.note
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Completable
-import io.reactivex.Single
-import java.net.UnknownHostException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class NoteRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: NoteLocal,
     private val remote: NoteRemote
 ) {
 
-    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean = false, notify: Boolean = false): Single<List<Note>> {
-        return local.getNotes(student).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getNotes(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getNotes(student).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteNotes(old.uniqueSubtract(new))
-                            local.saveNotes(new.uniqueSubtract(old)
-                                .onEach {
-                                    if (it.date >= student.registrationDate.toLocalDate()) it.apply {
-                                        isRead = false
-                                        if (notify) isNotified = false
-                                    }
-                                })
-                        }
-                }.flatMap { local.getNotes(student).toSingle(emptyList()) })
+    fun getNotes(student: Student, semester: Semester, forceRefresh: Boolean, notify: Boolean = false) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getNotes(student) },
+        fetch = { remote.getNotes(student, semester) },
+        saveFetchResult = { old, new ->
+            local.deleteNotes(old uniqueSubtract new)
+            local.saveNotes((new uniqueSubtract old).onEach {
+                if (it.date >= student.registrationDate.toLocalDate()) it.apply {
+                    isRead = false
+                    if (notify) isNotified = false
+                }
+            })
+        }
+    )
+
+    fun getNotNotifiedNotes(student: Student): Flow<List<Note>> {
+        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }
     }
 
-    fun getNotNotifiedNotes(student: Student): Single<List<Note>> {
-        return local.getNotes(student).map { it.filter { note -> !note.isNotified } }.toSingle(emptyList())
+    suspend fun updateNote(note: Note) {
+        local.updateNotes(listOf(note))
     }
 
-    fun updateNote(note: Note): Completable {
-        return Completable.fromCallable { local.updateNotes(listOf(note)) }
-    }
-
-    fun updateNotes(notes: List<Note>): Completable {
-        return Completable.fromCallable { local.updateNotes(notes) }
+    suspend fun updateNotes(notes: List<Note>) {
+        return local.updateNotes(notes)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
index 07a3654ac..da31751a1 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/preferences/PreferencesRepository.kt
@@ -2,14 +2,17 @@ package io.github.wulkanowy.data.repositories.preferences
 
 import android.content.Context
 import android.content.SharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode
+import io.github.wulkanowy.ui.modules.grade.GradeSortingMode
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class PreferencesRepository @Inject constructor(
     private val sharedPref: SharedPreferences,
-    val context: Context
+    @ApplicationContext val context: Context
 ) {
     val startMenuIndex: Int
         get() = getString(R.string.pref_key_start_menu, R.string.pref_default_startup).toInt()
@@ -17,8 +20,8 @@ class PreferencesRepository @Inject constructor(
     val isShowPresent: Boolean
         get() = getBoolean(R.string.pref_key_attendance_present, R.bool.pref_default_attendance_present)
 
-    val gradeAverageMode: String
-        get() = getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode)
+    val gradeAverageMode: GradeAverageMode
+        get() = GradeAverageMode.getByValue(getString(R.string.pref_key_grade_average_mode, R.string.pref_default_grade_average_mode))
 
     val gradeAverageForceCalc: Boolean
         get() = getBoolean(R.string.pref_key_grade_average_force_calc, R.bool.pref_default_grade_average_force_calc)
@@ -26,6 +29,9 @@ class PreferencesRepository @Inject constructor(
     val isGradeExpandable: Boolean
         get() = !getBoolean(R.string.pref_key_expand_grade, R.bool.pref_default_expand_grade)
 
+    val showAllSubjectsOnStatisticsList: Boolean
+        get() = getBoolean(R.string.pref_key_grade_statistics_list, R.bool.pref_default_grade_statistics_list)
+
     val appThemeKey = context.getString(R.string.pref_key_app_theme)
     val appTheme: String
         get() = getString(appThemeKey, R.string.pref_default_app_theme)
@@ -52,6 +58,10 @@ class PreferencesRepository @Inject constructor(
     val isNotificationsEnable: Boolean
         get() = getBoolean(R.string.pref_key_notifications_enable, R.bool.pref_default_notifications_enable)
 
+    val isUpcomingLessonsNotificationsEnableKey = context.getString(R.string.pref_key_notifications_upcoming_lessons_enable)
+    val isUpcomingLessonsNotificationsEnable: Boolean
+        get() = getBoolean(isUpcomingLessonsNotificationsEnableKey, R.bool.pref_default_notification_upcoming_lessons_enable)
+
     val isDebugNotificationEnableKey = context.getString(R.string.pref_key_notification_debug)
     val isDebugNotificationEnable: Boolean
         get() = getBoolean(isDebugNotificationEnableKey, R.bool.pref_default_notification_debug)
@@ -65,6 +75,25 @@ class PreferencesRepository @Inject constructor(
     val fillMessageContent: Boolean
         get() = getBoolean(R.string.pref_key_fill_message_content, R.bool.pref_default_fill_message_content)
 
+    val showGroupsInPlan: Boolean
+        get() = getBoolean(R.string.pref_key_timetable_show_groups, R.bool.pref_default_timetable_show_groups)
+
+    val showWholeClassPlan: String
+        get() = getString(R.string.pref_key_timetable_show_whole_class, R.string.pref_default_timetable_show_whole_class)
+
+    val gradeSortingMode: GradeSortingMode
+        get() = GradeSortingMode.getByValue(getString(R.string.pref_key_grade_sorting_mode, R.string.pref_default_grade_sorting_mode))
+
+    val showTimetableTimers: Boolean
+        get() = getBoolean(R.string.pref_key_timetable_show_timers, R.bool.pref_default_timetable_show_timers)
+
+    var isHomeworkFullscreen: Boolean
+        get() = getBoolean(R.string.pref_key_homework_fullscreen, R.bool.pref_default_homework_fullscreen)
+        set(value) = sharedPref.edit().putBoolean("homework_fullscreen", value).apply()
+
+    val showSubjectsWithoutGrades: Boolean
+        get() = getBoolean(R.string.pref_key_subjects_without_grades, R.bool.pref_default_subjects_without_grades)
+
     private fun getString(id: Int, default: Int) = getString(context.getString(id), default)
 
     private fun getString(id: String, default: Int) = sharedPref.getString(id, context.getString(default)) ?: context.getString(default)
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
index 9b1d4ac2f..fac1645e4 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientLocal.kt
@@ -4,22 +4,21 @@ import io.github.wulkanowy.data.db.dao.RecipientDao
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientLocal @Inject constructor(private val recipientDb: RecipientDao) {
 
-    fun getRecipients(student: Student, role: Int, unit: ReportingUnit): Maybe<List<Recipient>> {
-        return recipientDb.load(student.studentId, role, unit.realId).filter { !it.isEmpty() }
+    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
+        return recipientDb.load(student.studentId, role, unit.realId)
     }
 
-    fun saveRecipients(recipients: List<Recipient>): List<Long> {
+    suspend fun saveRecipients(recipients: List<Recipient>): List<Long> {
         return recipientDb.insertAll(recipients)
     }
 
-    fun deleteRecipients(recipients: List<Recipient>) {
+    suspend fun deleteRecipients(recipients: List<Recipient>) {
         recipientDb.deleteAll(recipients)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
index f070ea765..a5318e77f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRemote.kt
@@ -3,8 +3,9 @@ package io.github.wulkanowy.data.repositories.recipient
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
@@ -12,18 +13,14 @@ import io.github.wulkanowy.sdk.pojo.Recipient as SdkRecipient
 @Singleton
 class RecipientRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getRecipients(role: Int, unit: ReportingUnit): Single<List<Recipient>> {
-        return sdk.getRecipients(unit.realId, role)
-            .map { recipients ->
-                recipients.map { it.toRecipient() }
-            }
+    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
+        return sdk.init(student).getRecipients(unit.realId, role)
+            .map { it.toRecipient() }
     }
 
-    fun getMessageRecipients(message: Message): Single<List<Recipient>> {
-        return sdk.getMessageRecipients(message.messageId, message.senderId)
-            .map { recipients ->
-                recipients.map { it.toRecipient() }
-            }
+    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
+        return sdk.init(student).getMessageRecipients(message.messageId, message.senderId)
+            .map { it.toRecipient() }
     }
 
     private fun SdkRecipient.toRecipient(): Recipient {
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
index d29369b94..f5e876b03 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recipient/RecipientRepository.kt
@@ -1,53 +1,36 @@
 package io.github.wulkanowy.data.repositories.recipient
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class RecipientRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: RecipientLocal,
-    private val remote: RecipientRemote,
-    private val sdkHelper: SdkHelper
+    private val remote: RecipientRemote
 ) {
 
-    fun getRecipients(student: Student, role: Int, unit: ReportingUnit, forceRefresh: Boolean = false): Single<List<Recipient>> {
-        return Single.just(sdkHelper.init(student))
-            .flatMap { _ ->
-                local.getRecipients(student, role, unit).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getRecipients(role, unit)
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteRecipients(old.uniqueSubtract(new))
-                                    local.saveRecipients(new.uniqueSubtract(old))
-                                }
-                        }.flatMap {
-                            local.getRecipients(student, role, unit).toSingle(emptyList())
-                        }
-                    )
-            }
+    suspend fun refreshRecipients(student: Student, role: Int, unit: ReportingUnit) {
+        val new = remote.getRecipients(student, role, unit)
+        val old = local.getRecipients(student, role, unit)
+
+        local.deleteRecipients(old uniqueSubtract new)
+        local.saveRecipients(new uniqueSubtract old)
     }
 
-    fun getMessageRecipients(student: Student, message: Message): Single<List<Recipient>> {
-        return Single.just(sdkHelper.init(student))
-            .flatMap { ReactiveNetwork.checkInternetConnectivity(settings) }
-            .flatMap {
-                if (it) remote.getMessageRecipients(message)
-                else Single.error(UnknownHostException())
-            }
+    suspend fun getRecipients(student: Student, role: Int, unit: ReportingUnit): List<Recipient> {
+        return local.getRecipients(student, role, unit).ifEmpty {
+            refreshRecipients(student, role, unit)
+
+            local.getRecipients(student, role, unit)
+        }
+    }
+
+    suspend fun getMessageRecipients(student: Student, message: Message): List<Recipient> {
+        return remote.getMessageRecipients(student, message)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
new file mode 100644
index 000000000..11eac71e0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRemote.kt
@@ -0,0 +1,18 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import io.github.wulkanowy.sdk.Sdk
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRemote @Inject constructor(private val sdk: Sdk) {
+
+    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
+        return sdk.getPasswordResetCaptchaCode(host, symbol)
+    }
+
+    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
+        return sdk.sendPasswordResetRequest(url, symbol, email, reCaptchaResponse)
+    }
+}
+
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
new file mode 100644
index 000000000..3117a606a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/recover/RecoverRepository.kt
@@ -0,0 +1,16 @@
+package io.github.wulkanowy.data.repositories.recover
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecoverRepository @Inject constructor(private val remote: RecoverRemote) {
+
+    suspend fun getReCaptchaSiteKey(host: String, symbol: String): Pair<String, String> {
+        return remote.getReCaptchaSiteKey(host, symbol)
+    }
+
+    suspend fun sendRecoverRequest(url: String, symbol: String, email: String, reCaptchaResponse: String): String {
+        return remote.sendRecoverRequest(url, symbol, email, reCaptchaResponse)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
index 6f9eec3fc..737f1a04f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitLocal.kt
@@ -3,26 +3,25 @@ package io.github.wulkanowy.data.repositories.reportingunit
 import io.github.wulkanowy.data.db.dao.ReportingUnitDao
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitLocal @Inject constructor(private val reportingUnitDb: ReportingUnitDao) {
 
-    fun getReportingUnits(student: Student): Maybe<List<ReportingUnit>> {
-        return reportingUnitDb.load(student.studentId).filter { !it.isEmpty() }
+    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
+        return reportingUnitDb.load(student.studentId)
     }
 
-    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
+    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
         return reportingUnitDb.loadOne(student.studentId, unitId)
     }
 
-    fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
+    suspend fun saveReportingUnits(reportingUnits: List<ReportingUnit>): List<Long> {
         return reportingUnitDb.insertAll(reportingUnits)
     }
 
-    fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
+    suspend fun deleteReportingUnits(reportingUnits: List<ReportingUnit>) {
         reportingUnitDb.deleteAll(reportingUnits)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
index 5dbabc545..6b11c2cc9 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRemote.kt
@@ -1,26 +1,25 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getReportingUnits(): Single<List<ReportingUnit>> {
-        return sdk.getReportingUnits().map {
-            it.map { unit ->
-                ReportingUnit(
-                    studentId = sdk.studentId,
-                    realId = unit.id,
-                    roles = unit.roles,
-                    senderId = unit.senderId,
-                    senderName = unit.senderName,
-                    shortName = unit.short
-                )
-            }
+    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
+        return sdk.init(student).getReportingUnits().map { unit ->
+            ReportingUnit(
+                studentId = sdk.studentId,
+                realId = unit.id,
+                roles = unit.roles,
+                senderId = unit.senderId,
+                senderName = unit.senderName,
+                shortName = unit.short
+            )
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
index 4c8370e68..ff5839460 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/reportingunit/ReportingUnitRepository.kt
@@ -1,56 +1,38 @@
 package io.github.wulkanowy.data.repositories.reportingunit
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class ReportingUnitRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: ReportingUnitLocal,
-    private val remote: ReportingUnitRemote,
-    private val sdkHelper: SdkHelper
+    private val remote: ReportingUnitRemote
 ) {
 
-    fun getReportingUnits(student: Student, forceRefresh: Boolean = false): Single<List<ReportingUnit>> {
-        return Single.just(sdkHelper.init(student))
-            .flatMap { _ ->
-                local.getReportingUnits(student).filter { !forceRefresh }
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) remote.getReportingUnits()
-                            else Single.error(UnknownHostException())
-                        }.flatMap { new ->
-                            local.getReportingUnits(student).toSingle(emptyList())
-                                .doOnSuccess { old ->
-                                    local.deleteReportingUnits(old.uniqueSubtract(new))
-                                    local.saveReportingUnits(new.uniqueSubtract(old))
-                                }
-                        }.flatMap { local.getReportingUnits(student).toSingle(emptyList()) }
-                    )
-            }
+    suspend fun refreshReportingUnits(student: Student) {
+        val new = remote.getReportingUnits(student)
+        val old = local.getReportingUnits(student)
+
+        local.deleteReportingUnits(old.uniqueSubtract(new))
+        local.saveReportingUnits(new.uniqueSubtract(old))
     }
 
-    fun getReportingUnit(student: Student, unitId: Int): Maybe<ReportingUnit> {
-        return Maybe.just(sdkHelper.init(student))
-            .flatMap { _ ->
-                local.getReportingUnit(student, unitId)
-                    .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                        .flatMap {
-                            if (it) getReportingUnits(student, true)
-                            else Single.error(UnknownHostException())
-                        }.flatMapMaybe {
-                            local.getReportingUnit(student, unitId)
-                        }
-                    )
-            }
+    suspend fun getReportingUnits(student: Student): List<ReportingUnit> {
+        return local.getReportingUnits(student).ifEmpty {
+            refreshReportingUnits(student)
+
+            local.getReportingUnits(student)
+        }
+    }
+
+    suspend fun getReportingUnit(student: Student, unitId: Int): ReportingUnit? {
+        return local.getReportingUnit(student, unitId) ?: run {
+            refreshReportingUnits(student)
+
+            return local.getReportingUnit(student, unitId)
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
index d87272875..bc1b2f446 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.school
 import io.github.wulkanowy.data.db.dao.SchoolDao
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class SchoolLocal @Inject constructor(private val schoolDb: SchoolDao) {
 
-    fun saveSchool(school: School) {
+    suspend fun saveSchool(school: School) {
         schoolDb.insertAll(listOf(school))
     }
 
-    fun deleteSchool(school: School) {
+    suspend fun deleteSchool(school: School) {
         schoolDb.deleteAll(listOf(school))
     }
 
-    fun getSchool(semester: Semester): Maybe<School> {
+    fun getSchool(semester: Semester): Flow<School?> {
         return schoolDb.load(semester.studentId, semester.classId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
index 4d5c92a9e..4d2e0cd6c 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRemote.kt
@@ -2,15 +2,17 @@ package io.github.wulkanowy.data.repositories.school
 
 import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 
 class SchoolRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSchoolInfo(semester: Semester): Single<School> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSchool()
-            .map {
+    suspend fun getSchoolInfo(student: Student, semester: Semester): School {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSchool()
+            .let {
                 School(
                     studentId = semester.studentId,
                     classId = semester.classId,
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
index a352324d2..4c84c3194 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/school/SchoolRepository.kt
@@ -1,41 +1,27 @@
 package io.github.wulkanowy.data.repositories.school
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.db.entities.School
 import io.github.wulkanowy.data.db.entities.Semester
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SchoolRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: SchoolLocal,
     private val remote: SchoolRemote
 ) {
 
-    fun getSchoolInfo(semester: Semester, forceRefresh: Boolean = false): Maybe<School> {
-        return local.getSchool(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSchoolInfo(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMapMaybe { new ->
-                    local.getSchool(semester)
-                        .doOnSuccess { old ->
-                            if (new != old) {
-                                local.deleteSchool(old)
-                                local.saveSchool(new)
-                            }
-                        }
-                        .doOnComplete {
-                            local.saveSchool(new)
-                        }
-                }.flatMap({ local.getSchool(semester) }, { Maybe.error(it) },
-                    { local.getSchool(semester) })
-            )
-    }
+    fun getSchoolInfo(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it == null || forceRefresh },
+        query = { local.getSchool(semester) },
+        fetch = { remote.getSchoolInfo(student, semester) },
+        saveFetchResult = { old, new ->
+            if (new != old && old != null) {
+                local.deleteSchool(old)
+                local.saveSchool(new)
+            }
+            local.saveSchool(new)
+        }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
index b9750e7d5..8ecf1595a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterLocal.kt
@@ -3,22 +3,21 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.dao.SemesterDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Maybe
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterLocal @Inject constructor(private val semesterDb: SemesterDao) {
 
-    fun saveSemesters(semesters: List<Semester>) {
-        semesterDb.insertAll(semesters)
+    suspend fun saveSemesters(semesters: List<Semester>) {
+        semesterDb.insertSemesters(semesters)
     }
 
-    fun deleteSemesters(semesters: List<Semester>) {
+    suspend fun deleteSemesters(semesters: List<Semester>) {
         semesterDb.deleteAll(semesters)
     }
 
-    fun getSemesters(student: Student): Maybe<List<Semester>> {
-        return semesterDb.loadAll(student.studentId, student.classId).filter { !it.isEmpty() }
+    suspend fun getSemesters(student: Student): List<Semester> {
+        return semesterDb.loadAll(student.studentId, student.classId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
index 55d13a765..e1a920b6f 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRemote.kt
@@ -3,30 +3,27 @@ package io.github.wulkanowy.data.repositories.semester
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SemesterRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSemesters(student: Student): Single<List<Semester>> {
-        return sdk.getSemesters().map { semesters ->
-            semesters.map {
-                Semester(
-                    studentId = student.studentId,
-                    diaryId = it.diaryId,
-                    diaryName = it.diaryName,
-                    schoolYear = it.schoolYear,
-                    semesterId = it.semesterId,
-                    semesterName = it.semesterNumber,
-                    isCurrent = it.current,
-                    start = it.start,
-                    end = it.end,
-                    classId = it.classId,
-                    unitId = it.unitId
-                )
-            }
+    suspend fun getSemesters(student: Student): List<Semester> {
+        return sdk.init(student).getSemesters().map {
+            Semester(
+                studentId = student.studentId,
+                diaryId = it.diaryId,
+                diaryName = it.diaryName,
+                schoolYear = it.schoolYear,
+                semesterId = it.semesterId,
+                semesterName = it.semesterNumber,
+                start = it.start,
+                end = it.end,
+                classId = it.classId,
+                unitId = it.unitId
+            )
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
index 95fddc1b3..2748f1df5 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/semester/SemesterRepository.kt
@@ -1,15 +1,14 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.getCurrentOrLast
+import io.github.wulkanowy.utils.isCurrent
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Maybe
-import io.reactivex.Single
+import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -17,32 +16,40 @@ import javax.inject.Singleton
 class SemesterRepository @Inject constructor(
     private val remote: SemesterRemote,
     private val local: SemesterLocal,
-    private val settings: InternetObservingSettings,
-    private val sdkHelper: SdkHelper
+    private val dispatchers: DispatchersProvider
 ) {
 
-    fun getSemesters(student: Student, forceRefresh: Boolean = false): Single<List<Semester>> {
-        return Maybe.just(sdkHelper.init(student))
-            .flatMap { local.getSemesters(student).filter { !forceRefresh } }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSemesters(student) else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    val currentSemesters = new.filter { it.isCurrent }
-                    if (currentSemesters.size == 1) {
-                        local.getSemesters(student).toSingle(emptyList())
-                            .doOnSuccess { old ->
-                                local.deleteSemesters(old.uniqueSubtract(new))
-                                local.saveSemesters(new.uniqueSubtract(old))
-                            }
-                    } else {
-                        Timber.i("Current semesters list:\n${currentSemesters.joinToString(separator = "\n")}")
-                        throw IllegalArgumentException("Current semester can be only one.")
-                    }
-                }.flatMap { local.getSemesters(student).toSingle(emptyList()) })
+    suspend fun getSemesters(student: Student, forceRefresh: Boolean = false, refreshOnNoCurrent: Boolean = false) = withContext(dispatchers.backgroundThread) {
+        val semesters = local.getSemesters(student)
+
+        if (isShouldFetch(student, semesters, forceRefresh, refreshOnNoCurrent)) {
+            refreshSemesters(student)
+            local.getSemesters(student)
+        } else semesters
     }
 
-    fun getCurrentSemester(student: Student, forceRefresh: Boolean = false): Single<Semester> {
-        return getSemesters(student, forceRefresh).map { item -> item.single { it.isCurrent } }
+    private fun isShouldFetch(student: Student, semesters: List<Semester>, forceRefresh: Boolean, refreshOnNoCurrent: Boolean): Boolean {
+        val isNoSemesters = semesters.isEmpty()
+
+        val isRefreshOnModeChangeRequired = if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+            semesters.firstOrNull { it.isCurrent }?.diaryId == 0
+        } else false
+
+        val isRefreshOnNoCurrentAppropriate = refreshOnNoCurrent && !semesters.any { semester -> semester.isCurrent }
+
+        return forceRefresh || isNoSemesters || isRefreshOnModeChangeRequired || isRefreshOnNoCurrentAppropriate
+    }
+
+    private suspend fun refreshSemesters(student: Student) {
+        val new = remote.getSemesters(student)
+        if (new.isEmpty()) return Timber.i("Empty semester list!")
+
+        val old = local.getSemesters(student)
+        local.deleteSemesters(old.uniqueSubtract(new))
+        local.saveSemesters(new.uniqueSubtract(old))
+    }
+
+    suspend fun getCurrentSemester(student: Student, forceRefresh: Boolean = false) = withContext(dispatchers.backgroundThread) {
+        getSemesters(student, forceRefresh).getCurrentOrLast()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
index a3576ca22..c01d1d049 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt
@@ -1,56 +1,59 @@
 package io.github.wulkanowy.data.repositories.student
 
 import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.data.db.dao.StudentDao
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.DispatchersProvider
 import io.github.wulkanowy.utils.security.decrypt
 import io.github.wulkanowy.utils.security.encrypt
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import io.reactivex.Single
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentLocal @Inject constructor(
     private val studentDb: StudentDao,
-    private val context: Context
+    private val dispatchers: DispatchersProvider,
+    @ApplicationContext private val context: Context
 ) {
 
-    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return Single.fromCallable {
-            studentDb.insertAll(students.map {
-                if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
-                else it
-            })
-        }
+    suspend fun saveStudents(students: List<Student>) = withContext(dispatchers.backgroundThread) {
+        studentDb.insertAll(students.map {
+            if (Sdk.Mode.valueOf(it.loginMode) != Sdk.Mode.API) it.copy(password = encrypt(it.password, context))
+            else it
+        })
     }
 
-    fun getStudents(decryptPass: Boolean): Maybe<List<Student>> {
-        return studentDb.loadAll()
-            .map { list -> list.map { it.apply { if (decryptPass) password = decrypt(password) } } }
-            .filter { it.isNotEmpty() }
-    }
-
-    fun getCurrentStudent(decryptPass: Boolean): Maybe<Student> {
-        return studentDb.loadCurrent().map {
+    suspend fun getStudents(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
+        studentDb.loadStudentsWithSemesters().map {
             it.apply {
-                if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+                if (decryptPass && Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) student.password = decrypt(student.password)
             }
         }
     }
 
-    fun setCurrentStudent(student: Student): Completable {
-        return Completable.fromCallable {
-            studentDb.run {
-                resetCurrent()
-                updateCurrent(student.id)
-            }
+    suspend fun getStudentById(id: Int) = withContext(dispatchers.backgroundThread) {
+        studentDb.loadById(id)?.apply {
+            if (Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
         }
     }
 
-    fun logoutStudent(student: Student): Completable {
-        return Completable.fromCallable { studentDb.delete(student) }
+    suspend fun getCurrentStudent(decryptPass: Boolean) = withContext(dispatchers.backgroundThread) {
+        studentDb.loadCurrent()?.apply {
+            if (decryptPass && Sdk.Mode.valueOf(loginMode) != Sdk.Mode.API) password = decrypt(password)
+        }
+    }
+
+    suspend fun setCurrentStudent(student: Student) = withContext(dispatchers.backgroundThread) {
+        studentDb.run {
+            resetCurrent()
+            updateCurrent(student.id)
+        }
+    }
+
+    suspend fun logoutStudent(student: Student) = withContext(dispatchers.backgroundThread) {
+        studentDb.delete(student)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
index 944313082..dcb126233 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRemote.kt
@@ -1,51 +1,23 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.mappers.mapToEntities
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDateTime.now
 import javax.inject.Inject
 import javax.inject.Singleton
-import io.github.wulkanowy.sdk.pojo.Student as SdkStudent
 
 @Singleton
 class StudentRemote @Inject constructor(private val sdk: Sdk) {
 
-    private fun mapStudents(students: List<SdkStudent>, email: String, password: String): List<Student> {
-        return students.map { student ->
-            Student(
-                email = email,
-                password = password,
-                isParent = student.isParent,
-                symbol = student.symbol,
-                studentId = student.studentId,
-                userLoginId = student.userLoginId,
-                studentName = student.studentName,
-                schoolSymbol = student.schoolSymbol,
-                schoolName = student.schoolName,
-                className = student.className,
-                classId = student.classId,
-                scrapperBaseUrl = student.scrapperBaseUrl,
-                loginType = student.loginType.name,
-                isCurrent = false,
-                registrationDate = now(),
-                mobileBaseUrl = student.mobileBaseUrl,
-                privateKey = student.privateKey,
-                certificateKey = student.certificateKey,
-                loginMode = student.loginMode.name
-            )
-        }
+    suspend fun getStudentsMobileApi(token: String, pin: String, symbol: String): List<StudentWithSemesters> {
+        return sdk.getStudentsFromMobileApi(token, pin, symbol, "").mapToEntities()
     }
 
-    fun getStudentsMobileApi(token: String, pin: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsFromMobileApi(token, pin, symbol).map { mapStudents(it, "", "") }
+    suspend fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
+        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).mapToEntities(password)
     }
 
-    fun getStudentsScrapper(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsFromScrapper(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
-    }
-
-    fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): Single<List<Student>> {
-        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, symbol).map { mapStudents(it, email, password) }
+    suspend fun getStudentsHybrid(email: String, password: String, scrapperBaseUrl: String, symbol: String): List<StudentWithSemesters> {
+        return sdk.getStudentsHybrid(email, password, scrapperBaseUrl, "", symbol).mapToEntities(password)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
index e06e654a9..19e0e2086 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentRepository.kt
@@ -1,67 +1,57 @@
 package io.github.wulkanowy.data.repositories.student
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.reactivex.Completable
-import io.reactivex.Maybe
-import io.reactivex.Single
-import java.net.UnknownHostException
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.data.repositories.semester.SemesterLocal
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class StudentRepository @Inject constructor(
     private val local: StudentLocal,
-    private val remote: StudentRemote,
-    private val settings: InternetObservingSettings
+    private val semestersLocal: SemesterLocal,
+    private val remote: StudentRemote
 ) {
 
-    fun isStudentSaved(): Single<Boolean> = local.getStudents(false).isEmpty.map { !it }
+    suspend fun isStudentSaved(): Boolean = local.getStudents(false).isNotEmpty()
 
-    fun isCurrentStudentSet(): Single<Boolean> = local.getCurrentStudent(false).isEmpty.map { !it }
+    suspend fun isCurrentStudentSet(): Boolean = local.getCurrentStudent(false)?.isCurrent ?: false
 
-    fun getStudentsApi(pin: String, symbol: String, token: String): Single<List<Student>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.getStudentsMobileApi(token, pin, symbol)
-            else Single.error(UnknownHostException("No internet connection"))
-        }
+    suspend fun getStudentsApi(pin: String, symbol: String, token: String): List<StudentWithSemesters> {
+        return remote.getStudentsMobileApi(token, pin, symbol)
     }
 
-    fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String = ""): Single<List<Student>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.getStudentsScrapper(email, password, endpoint, symbol)
-            else Single.error(UnknownHostException("No internet connection"))
-        }
+    suspend fun getStudentsScrapper(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
+        return remote.getStudentsScrapper(email, password, endpoint, symbol)
     }
 
-    fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): Single<List<Student>> {
-        return ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-            if (it) remote.getStudentsHybrid(email, password, endpoint, symbol)
-            else Single.error(UnknownHostException("No internet connection"))
-        }
+    suspend fun getStudentsHybrid(email: String, password: String, endpoint: String, symbol: String): List<StudentWithSemesters> {
+        return remote.getStudentsHybrid(email, password, endpoint, symbol)
     }
 
-    fun getSavedStudents(decryptPass: Boolean = true): Single<List<Student>> {
-        return local.getStudents(decryptPass).toSingle(emptyList())
+    suspend fun getSavedStudents(decryptPass: Boolean = true): List<StudentWithSemesters> {
+        return local.getStudents(decryptPass)
     }
 
-    fun getCurrentStudent(decryptPass: Boolean = true): Single<Student> {
-        return local.getCurrentStudent(decryptPass)
-            .switchIfEmpty(Maybe.error(NoCurrentStudentException()))
-            .toSingle()
+    suspend fun getStudentById(id: Int): Student {
+        return local.getStudentById(id) ?: throw NoCurrentStudentException()
     }
 
-    fun saveStudents(students: List<Student>): Single<List<Long>> {
-        return local.saveStudents(students)
+    suspend fun getCurrentStudent(decryptPass: Boolean = true): Student {
+        return local.getCurrentStudent(decryptPass) ?: throw NoCurrentStudentException()
     }
 
-    fun switchStudent(student: Student): Completable {
-        return local.setCurrentStudent(student)
+    suspend fun saveStudents(studentsWithSemesters: List<StudentWithSemesters>): List<Long> {
+        semestersLocal.saveSemesters(studentsWithSemesters.flatMap { it.semesters })
+        return local.saveStudents(studentsWithSemesters.map { it.student })
     }
 
-    fun logoutStudent(student: Student): Completable {
+    suspend fun switchStudent(studentWithSemesters: StudentWithSemesters) {
+        return local.setCurrentStudent(studentWithSemesters.student)
+    }
+
+    suspend fun logoutStudent(student: Student) {
         return local.logoutStudent(student)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
index 63e334019..e225a381e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectLocal.kt
@@ -3,23 +3,22 @@ package io.github.wulkanowy.data.repositories.subject
 import io.github.wulkanowy.data.db.dao.SubjectDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Subject
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectLocal @Inject constructor(private val subjectDao: SubjectDao) {
 
-    fun getSubjects(semester: Semester): Maybe<List<Subject>> {
+    fun getSubjects(semester: Semester): Flow<List<Subject>> {
         return subjectDao.loadAll(semester.diaryId, semester.studentId)
-            .filter { !it.isEmpty() }
     }
 
-    fun saveSubjects(subjects: List<Subject>) {
+    suspend fun saveSubjects(subjects: List<Subject>) {
         subjectDao.insertAll(subjects)
     }
 
-    fun deleteSubjects(subjects: List<Subject>) {
+    suspend fun deleteSubjects(subjects: List<Subject>) {
         subjectDao.deleteAll(subjects)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
index 32dbb2f2e..624a5a00a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRemote.kt
@@ -1,26 +1,26 @@
 package io.github.wulkanowy.data.repositories.subject
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getSubjects(semester: Semester): Single<List<Subject>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getSubjects()
-            .map { subjects ->
-                subjects.map {
-                    Subject(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        name = it.name,
-                        realId = it.id
-                    )
-                }
+    suspend fun getSubjects(student: Student, semester: Semester): List<Subject> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getSubjects()
+            .map {
+                Subject(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    name = it.name,
+                    realId = it.id
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
index 0c5f386b6..60a0c3e71 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/subject/SubjectRepository.kt
@@ -1,37 +1,25 @@
 package io.github.wulkanowy.data.repositories.subject
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Subject
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class SubjectRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: SubjectLocal,
     private val remote: SubjectRemote
 ) {
 
-    fun getSubjects(semester: Semester, forceRefresh: Boolean = false): Single<List<Subject>> {
-        return local.getSubjects(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getSubjects(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getSubjects(semester)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteSubjects(old.uniqueSubtract(new))
-                            local.saveSubjects(new.uniqueSubtract(old))
-                        }
-                }.flatMap {
-                    local.getSubjects(semester).toSingle(emptyList())
-                })
-    }
+    fun getSubjects(student: Student, semester: Semester, forceRefresh: Boolean = false) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getSubjects(semester) },
+        fetch = { remote.getSubjects(student, semester) },
+        saveFetchResult = { old, new ->
+            local.deleteSubjects(old uniqueSubtract new)
+            local.saveSubjects(new uniqueSubtract old)
+        }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
index dd2be5e58..908f45a1a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherLocal.kt
@@ -3,20 +3,20 @@ package io.github.wulkanowy.data.repositories.teacher
 import io.github.wulkanowy.data.db.dao.TeacherDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Teacher
-import io.reactivex.Maybe
+import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class TeacherLocal @Inject constructor(private val teacherDb: TeacherDao) {
 
-    fun saveTeachers(teachers: List<Teacher>) {
+    suspend fun saveTeachers(teachers: List<Teacher>) {
         teacherDb.insertAll(teachers)
     }
 
-    fun deleteTeachers(teachers: List<Teacher>) {
+    suspend fun deleteTeachers(teachers: List<Teacher>) {
         teacherDb.deleteAll(teachers)
     }
 
-    fun getTeachers(semester: Semester): Maybe<List<Teacher>> {
-        return teacherDb.loadAll(semester.studentId, semester.classId).filter { it.isNotEmpty() }
+    fun getTeachers(semester: Semester): Flow<List<Teacher>> {
+        return teacherDb.loadAll(semester.studentId, semester.classId)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
index d4401bfb2..1d1caa686 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRemote.kt
@@ -1,27 +1,27 @@
 package io.github.wulkanowy.data.repositories.teacher
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.init
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTeachers(semester: Semester): Single<List<Teacher>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTeachers(semester.semesterId)
-            .map { teachers ->
-                teachers.map {
-                    Teacher(
-                        studentId = semester.studentId,
-                        name = it.name,
-                        subject = it.subject,
-                        shortName = it.short,
-                        classId = semester.classId
-                    )
-                }
+    suspend fun getTeachers(student: Student, semester: Semester): List<Teacher> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getTeachers(semester.semesterId)
+            .map {
+                Teacher(
+                    studentId = semester.studentId,
+                    name = it.name,
+                    subject = it.subject,
+                    shortName = it.short,
+                    classId = semester.classId
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
index 19e7a32b8..df25a53ec 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/teacher/TeacherRepository.kt
@@ -1,34 +1,25 @@
 package io.github.wulkanowy.data.repositories.teacher
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.utils.networkBoundResource
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import java.net.UnknownHostException
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TeacherRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: TeacherLocal,
     private val remote: TeacherRemote
 ) {
 
-    fun getTeachers(semester: Semester, forceRefresh: Boolean = false): Single<List<Teacher>> {
-        return local.getTeachers(semester).filter { !forceRefresh }
-            .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings)
-                .flatMap {
-                    if (it) remote.getTeachers(semester)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getTeachers(semester).toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteTeachers(old.uniqueSubtract(new))
-                            local.saveTeachers(new.uniqueSubtract(old))
-                        }
-                }.flatMap { local.getTeachers(semester).toSingle(emptyList()) })
-    }
+    fun getTeachers(student: Student, semester: Semester, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getTeachers(semester) },
+        fetch = { remote.getTeachers(student, semester) },
+        saveFetchResult = { old, new ->
+            local.deleteTeachers(old uniqueSubtract new)
+            local.saveTeachers(new uniqueSubtract old)
+        }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
index e074ce2a1..df4bfb20a 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableLocal.kt
@@ -3,23 +3,23 @@ package io.github.wulkanowy.data.repositories.timetable
 import io.github.wulkanowy.data.db.dao.TimetableDao
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Timetable
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.flow.Flow
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableLocal @Inject constructor(private val timetableDb: TimetableDao) {
 
-    fun saveTimetable(timetables: List<Timetable>) {
+    suspend fun saveTimetable(timetables: List<Timetable>) {
         timetableDb.insertAll(timetables)
     }
 
-    fun deleteTimetable(timetables: List<Timetable>) {
+    suspend fun deleteTimetable(timetables: List<Timetable>) {
         timetableDb.deleteAll(timetables)
     }
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Maybe<List<Timetable>> {
-        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate).filter { it.isNotEmpty() }
+    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Flow<List<Timetable>> {
+        return timetableDb.loadAll(semester.diaryId, semester.studentId, startDate, endDate)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
index 6036bd405..eef8729e8 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemote.kt
@@ -1,39 +1,40 @@
 package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
+import io.github.wulkanowy.utils.init
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRemote @Inject constructor(private val sdk: Sdk) {
 
-    fun getTimetable(semester: Semester, startDate: LocalDate, endDate: LocalDate): Single<List<Timetable>> {
-        return sdk.switchDiary(semester.diaryId, semester.schoolYear).getTimetable(startDate, endDate)
-            .map { lessons ->
-                lessons.map {
-                    Timetable(
-                        studentId = semester.studentId,
-                        diaryId = semester.diaryId,
-                        number = it.number,
-                        start = it.start,
-                        end = it.end,
-                        date = it.date,
-                        subject = it.subject,
-                        subjectOld = it.subjectOld,
-                        group = it.group,
-                        room = it.room,
-                        roomOld = it.roomOld,
-                        teacher = it.teacher,
-                        teacherOld = it.teacherOld,
-                        info = it.info,
-                        changes = it.changes,
-                        canceled = it.canceled
-                    )
-                }
+    suspend fun getTimetable(student: Student, semester: Semester, startDate: LocalDate, endDate: LocalDate): List<Timetable> {
+        return sdk.init(student).switchDiary(semester.diaryId, semester.schoolYear)
+            .getTimetable(startDate, endDate)
+            .map {
+                Timetable(
+                    studentId = semester.studentId,
+                    diaryId = semester.diaryId,
+                    number = it.number,
+                    start = it.start,
+                    end = it.end,
+                    date = it.date,
+                    subject = it.subject,
+                    subjectOld = it.subjectOld,
+                    group = it.group,
+                    room = it.room,
+                    roomOld = it.roomOld,
+                    teacher = it.teacher,
+                    teacherOld = it.teacherOld,
+                    info = it.info,
+                    isStudentPlan = it.studentPlan,
+                    changes = it.changes,
+                    canceled = it.canceled
+                )
             }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
index 20e183c25..ee2734aaf 100644
--- a/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/repositories/timetable/TimetableRepository.kt
@@ -1,50 +1,41 @@
 package io.github.wulkanowy.data.repositories.timetable
 
-import com.github.pwittchen.reactivenetwork.library.rx2.ReactiveNetwork
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.utils.monday
+import io.github.wulkanowy.utils.networkBoundResource
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.uniqueSubtract
-import io.reactivex.Single
-import org.threeten.bp.LocalDate
-import java.net.UnknownHostException
+import kotlinx.coroutines.flow.map
+import java.time.LocalDate
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class TimetableRepository @Inject constructor(
-    private val settings: InternetObservingSettings,
     private val local: TimetableLocal,
-    private val remote: TimetableRemote
+    private val remote: TimetableRemote,
+    private val schedulerHelper: TimetableNotificationSchedulerHelper
 ) {
 
-    fun getTimetable(semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean = false): Single<List<Timetable>> {
-        return Single.fromCallable { start.monday to end.friday }.flatMap { (monday, friday) ->
-            local.getTimetable(semester, monday, friday).filter { !forceRefresh }
-                .switchIfEmpty(ReactiveNetwork.checkInternetConnectivity(settings).flatMap {
-                    if (it) remote.getTimetable(semester, monday, friday)
-                    else Single.error(UnknownHostException())
-                }.flatMap { new ->
-                    local.getTimetable(semester, monday, friday)
-                        .toSingle(emptyList())
-                        .doOnSuccess { old ->
-                            local.deleteTimetable(old.uniqueSubtract(new))
-                            local.saveTimetable(new.uniqueSubtract(old).map { item ->
-                                item.also { new ->
-                                    old.singleOrNull { new.start == it.start }?.let { old ->
-                                        return@map new.copy(
-                                            room = if (new.room.isEmpty()) old.room else new.room,
-                                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
-                                        )
-                                    }
-                                }
-                            })
-                        }
-                }.flatMap {
-                    local.getTimetable(semester, monday, friday).toSingle(emptyList())
-                }).map { list -> list.filter { it.date in start..end } }
-        }
-    }
+    fun getTimetable(student: Student, semester: Semester, start: LocalDate, end: LocalDate, forceRefresh: Boolean) = networkBoundResource(
+        shouldFetch = { it.isEmpty() || forceRefresh },
+        query = { local.getTimetable(semester, start.monday, end.sunday).map { schedulerHelper.scheduleNotifications(it, student); it } },
+        fetch = { remote.getTimetable(student, semester, start.monday, end.sunday) },
+        saveFetchResult = { old, new ->
+            local.deleteTimetable(old.uniqueSubtract(new).also { schedulerHelper.cancelScheduled(it) })
+            local.saveTimetable(new.uniqueSubtract(old).also { schedulerHelper.scheduleNotifications(it, student) }.map { item ->
+                item.also { new ->
+                    old.singleOrNull { new.start == it.start }?.let { old ->
+                        return@map new.copy(
+                            room = if (new.room.isEmpty()) old.room else new.room,
+                            teacher = if (new.teacher.isEmpty() && !new.changes && !old.changes) old.teacher else new.teacher
+                        )
+                    }
+                }
+            })
+        },
+        filterResult = { it.filter { item -> item.date in start..end } }
+    )
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt b/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
deleted file mode 100644
index c0329f7d7..000000000
--- a/app/src/main/java/io/github/wulkanowy/di/AppComponent.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.github.wulkanowy.di
-
-import dagger.Component
-import dagger.android.AndroidInjector
-import dagger.android.support.AndroidSupportInjectionModule
-import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.data.RepositoryModule
-import io.github.wulkanowy.services.ServicesModule
-import javax.inject.Singleton
-
-@Singleton
-@Component(modules = [
-    AndroidSupportInjectionModule::class,
-    AppModule::class,
-    RepositoryModule::class,
-    ServicesModule::class,
-    BindingModule::class])
-interface AppComponent : AndroidInjector<WulkanowyApp> {
-
-    @Component.Factory
-    interface Factory : AndroidInjector.Factory<WulkanowyApp>
-}
diff --git a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
index 4f5683850..9133c34ed 100644
--- a/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/AppModule.kt
@@ -5,34 +5,23 @@ import android.content.Context
 import com.yariksoffice.lingver.Lingver
 import dagger.Module
 import dagger.Provides
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import io.github.wulkanowy.WulkanowyApp
-import io.github.wulkanowy.utils.AppInfo
-import io.github.wulkanowy.utils.SchedulersProvider
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.utils.DispatchersProvider
 import javax.inject.Singleton
 
 @Module
+@InstallIn(ApplicationComponent::class)
 internal class AppModule {
 
     @Singleton
     @Provides
-    fun provideContext(app: WulkanowyApp): Context = app
+    fun provideDispatchersProvider() = DispatchersProvider()
 
     @Singleton
     @Provides
-    fun provideSchedulersProvider() = SchedulersProvider()
-
-    @Provides
-    fun provideFlexibleAdapter() = FlexibleAdapter<AbstractFlexibleItem<*>>(null, null, true)
-
-    @Singleton
-    @Provides
-    fun provideAppWidgetManager(context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
-
-    @Singleton
-    @Provides
-    fun provideAppInfo() = AppInfo()
+    fun provideAppWidgetManager(@ApplicationContext context: Context): AppWidgetManager = AppWidgetManager.getInstance(context)
 
     @Singleton
     @Provides
diff --git a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt b/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
deleted file mode 100644
index 98061e609..000000000
--- a/app/src/main/java/io/github/wulkanowy/di/BindingModule.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.di
-
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.ui.modules.login.LoginModule
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetConfigureActivity
-import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider
-import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainModule
-import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
-import io.github.wulkanowy.ui.modules.splash.SplashActivity
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureActivity
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider
-
-@Suppress("unused")
-@Module
-internal abstract class BindingModule {
-
-    @PerActivity
-    @ContributesAndroidInjector
-    abstract fun bindSplashActivity(): SplashActivity
-
-    @PerActivity
-    @ContributesAndroidInjector(modules = [LoginModule::class])
-    abstract fun bindLoginActivity(): LoginActivity
-
-    @PerActivity
-    @ContributesAndroidInjector(modules = [MainModule::class])
-    abstract fun bindMainActivity(): MainActivity
-
-    @ContributesAndroidInjector
-    abstract fun bindMessageSendActivity(): SendMessageActivity
-
-    @ContributesAndroidInjector
-    abstract fun bindTimetableWidgetAccountActivity(): TimetableWidgetConfigureActivity
-
-    @ContributesAndroidInjector
-    abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
-
-    @ContributesAndroidInjector
-    abstract fun bindLuckyNumberWidgetAccountActivity(): LuckyNumberWidgetConfigureActivity
-
-    @ContributesAndroidInjector
-    abstract fun bindLuckyNumberWidgetProvider(): LuckyNumberWidgetProvider
-}
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
deleted file mode 100644
index c1b4352a4..000000000
--- a/app/src/main/java/io/github/wulkanowy/di/scopes/PerActivity.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.github.wulkanowy.di.scopes
-
-import javax.inject.Scope
-
-@Scope
-@Retention(AnnotationRetention.RUNTIME)
-annotation class PerActivity
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
deleted file mode 100644
index 08884dac5..000000000
--- a/app/src/main/java/io/github/wulkanowy/di/scopes/PerChildFragment.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.github.wulkanowy.di.scopes
-
-import javax.inject.Scope
-
-@Scope
-@Retention(AnnotationRetention.RUNTIME)
-annotation class PerChildFragment
diff --git a/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt b/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
deleted file mode 100644
index 1203d7d88..000000000
--- a/app/src/main/java/io/github/wulkanowy/di/scopes/PerFragment.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.github.wulkanowy.di.scopes
-
-import javax.inject.Scope
-
-@Scope
-@Retention(AnnotationRetention.RUNTIME)
-annotation class PerFragment
diff --git a/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
new file mode 100644
index 000000000..1e795d439
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/HiltBroadcastReceiver.kt
@@ -0,0 +1,9 @@
+package io.github.wulkanowy.services
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+abstract class HiltBroadcastReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {}
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
index 78bdbd8c0..ac5a84e8f 100644
--- a/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/ServicesModule.kt
@@ -1,20 +1,30 @@
 package io.github.wulkanowy.services
 
+import android.app.AlarmManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.getSystemService
 import androidx.work.WorkManager
-import com.squareup.inject.assisted.dagger2.AssistedModule
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import dagger.android.ContributesAndroidInjector
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.multibindings.IntoSet
+import io.github.wulkanowy.services.sync.channels.Channel
+import io.github.wulkanowy.services.sync.channels.DebugChannel
+import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
+import io.github.wulkanowy.services.sync.channels.NewGradesChannel
+import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
+import io.github.wulkanowy.services.sync.channels.NewNotesChannel
+import io.github.wulkanowy.services.sync.channels.PushChannel
+import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel
 import io.github.wulkanowy.services.sync.works.AttendanceSummaryWork
 import io.github.wulkanowy.services.sync.works.AttendanceWork
 import io.github.wulkanowy.services.sync.works.CompletedLessonWork
 import io.github.wulkanowy.services.sync.works.ExamWork
 import io.github.wulkanowy.services.sync.works.GradeStatisticsWork
-import io.github.wulkanowy.services.sync.works.GradeSummaryWork
 import io.github.wulkanowy.services.sync.works.GradeWork
 import io.github.wulkanowy.services.sync.works.HomeworkWork
 import io.github.wulkanowy.services.sync.works.LuckyNumberWork
@@ -24,27 +34,26 @@ import io.github.wulkanowy.services.sync.works.RecipientWork
 import io.github.wulkanowy.services.sync.works.TeacherWork
 import io.github.wulkanowy.services.sync.works.TimetableWork
 import io.github.wulkanowy.services.sync.works.Work
-import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import javax.inject.Singleton
 
 @Suppress("unused")
-@AssistedModule
-@Module(includes = [AssistedInject_ServicesModule::class, ServicesModule.Static::class])
+@Module
+@InstallIn(ApplicationComponent::class)
 abstract class ServicesModule {
 
-    @Module
-    object Static {
+    companion object {
 
         @Provides
-        fun provideWorkManager(context: Context) = WorkManager.getInstance(context)
+        fun provideWorkManager(@ApplicationContext context: Context) = WorkManager.getInstance(context)
 
         @Singleton
         @Provides
-        fun provideNotificationManager(context: Context) = NotificationManagerCompat.from(context)
-    }
+        fun provideNotificationManager(@ApplicationContext context: Context) = NotificationManagerCompat.from(context)
 
-    @ContributesAndroidInjector
-    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+        @Singleton
+        @Provides
+        fun provideAlarmManager(@ApplicationContext context: Context): AlarmManager = context.getSystemService()!!
+    }
 
     @Binds
     @IntoSet
@@ -58,10 +67,6 @@ abstract class ServicesModule {
     @IntoSet
     abstract fun provideAttendanceWork(work: AttendanceWork): Work
 
-    @Binds
-    @IntoSet
-    abstract fun provideGradeSummaryWork(work: GradeSummaryWork): Work
-
     @Binds
     @IntoSet
     abstract fun provideExamWork(work: ExamWork): Work
@@ -101,4 +106,32 @@ abstract class ServicesModule {
     @Binds
     @IntoSet
     abstract fun provideGradeStatistics(work: GradeStatisticsWork): Work
+
+    @Binds
+    @IntoSet
+    abstract fun provideDebugChannel(channel: DebugChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideLuckyNumberChannel(channel: LuckyNumberChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewGradesChannel(channel: NewGradesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewMessageChannel(channel: NewMessagesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideNewNotesChannel(channel: NewNotesChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun providePushChannel(channel: PushChannel): Channel
+
+    @Binds
+    @IntoSet
+    abstract fun provideUpcomingLessonsChannel(channel: UpcomingLessonsChannel): Channel
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
new file mode 100644
index 000000000..592d0919e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationReceiver.kt
@@ -0,0 +1,119 @@
+package io.github.wulkanowy.services.alarm
+
+import android.annotation.SuppressLint
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Build.VERSION_CODES.N
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.HiltBroadcastReceiver
+import io.github.wulkanowy.services.sync.channels.UpcomingLessonsChannel.Companion.CHANNEL_ID
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.utils.toLocalDateTime
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TimetableNotificationReceiver : HiltBroadcastReceiver() {
+
+    @Inject
+    lateinit var studentRepository: StudentRepository
+
+    companion object {
+        const val NOTIFICATION_TYPE_CURRENT = 1
+        const val NOTIFICATION_TYPE_UPCOMING = 2
+        const val NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION = 3
+
+        const val NOTIFICATION_ID = "id"
+
+        const val STUDENT_NAME = "student_name"
+        const val STUDENT_ID = "student_id"
+        const val LESSON_TYPE = "type"
+        const val LESSON_TITLE = "title"
+        const val LESSON_ROOM = "room"
+        const val LESSON_NEXT_TITLE = "next_title"
+        const val LESSON_NEXT_ROOM = "next_room"
+        const val LESSON_START = "start_timestamp"
+        const val LESSON_END = "end_timestamp"
+    }
+
+    @SuppressLint("CheckResult")
+    override fun onReceive(context: Context, intent: Intent) {
+        super.onReceive(context, intent)
+        Timber.d("Receiving intent... ${intent.toUri(0)}")
+
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent(false)
+            val studentId = intent.getIntExtra(STUDENT_ID, 0)
+            if (student.studentId == studentId) prepareNotification(context, intent)
+            else Timber.d("Notification studentId($studentId) differs from current(${student.studentId})")
+        }.onEach {
+            if (it.status == Status.ERROR) Timber.e(it.error!!)
+        }.launchIn(GlobalScope)
+    }
+
+    private fun prepareNotification(context: Context, intent: Intent) {
+        val type = intent.getIntExtra(LESSON_TYPE, 0)
+        val notificationId = intent.getIntExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
+
+        if (type == NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION) {
+            return NotificationManagerCompat.from(context).cancel(notificationId)
+        }
+
+        val studentId = intent.getIntExtra(STUDENT_ID, 0)
+        val studentName = intent.getStringExtra(STUDENT_NAME)
+
+        val subject = intent.getStringExtra(LESSON_TITLE)
+        val room = intent.getStringExtra(LESSON_ROOM)
+
+        val start = intent.getLongExtra(LESSON_START, 0)
+        val end = intent.getLongExtra(LESSON_END, 0)
+
+        val nextSubject = intent.getStringExtra(LESSON_NEXT_TITLE)
+        val nextRoom = intent.getStringExtra(LESSON_NEXT_ROOM)
+
+        Timber.d("TimetableNotification receive: type: $type, subject: $subject, start: ${start.toLocalDateTime()}, student: $studentId")
+
+        showNotification(context, notificationId, studentName,
+            if (type == NOTIFICATION_TYPE_CURRENT) end else start, end - start,
+            context.getString(if (type == NOTIFICATION_TYPE_CURRENT) R.string.timetable_now else R.string.timetable_next, "($room) $subject".removePrefix("()")),
+            nextSubject?.let { context.getString(R.string.timetable_later, "($nextRoom) $nextSubject".removePrefix("()")) }
+        )
+    }
+
+    private fun showNotification(context: Context, notificationId: Int, studentName: String?, countDown: Long, timeout: Long, title: String, next: String?) {
+        NotificationManagerCompat.from(context).notify(notificationId, NotificationCompat.Builder(context, CHANNEL_ID)
+            .setContentTitle(title)
+            .setContentText(next)
+            .setAutoCancel(false)
+            .setOngoing(true)
+            .setWhen(countDown)
+            .apply {
+                if (Build.VERSION.SDK_INT >= N) setUsesChronometer(true)
+            }
+            .setTimeoutAfter(timeout)
+            .setSmallIcon(R.drawable.ic_stat_timetable)
+            .setColor(context.getCompatColor(R.color.colorPrimary))
+            .setStyle(NotificationCompat.InboxStyle().also {
+                it.setSummaryText(studentName)
+                it.addLine(next)
+            })
+            .setContentIntent(PendingIntent.getActivity(context, MainView.Section.TIMETABLE.id,
+                MainActivity.getStartIntent(context, MainView.Section.TIMETABLE, true), FLAG_UPDATE_CURRENT))
+            .build()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
new file mode 100644
index 000000000..2593a555b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/alarm/TimetableNotificationSchedulerHelper.kt
@@ -0,0 +1,121 @@
+package io.github.wulkanowy.services.alarm
+
+import android.app.AlarmManager
+import android.app.AlarmManager.RTC_WAKEUP
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.content.Context
+import android.content.Intent
+import androidx.core.app.AlarmManagerCompat
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_END
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_ROOM
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_NEXT_TITLE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_ROOM
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_START
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TITLE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.LESSON_TYPE
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_ID
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_CURRENT
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.NOTIFICATION_TYPE_UPCOMING
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_ID
+import io.github.wulkanowy.services.alarm.TimetableNotificationReceiver.Companion.STUDENT_NAME
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.toTimestamp
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.time.LocalDateTime
+import java.time.LocalDateTime.now
+import javax.inject.Inject
+
+class TimetableNotificationSchedulerHelper @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val alarmManager: AlarmManager,
+    private val preferencesRepository: PreferencesRepository,
+    private val dispatchersProvider: DispatchersProvider,
+) {
+
+    private fun getRequestCode(time: LocalDateTime, studentId: Int) = (time.toTimestamp() * studentId).toInt()
+
+    private fun getUpcomingLessonTime(index: Int, day: List<Timetable>, lesson: Timetable): LocalDateTime {
+        return day.getOrNull(index - 1)?.end ?: lesson.start.minusMinutes(30)
+    }
+
+    suspend fun cancelScheduled(lessons: List<Timetable>, studentId: Int = 1) {
+        withContext(dispatchersProvider.backgroundThread) {
+            lessons.sortedBy { it.start }.forEachIndexed { index, lesson ->
+                val upcomingTime = getUpcomingLessonTime(index, lessons, lesson)
+                cancelScheduledTo(upcomingTime..lesson.start, getRequestCode(upcomingTime, studentId))
+                cancelScheduledTo(lesson.start..lesson.end, getRequestCode(lesson.start, studentId))
+
+                Timber.d("TimetableNotification canceled: type 1 & 2, subject: ${lesson.subject}, start: ${lesson.start}, student: $studentId")
+            }
+        }
+    }
+
+    private fun cancelScheduledTo(range: ClosedRange<LocalDateTime>, requestCode: Int) {
+        if (now() in range) cancelNotification()
+        alarmManager.cancel(PendingIntent.getBroadcast(context, requestCode, Intent(), FLAG_UPDATE_CURRENT))
+    }
+
+    fun cancelNotification() = NotificationManagerCompat.from(context).cancel(MainView.Section.TIMETABLE.id)
+
+    suspend fun scheduleNotifications(lessons: List<Timetable>, student: Student) {
+        if (!preferencesRepository.isUpcomingLessonsNotificationsEnable) return cancelScheduled(lessons, student.studentId)
+
+        withContext(dispatchersProvider.backgroundThread) {
+            lessons.groupBy { it.date }
+                .map { it.value.sortedBy { lesson -> lesson.start } }
+                .map { it.filter { lesson -> lesson.isStudentPlan } }
+                .map { day ->
+                    val canceled = day.filter { it.canceled }
+                    val active = day.filter { !it.canceled }
+
+                    cancelScheduled(canceled)
+                    active.forEachIndexed { index, lesson ->
+                        val intent = createIntent(student, lesson, active.getOrNull(index + 1))
+
+                        if (lesson.start > now()) {
+                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_UPCOMING, getUpcomingLessonTime(index, active, lesson))
+                        }
+
+                        if (lesson.end > now()) {
+                            scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_CURRENT, lesson.start)
+                            if (active.lastIndex == index) {
+                                scheduleBroadcast(intent, student.studentId, NOTIFICATION_TYPE_LAST_LESSON_CANCELLATION, lesson.end)
+                            }
+                        }
+                    }
+                }
+        }
+    }
+
+    private fun createIntent(student: Student, lesson: Timetable, nextLesson: Timetable?): Intent {
+        return Intent(context, TimetableNotificationReceiver::class.java).apply {
+            putExtra(STUDENT_ID, student.studentId)
+            putExtra(STUDENT_NAME, student.studentName)
+            putExtra(LESSON_ROOM, lesson.room)
+            putExtra(LESSON_START, lesson.start.toTimestamp())
+            putExtra(LESSON_END, lesson.end.toTimestamp())
+            putExtra(LESSON_TITLE, lesson.subject)
+            putExtra(LESSON_NEXT_TITLE, nextLesson?.subject)
+            putExtra(LESSON_NEXT_ROOM, nextLesson?.room)
+        }
+    }
+
+    private fun scheduleBroadcast(intent: Intent, studentId: Int, notificationType: Int, time: LocalDateTime) {
+        AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, RTC_WAKEUP, time.toTimestamp(),
+            PendingIntent.getBroadcast(context, getRequestCode(time, studentId), intent.also {
+                it.putExtra(NOTIFICATION_ID, MainView.Section.TIMETABLE.id)
+                it.putExtra(LESSON_TYPE, notificationType)
+            }, FLAG_UPDATE_CURRENT)
+        )
+        Timber.d("TimetableNotification scheduled: type: $notificationType, subject: ${intent.getStringExtra(LESSON_TITLE)}, start: $time, student: $studentId")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
index 6b0469773..47a949273 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncManager.kt
@@ -2,23 +2,29 @@ package io.github.wulkanowy.services.sync
 
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.O
+import androidx.core.app.NotificationManagerCompat
+import androidx.lifecycle.asFlow
 import androidx.work.BackoffPolicy.EXPONENTIAL
 import androidx.work.Constraints
+import androidx.work.Data
 import androidx.work.ExistingPeriodicWorkPolicy.KEEP
 import androidx.work.ExistingPeriodicWorkPolicy.REPLACE
+import androidx.work.ExistingWorkPolicy
 import androidx.work.NetworkType.CONNECTED
 import androidx.work.NetworkType.UNMETERED
+import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.SharedPrefProvider.Companion.APP_VERSION_CODE_KEY
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.DebugChannel
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.Channel
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.isHolidays
-import org.threeten.bp.LocalDate.now
+import kotlinx.coroutines.flow.Flow
 import timber.log.Timber
+import java.time.LocalDate.now
 import java.util.concurrent.TimeUnit.MINUTES
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -27,28 +33,29 @@ import javax.inject.Singleton
 class SyncManager @Inject constructor(
     private val workManager: WorkManager,
     private val preferencesRepository: PreferencesRepository,
+    channels: Set<@JvmSuppressWildcards Channel>,
+    notificationManager: NotificationManagerCompat,
     sharedPrefProvider: SharedPrefProvider,
-    newEntriesChannel: NewEntriesChannel,
-    debugChannel: DebugChannel,
     appInfo: AppInfo
 ) {
 
     init {
         if (now().isHolidays) stopSyncWorker()
 
-        if (SDK_INT > O) {
-            newEntriesChannel.create()
-            if (appInfo.isDebug) debugChannel.create()
+        if (SDK_INT >= O) {
+            channels.forEach { it.create() }
+            notificationManager.deleteNotificationChannel("lesson_channel")
+            notificationManager.deleteNotificationChannel("new_entries_channel")
         }
 
         if (sharedPrefProvider.getLong(APP_VERSION_CODE_KEY, -1L) != appInfo.versionCode.toLong()) {
-            startSyncWorker(true)
+            startPeriodicSyncWorker(true)
             sharedPrefProvider.putLong(APP_VERSION_CODE_KEY, appInfo.versionCode.toLong(), true)
         }
         Timber.i("SyncManager was initialized")
     }
 
-    fun startSyncWorker(restart: Boolean = false) {
+    fun startPeriodicSyncWorker(restart: Boolean = false) {
         if (preferencesRepository.isServiceEnabled && !now().isHolidays) {
             workManager.enqueueUniquePeriodicWork(SyncWorker::class.java.simpleName, if (restart) REPLACE else KEEP,
                 PeriodicWorkRequestBuilder<SyncWorker>(preferencesRepository.servicesInterval, MINUTES)
@@ -61,6 +68,20 @@ class SyncManager @Inject constructor(
         }
     }
 
+    fun startOneTimeSyncWorker(): Flow<WorkInfo> {
+        val work = OneTimeWorkRequestBuilder<SyncWorker>()
+            .setInputData(
+                Data.Builder()
+                    .putBoolean("one_time", true)
+                    .build()
+            )
+            .build()
+
+        workManager.enqueueUniqueWork("${SyncWorker::class.java.simpleName}_one_time", ExistingWorkPolicy.REPLACE, work)
+
+        return workManager.getWorkInfoByIdLiveData(work.id).asFlow()
+    }
+
     fun stopSyncWorker() {
         workManager.cancelUniqueWork(SyncWorker::class.java.simpleName)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
index 68702d9a9..13326ca06 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorker.kt
@@ -5,25 +5,25 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.BigTextStyle
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import androidx.core.app.NotificationManagerCompat
-import androidx.work.ListenableWorker
-import androidx.work.RxWorker
+import androidx.hilt.Assisted
+import androidx.hilt.work.WorkerInject
+import androidx.work.CoroutineWorker
+import androidx.work.Data
 import androidx.work.WorkerParameters
-import com.squareup.inject.assisted.Assisted
-import com.squareup.inject.assisted.AssistedInject
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.services.sync.channels.DebugChannel
 import io.github.wulkanowy.services.sync.works.Work
 import io.github.wulkanowy.utils.getCompatColor
-import io.reactivex.Completable
-import io.reactivex.Single
+import kotlinx.coroutines.coroutineScope
 import timber.log.Timber
 import kotlin.random.Random
 
-class SyncWorker @AssistedInject constructor(
+class SyncWorker @WorkerInject constructor(
     @Assisted appContext: Context,
     @Assisted workerParameters: WorkerParameters,
     private val studentRepository: StudentRepository,
@@ -31,50 +31,56 @@ class SyncWorker @AssistedInject constructor(
     private val works: Set<@JvmSuppressWildcards Work>,
     private val preferencesRepository: PreferencesRepository,
     private val notificationManager: NotificationManagerCompat
-) : RxWorker(appContext, workerParameters) {
+) : CoroutineWorker(appContext, workerParameters) {
 
-    override fun createWork(): Single<Result> {
+    override suspend fun doWork() = coroutineScope {
         Timber.i("SyncWorker is starting")
-        return studentRepository.isCurrentStudentSet()
-            .filter { true }
-            .flatMap { studentRepository.getCurrentStudent().toMaybe() }
-            .flatMapCompletable { student ->
-                semesterRepository.getCurrentSemester(student, true)
-                    .flatMapCompletable { semester ->
-                        Completable.mergeDelayError(works.map { work ->
-                            work.create(student, semester)
-                                .doOnSubscribe { Timber.i("${work::class.java.simpleName} is starting") }
-                                .doOnError { Timber.i("${work::class.java.simpleName} result: An exception occurred") }
-                                .doOnComplete { Timber.i("${work::class.java.simpleName} result: Success") }
-                        })
-                    }
+
+        if (!studentRepository.isCurrentStudentSet()) return@coroutineScope Result.failure()
+
+        val student = studentRepository.getCurrentStudent()
+        val semester = semesterRepository.getCurrentSemester(student, true)
+
+        val exceptions = works.mapNotNull { work ->
+            try {
+                Timber.i("${work::class.java.simpleName} is starting")
+                work.doWork(student, semester)
+                Timber.i("${work::class.java.simpleName} result: Success")
+                null
+            } catch (e: Throwable) {
+                Timber.w("${work::class.java.simpleName} result: An exception ${e.message} occurred")
+                if (e is FeatureDisabledException || e is FeatureNotAvailableException) null
+                else {
+                    Timber.e(e)
+                    e
+                }
             }
-            .toSingleDefault(Result.success())
-            .onErrorReturn {
-                Timber.e(it, "There was an error during synchronization")
-                if (it is FeatureDisabledException) Result.success()
-                else Result.retry()
-            }
-            .doOnSuccess {
-                if (preferencesRepository.isDebugNotificationEnable) notify(it)
-                Timber.i("SyncWorker result: $it")
+        }
+        val result = when {
+            exceptions.isNotEmpty() && inputData.getBoolean("one_time", false) -> {
+                Result.failure(Data.Builder()
+                    .putString("error", exceptions.map { it.stackTraceToString() }.toString())
+                    .build()
+                )
             }
+            exceptions.isNotEmpty() -> Result.retry()
+            else -> Result.success()
+        }
+
+        if (preferencesRepository.isDebugNotificationEnable) notify(result)
+        Timber.i("SyncWorker result: $result")
+
+        result
     }
 
     private fun notify(result: Result) {
         notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(applicationContext, DebugChannel.CHANNEL_ID)
             .setContentTitle("Debug notification")
-            .setSmallIcon(R.drawable.ic_more_settings)
+            .setSmallIcon(R.drawable.ic_stat_push)
             .setAutoCancel(true)
             .setColor(applicationContext.getCompatColor(R.color.colorPrimary))
             .setStyle(BigTextStyle().bigText("${SyncWorker::class.java.simpleName} result: $result"))
             .setPriority(PRIORITY_DEFAULT)
             .build())
     }
-
-    @AssistedInject.Factory
-    interface Factory {
-
-        fun create(appContext: Context, workerParameters: WorkerParameters): ListenableWorker
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt b/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
deleted file mode 100644
index aadfc27f4..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/SyncWorkerFactory.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.services.sync
-
-import android.content.Context
-import androidx.work.ListenableWorker
-import androidx.work.WorkerFactory
-import androidx.work.WorkerParameters
-import timber.log.Timber
-import javax.inject.Inject
-
-class SyncWorkerFactory @Inject constructor(private val syncWorkerFactory: SyncWorker.Factory) : WorkerFactory() {
-
-    override fun createWorker(appContext: Context, workerClassName: String, workerParameters: WorkerParameters): ListenableWorker? {
-        return if (workerClassName == SyncWorker::class.java.name) {
-            syncWorkerFactory.create(appContext, workerParameters)
-        } else {
-            Timber.e(IllegalArgumentException("Unknown worker class name: $workerClassName"))
-            null
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
new file mode 100644
index 000000000..f47c2220c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/Channel.kt
@@ -0,0 +1,6 @@
+package io.github.wulkanowy.services.sync.channels
+
+interface Channel {
+
+    fun create()
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
index 166d3efc4..2c7565195 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/DebugChannel.kt
@@ -6,20 +6,24 @@ import android.app.NotificationChannel
 import android.app.NotificationManager.IMPORTANCE_DEFAULT
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
 @TargetApi(26)
 class DebugChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) {
+    @ApplicationContext private val context: Context,
+    private val appInfo: AppInfo
+) : Channel {
 
     companion object {
         const val CHANNEL_ID = "debug_channel"
     }
 
-    fun create() {
+    override fun create() {
+        if (!appInfo.isDebug) return
         notificationManager.createNotificationChannel(
             NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_debug), IMPORTANCE_DEFAULT)
                 .apply {
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
new file mode 100644
index 000000000..8025bd76c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/LuckyNumberChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class LuckyNumberChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "lucky_number_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_lucky_number), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
new file mode 100644
index 000000000..5d5727d35
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewGradesChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewGradesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_grade_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_grades), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
new file mode 100644
index 000000000..962fbfa24
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewMessagesChannel.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class NewMessagesChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "new_message_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_message), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                })
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
similarity index 57%
rename from app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
rename to app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
index 71624510b..c6e79b393 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewEntriesChannel.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/NewNotesChannel.kt
@@ -1,31 +1,32 @@
 package io.github.wulkanowy.services.sync.channels
 
 import android.annotation.TargetApi
-import android.app.Notification.VISIBILITY_PUBLIC
+import android.app.Notification
 import android.app.NotificationChannel
-import android.app.NotificationManager.IMPORTANCE_HIGH
+import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import javax.inject.Inject
 
 @TargetApi(26)
-class NewEntriesChannel @Inject constructor(
+class NewNotesChannel @Inject constructor(
     private val notificationManager: NotificationManagerCompat,
-    private val context: Context
-) {
+    @ApplicationContext private val context: Context
+) : Channel {
 
     companion object {
-        const val CHANNEL_ID = "new_entries_channel"
+        const val CHANNEL_ID = "new_notes_channel"
     }
 
-    fun create() {
+    override fun create() {
         notificationManager.createNotificationChannel(
-            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_entries), IMPORTANCE_HIGH)
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_new_notes), NotificationManager.IMPORTANCE_HIGH)
                 .apply {
                     enableLights(true)
                     enableVibration(true)
-                    lockscreenVisibility = VISIBILITY_PUBLIC
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
                 })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
new file mode 100644
index 000000000..1d7376b92
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/PushChannel.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class PushChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "push_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_push), NotificationManager.IMPORTANCE_HIGH)
+                .apply {
+                    enableLights(true)
+                    enableVibration(true)
+                    lockscreenVisibility = Notification.VISIBILITY_PUBLIC
+                }
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
new file mode 100644
index 000000000..63b3a4f91
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/channels/UpcomingLessonsChannel.kt
@@ -0,0 +1,33 @@
+package io.github.wulkanowy.services.sync.channels
+
+import android.annotation.TargetApi
+import android.app.Notification.VISIBILITY_PUBLIC
+import android.app.NotificationChannel
+import android.app.NotificationManager.IMPORTANCE_DEFAULT
+import android.content.Context
+import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import javax.inject.Inject
+
+@TargetApi(26)
+class UpcomingLessonsChannel @Inject constructor(
+    private val notificationManager: NotificationManagerCompat,
+    @ApplicationContext private val context: Context
+) : Channel {
+
+    companion object {
+        const val CHANNEL_ID = "upcoming_lesson_channel"
+    }
+
+    override fun create() {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(CHANNEL_ID, context.getString(R.string.channel_upcoming_lessons), IMPORTANCE_DEFAULT).apply {
+                lockscreenVisibility = VISIBILITY_PUBLIC
+                setShowBadge(false)
+                enableVibration(false)
+                setSound(null, null)
+            }
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
index 01978c5b6..9e4ab9025 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceSummaryWork.kt
@@ -3,15 +3,14 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
 
 class AttendanceSummaryWork @Inject constructor(
     private val attendanceSummaryRepository: AttendanceSummaryRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return attendanceSummaryRepository.getAttendanceSummary(semester, -1, true).ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        attendanceSummaryRepository.getAttendanceSummary(student, semester, -1, true).waitForResult()
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
index e4b55b0ea..ecf0be018 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/AttendanceWork.kt
@@ -3,16 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
-import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.reactivex.Completable
-import org.threeten.bp.LocalDate.now
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.waitForResult
+import java.time.LocalDate.now
 import javax.inject.Inject
 
 class AttendanceWork @Inject constructor(private val attendanceRepository: AttendanceRepository) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return attendanceRepository.getAttendance(semester, now().monday, now().friday, true)
-            .ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        attendanceRepository.getAttendance(student, semester, now().monday, now().sunday, true).waitForResult()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
index 29642ad6f..212ea6327 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/CompletedLessonWork.kt
@@ -3,19 +3,17 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
-import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.reactivex.Completable
-import org.threeten.bp.LocalDate.now
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.waitForResult
+import java.time.LocalDate.now
 import javax.inject.Inject
 
 class CompletedLessonWork @Inject constructor(
     private val completedLessonsRepository: CompletedLessonsRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return completedLessonsRepository.getCompletedLessons(semester, now().monday, now().friday, true)
-            .ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        completedLessonsRepository.getCompletedLessons(student, semester, now().monday, now().sunday, true).waitForResult()
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
index 8744fcc79..899d45cba 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/ExamWork.kt
@@ -3,15 +3,13 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
-import io.github.wulkanowy.utils.friday
-import io.github.wulkanowy.utils.monday
-import io.reactivex.Completable
-import org.threeten.bp.LocalDate.now
+import io.github.wulkanowy.utils.waitForResult
+import java.time.LocalDate.now
 import javax.inject.Inject
 
 class ExamWork @Inject constructor(private val examRepository: ExamRepository) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return examRepository.getExams(semester, now().monday, now().friday, true).ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        examRepository.getExams(student, semester, now(), now(), true).waitForResult()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
index 1de39a95f..3d61a423b 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeStatisticsWork.kt
@@ -3,14 +3,18 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
 
-class GradeStatisticsWork @Inject constructor(private val gradeStatisticsRepository: GradeStatisticsRepository) : Work {
+class GradeStatisticsWork @Inject constructor(
+    private val gradeStatisticsRepository: GradeStatisticsRepository
+) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return gradeStatisticsRepository.getGradesStatistics(semester, "Wszystkie", false, true)
-            .ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        with(gradeStatisticsRepository) {
+            getGradesStatistics(student, semester, "Wszystkie", isSemester = true, forceRefresh = true).waitForResult()
+            getGradesStatistics(student, semester, "Wszystkie", isSemester = false, forceRefresh = true).waitForResult()
+            getGradesPointsStatistics(student, semester, "Wszystkie", forceRefresh = true).waitForResult()
+        }
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
deleted file mode 100644
index 6de0bc5b0..000000000
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeSummaryWork.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.services.sync.works
-
-import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-import io.reactivex.Completable
-import javax.inject.Inject
-
-class GradeSummaryWork @Inject constructor(private val gradeSummaryRepository: GradeSummaryRepository) : Work {
-
-    override fun create(student: Student, semester: Semester): Completable {
-        return gradeSummaryRepository.getGradesSummary(semester, true).ignoreElement()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
index cd863568b..00bce109e 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/GradeWork.kt
@@ -7,40 +7,51 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.NewGradesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 import kotlin.random.Random
 
 class GradeWork @Inject constructor(
-    private val context: Context,
+    @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val gradeRepository: GradeRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { gradeRepository.getNotNotifiedGrades(semester) }
-            .flatMapCompletable {
-                if (it.isNotEmpty()) notify(it)
-                gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
-            }
+    override suspend fun doWork(student: Student, semester: Semester) {
+        gradeRepository.getGrades(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
+
+        gradeRepository.getNotNotifiedGrades(semester).first().let {
+            if (it.isNotEmpty()) notifyDetails(it)
+            gradeRepository.updateGrades(it.onEach { grade -> grade.isNotified = true })
+        }
+
+        gradeRepository.getNotNotifiedPredictedGrades(semester).first().let {
+            if (it.isNotEmpty()) notifyPredicted(it)
+            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isPredictedGradeNotified = true })
+        }
+
+        gradeRepository.getNotNotifiedFinalGrades(semester).first().let {
+            if (it.isNotEmpty()) notifyFinal(it)
+            gradeRepository.updateGradesSummary(it.onEach { grade -> grade.isFinalGradeNotified = true })
+        }
     }
 
-    private fun notify(grades: List<Grade>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
+    private fun getNotificationBuilder(): NotificationCompat.Builder {
+        return NotificationCompat.Builder(context, NewGradesChannel.CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_stat_grade)
             .setAutoCancel(true)
             .setPriority(PRIORITY_HIGH)
@@ -49,6 +60,12 @@ class GradeWork @Inject constructor(
             .setContentIntent(
                 PendingIntent.getActivity(context, MainView.Section.GRADE.id,
                     MainActivity.getStartIntent(context, MainView.Section.GRADE, true), FLAG_UPDATE_CURRENT))
+    }
+
+    private fun notifyDetails(grades: List<Grade>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
+            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items, grades.size, grades.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items, grades.size, grades.size))
             .setStyle(NotificationCompat.InboxStyle().run {
                 setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, grades.size, grades.size))
                 grades.forEach { addLine("${it.subject}: ${it.entry}") }
@@ -57,5 +74,30 @@ class GradeWork @Inject constructor(
             .build()
         )
     }
-}
 
+    private fun notifyPredicted(gradesSummary: List<GradeSummary>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
+            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_predicted, gradesSummary.size, gradesSummary.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_predicted, gradesSummary.size, gradesSummary.size))
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
+                gradesSummary.forEach { addLine("${it.subject}: ${it.predictedGrade}") }
+                this
+            })
+            .build()
+        )
+    }
+
+    private fun notifyFinal(gradesSummary: List<GradeSummary>) {
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), getNotificationBuilder()
+            .setContentTitle(context.resources.getQuantityString(R.plurals.grade_new_items_final, gradesSummary.size, gradesSummary.size))
+            .setContentText(context.resources.getQuantityString(R.plurals.grade_notify_new_items_final, gradesSummary.size, gradesSummary.size))
+            .setStyle(NotificationCompat.InboxStyle().run {
+                setSummaryText(context.resources.getQuantityString(R.plurals.grade_number_item, gradesSummary.size, gradesSummary.size))
+                gradesSummary.forEach { addLine("${it.subject}: ${it.finalGrade}") }
+                this
+            })
+            .build()
+        )
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
index 32b356c68..a07f11073 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/HomeworkWork.kt
@@ -3,15 +3,15 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
-import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.reactivex.Completable
-import org.threeten.bp.LocalDate.now
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.waitForResult
+import java.time.LocalDate.now
 import javax.inject.Inject
 
 class HomeworkWork @Inject constructor(private val homeworkRepository: HomeworkRepository) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return homeworkRepository.getHomework(semester, now().monday, now().friday, true).ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        homeworkRepository.getHomework(student, semester, now().monday, now().sunday, true).waitForResult()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
index 1e366d58c..7b9f5ab30 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/LuckyNumberWork.kt
@@ -7,38 +7,39 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.LuckyNumberChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
 import kotlin.random.Random
 
 class LuckyNumberWork @Inject constructor(
-    private val context: Context,
+    @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val luckyNumberRepository: LuckyNumberRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return luckyNumberRepository.getLuckyNumber(semester, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { luckyNumberRepository.getNotNotifiedLuckyNumber(semester) }
-            .flatMapCompletable {
-                notify(it)
-                luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
-            }
+    override suspend fun doWork(student: Student, semester: Semester) {
+        luckyNumberRepository.getLuckyNumber(student, true, preferencesRepository.isNotificationsEnable).waitForResult()
+
+        luckyNumberRepository.getNotNotifiedLuckyNumber(student)?.let {
+            notify(it)
+            luckyNumberRepository.updateLuckyNumber(it.apply { isNotified = true })
+        }
     }
 
     private fun notify(luckyNumber: LuckyNumber) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, LuckyNumberChannel.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.lucky_number_notify_new_item_title))
             .setContentText(context.getString(R.string.lucky_number_notify_new_item, luckyNumber.luckyNumber))
             .setSmallIcon(R.drawable.ic_stat_luckynumber)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
index d0890626f..7b32f13bb 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/MessageWork.kt
@@ -7,6 +7,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Semester
@@ -14,32 +15,33 @@ import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.services.sync.channels.NewMessagesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 import kotlin.random.Random
 
 class MessageWork @Inject constructor(
-    private val context: Context,
+    @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val messageRepository: MessageRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { messageRepository.getNotNotifiedMessages(student) }
-            .flatMapCompletable {
-                if (it.isNotEmpty()) notify(it)
-                messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
-            }
+    override suspend fun doWork(student: Student, semester: Semester) {
+        messageRepository.getMessages(student, semester, RECEIVED, true, preferencesRepository.isNotificationsEnable).waitForResult()
+
+        messageRepository.getNotNotifiedMessages(student).first().let {
+            if (it.isNotEmpty()) notify(it)
+            messageRepository.updateMessages(it.onEach { message -> message.isNotified = true })
+        }
     }
 
     private fun notify(messages: List<Message>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewMessagesChannel.CHANNEL_ID)
             .setContentTitle(context.resources.getQuantityString(R.plurals.message_new_items, messages.size, messages.size))
             .setContentText(context.resources.getQuantityString(R.plurals.message_notify_new_items, messages.size, messages.size))
             .setSmallIcon(R.drawable.ic_stat_message)
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
index 235ef201e..b08896966 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/NoteWork.kt
@@ -7,40 +7,57 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.DEFAULT_ALL
 import androidx.core.app.NotificationCompat.PRIORITY_HIGH
 import androidx.core.app.NotificationManagerCompat
+import dagger.hilt.android.qualifiers.ApplicationContext
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
-import io.github.wulkanowy.services.sync.channels.NewEntriesChannel
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.NEUTRAL
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory.POSITIVE
+import io.github.wulkanowy.services.sync.channels.NewNotesChannel
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.getCompatColor
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
+import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 import kotlin.random.Random
 
 class NoteWork @Inject constructor(
-    private val context: Context,
+    @ApplicationContext private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val noteRepository: NoteRepository,
     private val preferencesRepository: PreferencesRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable)
-            .flatMap { noteRepository.getNotNotifiedNotes(student) }
-            .flatMapCompletable {
-                if (it.isNotEmpty()) notify(it)
-                noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
-            }
+    override suspend fun doWork(student: Student, semester: Semester) {
+        noteRepository.getNotes(student, semester, true, preferencesRepository.isNotificationsEnable).waitForResult()
+
+        noteRepository.getNotNotifiedNotes(student).first().let {
+            if (it.isNotEmpty()) notify(it)
+            noteRepository.updateNotes(it.onEach { note -> note.isNotified = true })
+        }
     }
 
     private fun notify(notes: List<Note>) {
-        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewEntriesChannel.CHANNEL_ID)
-            .setContentTitle(context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size))
-            .setContentText(context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size))
+        notificationManager.notify(Random.nextInt(Int.MAX_VALUE), NotificationCompat.Builder(context, NewNotesChannel.CHANNEL_ID)
+            .setContentTitle(
+                when (NoteCategory.getByValue(notes.first().categoryType)) {
+                    POSITIVE -> context.resources.getQuantityString(R.plurals.praise_new_items, notes.size, notes.size)
+                    NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_new_items, notes.size, notes.size)
+                    else -> context.resources.getQuantityString(R.plurals.note_new_items, notes.size, notes.size)
+                }
+            )
+            .setContentText(
+                when (NoteCategory.getByValue(notes.first().categoryType)) {
+                    POSITIVE -> context.resources.getQuantityString(R.plurals.praise_notify_new_items, notes.size, notes.size)
+                    NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_notify_new_items, notes.size, notes.size)
+                    else -> context.resources.getQuantityString(R.plurals.note_notify_new_items, notes.size, notes.size)
+                }
+            )
             .setSmallIcon(R.drawable.ic_stat_note)
             .setAutoCancel(true)
             .setDefaults(DEFAULT_ALL)
@@ -50,7 +67,13 @@ class NoteWork @Inject constructor(
                 PendingIntent.getActivity(context, MainView.Section.NOTE.id,
                     MainActivity.getStartIntent(context, MainView.Section.NOTE, true), FLAG_UPDATE_CURRENT))
             .setStyle(NotificationCompat.InboxStyle().run {
-                setSummaryText(context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size))
+                setSummaryText(
+                    when (NoteCategory.getByValue(notes.first().categoryType)) {
+                        POSITIVE -> context.resources.getQuantityString(R.plurals.praise_number_item, notes.size, notes.size)
+                        NEUTRAL -> context.resources.getQuantityString(R.plurals.neutral_note_number_item, notes.size, notes.size)
+                        else -> context.resources.getQuantityString(R.plurals.note_number_item, notes.size, notes.size)
+                    }
+                )
                 notes.forEach { addLine("${it.teacher}: ${it.category}") }
                 this
             })
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
index fa610dee4..c433c0ac8 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/RecipientWork.kt
@@ -4,7 +4,6 @@ import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
 import io.github.wulkanowy.data.repositories.reportingunit.ReportingUnitRepository
-import io.reactivex.Completable
 import javax.inject.Inject
 
 class RecipientWork @Inject constructor(
@@ -12,13 +11,13 @@ class RecipientWork @Inject constructor(
     private val recipientRepository: RecipientRepository
 ) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return reportingUnitRepository.getReportingUnits(student, true)
-            .flatMapCompletable { units ->
-                Completable.mergeDelayError(units.map {
-                    recipientRepository.getRecipients(student, 2, it, true).ignoreElement()
-                })
+    override suspend fun doWork(student: Student, semester: Semester) {
+        reportingUnitRepository.refreshReportingUnits(student)
+
+        reportingUnitRepository.getReportingUnits(student).let { units ->
+            units.map {
+                recipientRepository.refreshRecipients(student, 2, it)
             }
+        }
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
index 18178d2d1..a9abdaa72 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TeacherWork.kt
@@ -3,12 +3,12 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
-import io.reactivex.Completable
+import io.github.wulkanowy.utils.waitForResult
 import javax.inject.Inject
 
 class TeacherWork @Inject constructor(private val teacherRepository: TeacherRepository) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return teacherRepository.getTeachers(semester, true).ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        teacherRepository.getTeachers(student, semester, true).waitForResult()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
index 743ae0e83..3b8c6f5dc 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/TimetableWork.kt
@@ -3,16 +3,17 @@ package io.github.wulkanowy.services.sync.works
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
-import io.github.wulkanowy.utils.friday
 import io.github.wulkanowy.utils.monday
-import io.reactivex.Completable
-import org.threeten.bp.LocalDate.now
+import io.github.wulkanowy.utils.sunday
+import io.github.wulkanowy.utils.waitForResult
+import java.time.LocalDate.now
 import javax.inject.Inject
 
-class TimetableWork @Inject constructor(private val timetableRepository: TimetableRepository) : Work {
+class TimetableWork @Inject constructor(
+    private val timetableRepository: TimetableRepository
+) : Work {
 
-    override fun create(student: Student, semester: Semester): Completable {
-        return timetableRepository.getTimetable(semester, now().monday, now().friday, true)
-            .ignoreElement()
+    override suspend fun doWork(student: Student, semester: Semester) {
+        timetableRepository.getTimetable(student, semester, now().monday, now().sunday, true).waitForResult()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
index 1601a103b..c41f41ce2 100644
--- a/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/sync/works/Work.kt
@@ -2,10 +2,8 @@ package io.github.wulkanowy.services.sync.works
 
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
-import io.reactivex.Completable
 
 interface Work {
 
-    fun create(student: Student, semester: Semester): Completable
+    suspend fun doWork(student: Student, semester: Semester)
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
index 7c7e67101..42c6d3bfd 100644
--- a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -2,15 +2,17 @@ package io.github.wulkanowy.services.widgets
 
 import android.content.Intent
 import android.widget.RemoteViewsService
-import dagger.android.AndroidInjection
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.data.db.SharedPrefProvider
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetFactory
-import io.github.wulkanowy.utils.SchedulersProvider
+import timber.log.Timber
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class TimetableWidgetService : RemoteViewsService() {
 
     @Inject
@@ -23,13 +25,13 @@ class TimetableWidgetService : RemoteViewsService() {
     lateinit var semesterRepo: SemesterRepository
 
     @Inject
-    lateinit var sharedPref: SharedPrefProvider
+    lateinit var prefRepository: PreferencesRepository
 
     @Inject
-    lateinit var schedulers: SchedulersProvider
+    lateinit var sharedPref: SharedPrefProvider
 
     override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
-        AndroidInjection.inject(this)
-        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, sharedPref, schedulers, applicationContext, intent)
+        Timber.d("TimetableWidgetFactory created")
+        return TimetableWidgetFactory(timetableRepo, studentRepo, semesterRepo, prefRepository, sharedPref, applicationContext, intent)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
index ee74832fd..86b6701b3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseActivity.kt
@@ -11,22 +11,20 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
-import dagger.android.AndroidInjection
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasAndroidInjector
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.FragmentLifecycleLogger
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import javax.inject.Inject
 
-abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity(), BaseView,
-    HasAndroidInjector {
+abstract class BaseActivity<T : BasePresenter<out BaseView>, VB : ViewBinding> :
+    AppCompatActivity(), BaseView {
 
-    @Inject
-    lateinit var androidInjector: DispatchingAndroidInjector<Any>
+    protected var binding: VB by lifecycleAwareVariable()
 
     @Inject
     lateinit var fragmentLifecycleLogger: FragmentLifecycleLogger
@@ -38,8 +36,7 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
 
     abstract var presenter: T
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this)
+    override fun onCreate(savedInstanceState: Bundle?) {
         themeManager.applyActivityTheme(this)
         super.onCreate(savedInstanceState)
         supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleLogger, true)
@@ -87,6 +84,4 @@ abstract class BaseActivity<T : BasePresenter<out BaseView>> : AppCompatActivity
         invalidateOptionsMenu()
         presenter.onDetachView()
     }
-
-    override fun androidInjector() = androidInjector
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
index fdc463714..18cd58b41 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseDialogFragment.kt
@@ -1,9 +1,13 @@
 package io.github.wulkanowy.ui.base
 
 import android.widget.Toast
-import dagger.android.support.DaggerAppCompatDialogFragment
+import androidx.fragment.app.DialogFragment
+import androidx.viewbinding.ViewBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
+abstract class BaseDialogFragment<VB : ViewBinding> : DialogFragment(), BaseView {
+
+    protected var binding: VB by lifecycleAwareVariable()
 
     override fun showError(text: String, error: Throwable) {
         showMessage(text)
@@ -14,11 +18,11 @@ abstract class BaseDialogFragment : DaggerAppCompatDialogFragment(), BaseView {
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
new file mode 100644
index 000000000..eee4625c9
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseExpandableAdapter.kt
@@ -0,0 +1,58 @@
+package io.github.wulkanowy.ui.base
+
+import android.util.DisplayMetrics
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSmoothScroller
+import androidx.recyclerview.widget.RecyclerView
+import kotlin.math.max
+import kotlin.math.min
+
+abstract class BaseExpandableAdapter<T : RecyclerView.ViewHolder> : RecyclerView.Adapter<T>() {
+
+    companion object {
+        private const val MILLISECONDS_PER_INCH = 100f
+        private const val AUTO_SCROLL_DELAY = 150L
+    }
+
+    private var recyclerView: RecyclerView? = null
+
+    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+        super.onAttachedToRecyclerView(recyclerView)
+        this.recyclerView = recyclerView
+    }
+
+    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+        super.onDetachedFromRecyclerView(recyclerView)
+        this.recyclerView = null
+    }
+
+    // original: https://github.com/davideas/FlexibleAdapter/blob/5.1.0/flexible-adapter/src/main/java/eu/davidea/flexibleadapter/FlexibleAdapter.java#L4984-L5011
+    protected fun scrollToHeaderWithSubItems(position: Int, subItemsCount: Int) {
+        val layoutManager = recyclerView!!.layoutManager as LinearLayoutManager
+        val firstVisibleItem = layoutManager.findFirstCompletelyVisibleItemPosition()
+        val lastVisibleItem = layoutManager.findLastCompletelyVisibleItemPosition()
+        val itemsToShow = position + subItemsCount - lastVisibleItem
+        if (itemsToShow > 0) {
+            val scrollMax: Int = position - firstVisibleItem
+            val scrollMin = max(0, position + subItemsCount - lastVisibleItem)
+            val scrollBy = min(scrollMax, scrollMin)
+            val scrollTo = firstVisibleItem + scrollBy
+            scrollToPosition(scrollTo)
+        } else if (position < firstVisibleItem) {
+            scrollToPosition(position)
+        }
+    }
+
+    private fun scrollToPosition(position: Int) {
+        recyclerView?.run {
+            postDelayed({
+                layoutManager?.startSmoothScroll(object : LinearSmoothScroller(context) {
+                    override fun getVerticalSnapPreference() = SNAP_TO_START
+                    override fun calculateSpeedPerPixel(displayMetrics: DisplayMetrics) = MILLISECONDS_PER_INCH / displayMetrics.densityDpi
+                }.apply {
+                    targetPosition = position
+                })
+            }, AUTO_SCROLL_DELAY)
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
index 2f5878d0d..c6a2e1d1c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BaseFragment.kt
@@ -1,12 +1,18 @@
 package io.github.wulkanowy.ui.base
 
 import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.snackbar.Snackbar.LENGTH_LONG
-import dagger.android.support.DaggerFragment
 import io.github.wulkanowy.R
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
-abstract class BaseFragment : DaggerFragment(), BaseView {
+abstract class BaseFragment<VB : ViewBinding>(@LayoutRes layoutId: Int) : Fragment(layoutId),
+    BaseView {
+
+    protected var binding: VB by lifecycleAwareVariable()
 
     protected var messageContainer: View? = null
 
@@ -16,7 +22,7 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
                 .setAction(R.string.all_details) { if (isAdded) showErrorDetailsDialog(error) }
                 .show()
         } else {
-            (activity as? BaseActivity<*>)?.showError(text, error)
+            (activity as? BaseActivity<*, *>)?.showError(text, error)
         }
     }
 
@@ -28,15 +34,15 @@ abstract class BaseFragment : DaggerFragment(), BaseView {
         if (messageContainer != null) {
             Snackbar.make(messageContainer!!, text, LENGTH_LONG).show()
         } else {
-            (activity as? BaseActivity<*>)?.showMessage(text)
+            (activity as? BaseActivity<*, *>)?.showMessage(text)
         }
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
index 9f0b4047c..ba8bfd85f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/BasePresenter.kt
@@ -1,22 +1,34 @@
 package io.github.wulkanowy.ui.base
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Completable
-import io.reactivex.disposables.CompositeDisposable
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import kotlin.coroutines.CoroutineContext
 
 open class BasePresenter<T : BaseView>(
     protected val errorHandler: ErrorHandler,
-    protected val studentRepository: StudentRepository,
-    protected val schedulers: SchedulersProvider
-) {
+    protected val studentRepository: StudentRepository
+) : CoroutineScope {
 
-    val disposable = CompositeDisposable()
+    private var job: Job = Job()
+
+    private val jobs = mutableMapOf<String, Job>()
+
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main + job
 
     var view: T? = null
 
     open fun onAttachView(view: T) {
+        job = Job()
         this.view = view
         errorHandler.apply {
             showErrorMessage = view::showError
@@ -26,30 +38,47 @@ open class BasePresenter<T : BaseView>(
     }
 
     fun onExpiredLoginSelected() {
-        Timber.i("Attempt to switch the student after the session expires")
-        disposable.add(studentRepository.getCurrentStudent(false)
-            .flatMapCompletable { studentRepository.logoutStudent(it) }
-            .andThen(studentRepository.getSavedStudents(false))
-            .flatMapCompletable {
-                if (it.isNotEmpty()) {
-                    Timber.i("Switching current student")
-                    studentRepository.switchStudent(it[0])
-                } else Completable.complete()
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent(false)
+            studentRepository.logoutStudent(student)
+
+            val students = studentRepository.getSavedStudents(false)
+            if (students.isNotEmpty()) {
+                Timber.i("Switching current student")
+                studentRepository.switchStudent(students[0])
             }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Switch student result: Open login view")
-                view?.openClearLoginView()
-            }, {
-                Timber.i("Switch student result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Attempt to switch the student after the session expires")
+                Status.SUCCESS -> {
+                    Timber.i("Switch student result: Open login view")
+                    view?.openClearLoginView()
+                }
+                Status.ERROR -> {
+                    Timber.i("Switch student result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("expired")
+    }
+
+    fun <T> Flow<T>.launch(individualJobTag: String = "load"): Job {
+        jobs[individualJobTag]?.cancel()
+        val job = catch { errorHandler.dispatch(it) }.launchIn(this@BasePresenter)
+        jobs[individualJobTag] = job
+        Timber.d("Job $individualJobTag launched in ${this@BasePresenter.javaClass.simpleName}: $job")
+        return job
+    }
+
+    fun cancelJobs(vararg names: String) {
+        names.forEach {
+            jobs[it]?.cancel()
+        }
     }
 
     open fun onDetachView() {
         view = null
-        disposable.clear()
+        job.cancel()
         errorHandler.clear()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
index 3255ea683..341ae4590 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorDialog.kt
@@ -6,19 +6,39 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.HorizontalScrollView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.appcompat.app.AlertDialog
 import androidx.core.content.getSystemService
-import androidx.fragment.app.DialogFragment
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import kotlinx.android.synthetic.main.dialog_error.*
+import io.github.wulkanowy.databinding.DialogErrorBinding
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.getString
+import io.github.wulkanowy.utils.openAppInMarket
+import io.github.wulkanowy.utils.openEmailClient
+import io.github.wulkanowy.utils.openInternetBrowser
+import okhttp3.internal.http2.StreamResetException
+import java.io.InterruptedIOException
 import java.io.PrintWriter
 import java.io.StringWriter
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+import javax.inject.Inject
 
-class ErrorDialog : DialogFragment() {
+@AndroidEntryPoint
+class ErrorDialog : BaseDialogFragment<DialogErrorBinding>() {
 
     private lateinit var error: Throwable
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     companion object {
         private const val ARGUMENT_KEY = "Data"
 
@@ -38,7 +58,7 @@ class ErrorDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_error, container, false)
+        return DialogErrorBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -48,14 +68,58 @@ class ErrorDialog : DialogFragment() {
             error.printStackTrace(PrintWriter(this))
         }
 
-        errorDialogContent.text = stringWriter.toString()
-        errorDialogCopy.setOnClickListener {
-            val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
-            activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
+        with(binding) {
+            errorDialogContent.text = stringWriter.toString()
+            with(errorDialogHorizontalScroll) {
+                post { fullScroll(HorizontalScrollView.FOCUS_LEFT) }
+            }
+            errorDialogCopy.setOnClickListener {
+                val clip = ClipData.newPlainText("wulkanowy", stringWriter.toString())
+                activity?.getSystemService<ClipboardManager>()?.setPrimaryClip(clip)
 
-            Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+                Toast.makeText(context, R.string.all_copied, LENGTH_LONG).show()
+            }
+            errorDialogCancel.setOnClickListener { dismiss() }
+            errorDialogReport.setOnClickListener {
+                openConfirmDialog { openEmailClient(stringWriter.toString()) }
+            }
+            errorDialogMessage.text = resources.getString(error)
+            errorDialogReport.isEnabled = when (error) {
+                is UnknownHostException,
+                is InterruptedIOException,
+                is ConnectException,
+                is StreamResetException,
+                is SocketTimeoutException,
+                is ServiceUnavailableException,
+                is FeatureDisabledException,
+                is FeatureNotAvailableException -> false
+                else -> true
+            }
         }
-        errorDialogCancel.setOnClickListener { dismiss() }
+    }
+
+    private fun openConfirmDialog(callback: () -> Unit) {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.dialog_error_check_update)
+            .setMessage(R.string.dialog_error_check_update_message)
+            .setNeutralButton(R.string.about_feedback) { _, _ -> callback() }
+            .setPositiveButton(R.string.dialog_error_check_update) { _, _ ->
+                requireContext().openAppInMarket(::showMessage)
+            }
+            .show()
+    }
+
+    private fun openEmailClient(content: String) {
+        requireContext().openEmailClient(
+            chooserTitle = getString(R.string.about_feedback),
+            email = "wulkanowyinc@gmail.com",
+            subject = "Zgłoszenie błędu",
+            body = requireContext().getString(R.string.about_feedback_template,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+            ) + "\n" + content,
+            onActivityNotFound = {
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
+            }
+        )
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
index ba10af6bf..946e661b1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/ErrorHandler.kt
@@ -1,21 +1,15 @@
 package io.github.wulkanowy.ui.base
 
 import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.R
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
-import io.github.wulkanowy.sdk.exception.BadCredentialsException
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
-import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
-import io.github.wulkanowy.sdk.exception.NotLoggedInException
-import io.github.wulkanowy.sdk.exception.ServiceUnavailableException
+import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
+import io.github.wulkanowy.utils.getString
 import io.github.wulkanowy.utils.security.ScramblerException
 import timber.log.Timber
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 import javax.inject.Inject
 
-open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckCollector: ChuckCollector) {
+open class ErrorHandler @Inject constructor(protected val resources: Resources, private val chuckerCollector: ChuckerCollector) {
 
     var showErrorMessage: (String, Throwable) -> Unit = { _, _ -> }
 
@@ -24,24 +18,16 @@ open class ErrorHandler @Inject constructor(protected val resources: Resources,
     var onNoCurrentStudent: () -> Unit = {}
 
     fun dispatch(error: Throwable) {
-        chuckCollector.onError(error.javaClass.simpleName, error)
+        chuckerCollector.onError(error.javaClass.simpleName, error)
         Timber.e(error, "An exception occurred while the Wulkanowy was running")
         proceed(error)
     }
 
     protected open fun proceed(error: Throwable) {
-        resources.run {
-            when (error) {
-                is UnknownHostException -> showErrorMessage(getString(R.string.error_no_internet), error)
-                is SocketTimeoutException -> showErrorMessage(getString(R.string.error_timeout), error)
-                is NotLoggedInException -> showErrorMessage(getString(R.string.error_login_failed), error)
-                is ServiceUnavailableException -> showErrorMessage(getString(R.string.error_service_unavailable), error)
-                is FeatureDisabledException -> showErrorMessage(getString(R.string.error_feature_disabled), error)
-                is ScramblerException, is BadCredentialsException -> onSessionExpired()
-                is NoCurrentStudentException -> onNoCurrentStudent()
-                is FeatureNotAvailableException -> showErrorMessage(getString(R.string.error_feature_not_available), error)
-                else -> showErrorMessage(getString(R.string.error_unknown), error)
-            }
+        showErrorMessage(resources.getString(error), error)
+        when (error) {
+            is ScramblerException, is BadCredentialsException -> onSessionExpired()
+            is NoCurrentStudentException -> onNoCurrentStudent()
         }
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
new file mode 100644
index 000000000..cefe6ed75
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/base/WidgetConfigureAdapter.kt
@@ -0,0 +1,46 @@
+package io.github.wulkanowy.ui.base
+
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ItemAccountBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class WidgetConfigureAdapter @Inject constructor() : RecyclerView.Adapter<WidgetConfigureAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Pair<Student, Boolean>>()
+
+    var onClickListener: (Student) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAccountBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (student, isCurrent) = items[position]
+
+        with(holder.binding) {
+            accountItemName.text = "${student.studentName} ${student.className}"
+            accountItemSchool.text = student.schoolName
+
+            with(accountItemImage) {
+                val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+            }
+
+            root.setOnClickListener { onClickListener(student) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
new file mode 100644
index 000000000..35dec3b4f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutAdapter.kt
@@ -0,0 +1,72 @@
+package io.github.wulkanowy.ui.modules.about
+
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemAboutBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderAboutBinding
+import javax.inject.Inject
+
+class AboutAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        ITEM_HEADER(1),
+        ITEM_ELEMENT(2)
+    }
+
+    var items = emptyList<Triple<String, String, Drawable?>>()
+
+    var onClickListener: (name: String) -> Unit = {}
+
+    override fun getItemCount() = items.size + 1
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.ITEM_HEADER.id
+        else -> ViewType.ITEM_ELEMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ITEM_HEADER.id -> HeaderViewHolder(ScrollableHeaderAboutBinding.inflate(inflater, parent, false))
+            ViewType.ITEM_ELEMENT.id -> ItemViewHolder(ItemAboutBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 1)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderAboutBinding) {
+        with(binding.aboutScrollableHeaderIcon) {
+            setImageDrawable(ResourcesCompat.getDrawableForDensity(
+                context.resources, context.applicationInfo.icon, 640, null)
+            )
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemAboutBinding, position: Int) {
+        val (title, summary, image) = items[position]
+
+        with(binding) {
+            aboutItemImage.setImageDrawable(image)
+            aboutItemTitle.text = title
+            aboutItemSummary.text = summary
+
+            root.setOnClickListener { onClickListener(title) }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: ScrollableHeaderAboutBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemAboutBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
index 22276bdf9..5ec1a66e3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutFragment.kt
@@ -1,38 +1,34 @@
 package io.github.wulkanowy.ui.modules.about
 
-import android.content.Intent
-import android.content.Intent.ACTION_SENDTO
-import android.content.Intent.EXTRA_EMAIL
-import android.content.Intent.EXTRA_SUBJECT
-import android.content.Intent.EXTRA_TEXT
 import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentAboutBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.about.contributor.ContributorFragment
 import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
+import io.github.wulkanowy.ui.modules.about.logviewer.LogViewerFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.getCompatDrawable
+import io.github.wulkanowy.utils.openAppInMarket
+import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
 
-class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
+@AndroidEntryPoint
+class AboutFragment : BaseFragment<FragmentAboutBinding>(R.layout.fragment_about), AboutView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: AboutPresenter
 
     @Inject
-    lateinit var aboutAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var aboutAdapter: AboutAdapter
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -42,6 +38,11 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
             Triple(getString(R.string.about_version), "${appInfo.versionName} (${appInfo.versionCode})", getCompatDrawable(R.drawable.ic_all_about))
         }
 
+    override val creatorsRes: Triple<String, String, Drawable?>?
+        get() = context?.run {
+            Triple(getString(R.string.about_contributor), getString(R.string.about_contributor_summary), getCompatDrawable(R.drawable.ic_about_creator))
+        }
+
     override val feedbackRes: Triple<String, String, Drawable?>?
         get() = context?.run {
             Triple(getString(R.string.about_feedback), getString(R.string.about_feedback_summary), getCompatDrawable(R.drawable.ic_about_feedback))
@@ -78,32 +79,36 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         fun newInstance() = AboutFragment()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_about, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAboutBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        aboutAdapter.setOnItemClickListener(presenter::onItemSelected)
+        aboutAdapter.onClickListener = presenter::onItemSelected
 
-        with(aboutRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.aboutRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = aboutAdapter
         }
     }
 
-    override fun updateData(header: AboutScrollableHeader, items: List<AboutItem>) {
+    override fun updateData(data: List<Triple<String, String, Drawable?>>) {
         with(aboutAdapter) {
-            removeAllScrollableHeaders()
-            addScrollableHeader(header)
-            updateDataSet(items)
+            items = data
+            notifyDataSetChanged()
         }
     }
 
+    override fun openAppInMarket() {
+        context?.openAppInMarket(::showMessage)
+    }
+
+    override fun openLogViewer() {
+        (activity as? MainActivity)?.pushView(LogViewerFragment.newInstance())
+    }
+
     override fun openDiscordInvite() {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
@@ -113,26 +118,17 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
     }
 
     override fun openEmailClient() {
-        val intent = Intent(ACTION_SENDTO)
-            .apply {
-                data = Uri.parse("mailto:")
-                putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
-                putExtra(EXTRA_SUBJECT, "Zgłoszenie błędu")
-                putExtra(EXTRA_TEXT, "Tu umieść treść zgłoszenia\n\n${"-".repeat(40)}\n " +
-                    """
-                        Build: ${appInfo.versionCode}
-                        SDK: ${appInfo.systemVersion}
-                        Device: ${appInfo.systemManufacturer} ${appInfo.systemModel}
-                    """.trimIndent())
+        requireContext().openEmailClient(
+            chooserTitle = getString(R.string.about_feedback),
+            email = "wulkanowyinc@gmail.com",
+            subject = "Zgłoszenie błędu",
+            body = getString(R.string.about_feedback_template,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}", appInfo.systemVersion.toString(), appInfo.versionName
+            ),
+            onActivityNotFound = {
+                requireContext().openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
             }
-
-        context?.let {
-            if (intent.resolveActivity(it.packageManager) != null) {
-                startActivity(Intent.createChooser(intent, getString(R.string.about_feedback)))
-            } else {
-                it.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/issues", ::showMessage)
-            }
-        }
+        )
     }
 
     override fun openFaqPage() {
@@ -143,6 +139,10 @@ class AboutFragment : BaseFragment(), AboutView, MainView.TitledView {
         (activity as? MainActivity)?.pushView(LicenseFragment.newInstance())
     }
 
+    override fun openCreators() {
+        (activity as? MainActivity)?.pushView(ContributorFragment.newInstance())
+    }
+
     override fun openPrivacyPolicy() {
         context?.openInternetBrowser("https://wulkanowy.github.io/polityka-prywatnosci.html", ::showMessage)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
deleted file mode 100644
index 29f1cd8c8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutItem.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import android.graphics.drawable.Drawable
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_about.*
-
-class AboutItem(
-    val title: String,
-    private val summary: String,
-    private val image: Drawable?
-) : AbstractFlexibleItem<AboutItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_about
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        with(holder) {
-            aboutItemImage.setImageDrawable(image)
-            aboutItemTitle.text = title
-            aboutItemSummary.text = summary
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AboutItem
-
-        if (title != other.title) return false
-        if (summary != other.summary) return false
-        if (image != other.image) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = title.hashCode()
-        result = 31 * result + summary.hashCode()
-        result = 31 * result + (image?.hashCode() ?: 0)
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
index 8087c9556..24e59d36b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutPresenter.kt
@@ -1,20 +1,19 @@
 package io.github.wulkanowy.ui.modules.about
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class AboutPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
+    private val appInfo: AppInfo,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AboutView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<AboutView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: AboutView) {
         super.onAttachView(view)
@@ -23,10 +22,15 @@ class AboutPresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item !is AboutItem) return
+    fun onItemSelected(name: String) {
         view?.run {
-            when (item.title) {
+            when (name) {
+                versionRes?.first -> {
+                    Timber.i("Opening log viewer")
+                    if (appInfo.isDebug) openLogViewer()
+                    else openAppInMarket()
+                    analytics.logEvent("about_open", "name" to "log_viewer")
+                }
                 feedbackRes?.first -> {
                     Timber.i("Opening email client")
                     openEmailClient()
@@ -52,6 +56,11 @@ class AboutPresenter @Inject constructor(
                     openLicenses()
                     analytics.logEvent("about_open", "name" to "licenses")
                 }
+                creatorsRes?.first -> {
+                    Timber.i("Opening creators view")
+                    openCreators()
+                    analytics.logEvent("about_open", "name" to "creators")
+                }
                 privacyRes?.first -> {
                     Timber.i("Opening privacy page ")
                     openPrivacyPolicy()
@@ -63,14 +72,16 @@ class AboutPresenter @Inject constructor(
 
     private fun loadData() {
         view?.run {
-            updateData(AboutScrollableHeader(), listOfNotNull(
-                versionRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                feedbackRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                faqRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                discordRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                homepageRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                licensesRes?.let { (title, summary, image) -> AboutItem(title, summary, image) },
-                privacyRes?.let { (title, summary, image) -> AboutItem(title, summary, image) }))
+            updateData(listOfNotNull(
+                versionRes,
+                creatorsRes,
+                feedbackRes,
+                faqRes,
+                discordRes,
+                homepageRes,
+                licensesRes,
+                privacyRes
+            ))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
deleted file mode 100644
index 07bb41249..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutScrollableHeader.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.ui.modules.about
-
-import android.view.View
-import androidx.core.content.res.ResourcesCompat
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.scrollable_header_about.*
-
-class AboutScrollableHeader : AbstractFlexibleItem<AboutScrollableHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.scrollable_header_about
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        with(holder) {
-            val context = contentView.context
-            val drawable = ResourcesCompat.getDrawableForDensity(context.resources, context.applicationInfo.icon, 640, null)
-
-            aboutScrollableHeaderIcon.setImageDrawable(drawable)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        return true
-    }
-
-    override fun hashCode() = javaClass.hashCode()
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
index 34850bae4..4c4b002f9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/AboutView.kt
@@ -7,6 +7,8 @@ interface AboutView : BaseView {
 
     val versionRes: Triple<String, String, Drawable?>?
 
+    val creatorsRes: Triple<String, String, Drawable?>?
+
     val feedbackRes: Triple<String, String, Drawable?>?
 
     val faqRes: Triple<String, String, Drawable?>?
@@ -21,7 +23,11 @@ interface AboutView : BaseView {
 
     fun initView()
 
-    fun updateData(header: AboutScrollableHeader, items: List<AboutItem>)
+    fun updateData(data: List<Triple<String, String, Drawable?>>)
+
+    fun openAppInMarket()
+
+    fun openLogViewer()
 
     fun openDiscordInvite()
 
@@ -33,5 +39,7 @@ interface AboutView : BaseView {
 
     fun openLicenses()
 
+    fun openCreators()
+
     fun openPrivacyPolicy()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
new file mode 100644
index 000000000..b6755c6a7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorAdapter.kt
@@ -0,0 +1,41 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import coil.load
+import coil.transform.RoundedCornersTransformation
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.databinding.ItemContributorBinding
+import javax.inject.Inject
+
+class ContributorAdapter @Inject constructor() :
+    RecyclerView.Adapter<ContributorAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Contributor>()
+
+    var onClickListener: (Contributor) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemContributorBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            creatorItemName.text = item.displayName
+            creatorItemAvatar.load("https://github.com/${item.githubUsername}.png") {
+                transformations(RoundedCornersTransformation(8f))
+                crossfade(true)
+            }
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemContributorBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
new file mode 100644
index 000000000..5d7e076c7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorFragment.kt
@@ -0,0 +1,73 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.databinding.FragmentContributorBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import io.github.wulkanowy.utils.openInternetBrowser
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ContributorFragment : BaseFragment<FragmentContributorBinding>(R.layout.fragment_contributor),
+    ContributorView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: ContributorPresenter
+
+    @Inject
+    lateinit var creatorsAdapter: ContributorAdapter
+
+    override val titleStringId get() = R.string.contributors_title
+
+    companion object {
+        fun newInstance() = ContributorFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentContributorBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        with(binding.creatorRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = creatorsAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        creatorsAdapter.onClickListener = presenter::onItemSelected
+        binding.creatorSeeMore.setOnClickListener { presenter.onSeeMoreClick() }
+    }
+
+    override fun updateData(data: List<Contributor>) {
+        with(creatorsAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun openUserGithubPage(username: String) {
+        context?.openInternetBrowser("https://github.com/${username}", ::showMessage)
+    }
+
+    override fun openGithubContributorsPage() {
+        context?.openInternetBrowser("https://github.com/wulkanowy/wulkanowy/graphs/contributors", ::showMessage)
+    }
+
+    override fun showProgress(show: Boolean) {
+        binding.creatorProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
new file mode 100644
index 000000000..78fdb43a1
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorPresenter.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.data.repositories.appcreator.AppCreatorRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import javax.inject.Inject
+
+class ContributorPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val appCreatorRepository: AppCreatorRepository
+) : BasePresenter<ContributorView>(errorHandler, studentRepository) {
+
+    override fun onAttachView(view: ContributorView) {
+        super.onAttachView(view)
+        view.initView()
+        loadData()
+    }
+
+    fun onItemSelected(contributor: Contributor) {
+        view?.openUserGithubPage(contributor.githubUsername)
+    }
+
+    fun onSeeMoreClick() {
+        view?.openGithubContributorsPage()
+    }
+
+    private fun loadData() {
+        flowWithResource { appCreatorRepository.getAppCreators() }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.showProgress(true)
+                Status.SUCCESS -> view?.run {
+                    showProgress(false)
+                    updateData(it.data!!)
+                }
+                Status.ERROR -> errorHandler.dispatch(it.error!!)
+            }
+        }.launch()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
new file mode 100644
index 000000000..8007e4e3f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/contributor/ContributorView.kt
@@ -0,0 +1,17 @@
+package io.github.wulkanowy.ui.modules.about.contributor
+
+import io.github.wulkanowy.data.pojos.Contributor
+import io.github.wulkanowy.ui.base.BaseView
+
+interface ContributorView : BaseView {
+
+    fun initView()
+
+    fun updateData(data: List<Contributor>)
+
+    fun openUserGithubPage(username: String)
+
+    fun openGithubContributorsPage()
+
+    fun showProgress(show: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
new file mode 100644
index 000000000..6ae06bbe7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.about.license
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.databinding.ItemLicenseBinding
+import javax.inject.Inject
+
+class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Library>()
+
+    var onClickListener: (Library) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemLicenseBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            licenseItemName.text = item.libraryName
+            licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemLicenseBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
index 2681680b1..cdd29b41b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
@@ -1,67 +1,64 @@
 package io.github.wulkanowy.ui.modules.about.license
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.text.parseAsHtml
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
-import dagger.Lazy
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLicenseBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_license.*
 import javax.inject.Inject
 
-class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
+@AndroidEntryPoint
+class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_license),
+    LicenseView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: LicensePresenter
 
     @Inject
-    lateinit var licenseAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var licenseAdapter: LicenseAdapter
 
-    @Inject
-    lateinit var libs: Lazy<Libs>
+    private val libs by lazy { Libs(requireContext()) }
 
     override val titleStringId get() = R.string.license_title
 
     override val appLibraries: ArrayList<Library>?
         get() = context?.let {
-            libs.get().prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
+            libs.prepareLibraries(it, emptyArray(), emptyArray(), autoDetect = true, checkCachedDetection = true, sort = true)
         }
 
     companion object {
         fun newInstance() = LicenseFragment()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_license, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLicenseBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(licenseRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        licenseAdapter.onClickListener = presenter::onItemSelected
+
+        with(binding.licenseRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = licenseAdapter
         }
-        licenseAdapter.setOnItemClickListener(presenter::onItemSelected)
     }
 
-    override fun updateData(data: List<LicenseItem>) {
-        licenseAdapter.updateDataSet(data)
+    override fun updateData(data: List<Library>) {
+        with(licenseAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun openLicense(licenseHtml: String) {
@@ -76,7 +73,7 @@ class LicenseFragment : BaseFragment(), LicenseView, MainView.TitledView {
     }
 
     override fun showProgress(show: Boolean) {
-        licenseProgress.visibility = if (show) VISIBLE else GONE
+        binding.licenseProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
deleted file mode 100644
index 98c86e75a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.license
-
-import android.view.View
-import com.mikepenz.aboutlibraries.entity.Library
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_license.*
-
-class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_license
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        with(holder) {
-            licenseItemName.text = library.libraryName
-            licenseItemSummary.text = library.license?.licenseName
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as LicenseItem
-
-        if (library != other.library) return false
-
-        return true
-    }
-
-    override fun hashCode() = library.hashCode()
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
deleted file mode 100644
index 0ffc3d90e..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseModule.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy.ui.modules.about.license
-
-import android.content.Context
-import com.mikepenz.aboutlibraries.Libs
-import dagger.Module
-import dagger.Provides
-import io.github.wulkanowy.di.scopes.PerFragment
-
-@Module
-class LicenseModule {
-
-    @PerFragment
-    @Provides
-    fun provideLibs(context: Context) = Libs(context)
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
index b5b8fcd13..18d257eed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
@@ -1,18 +1,23 @@
 package io.github.wulkanowy.ui.modules.about.license
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import com.mikepenz.aboutlibraries.entity.Library
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Single
+import io.github.wulkanowy.utils.DispatchersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 import javax.inject.Inject
 
 class LicensePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
+    private val dispatchers: DispatchersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LicenseView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<LicenseView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: LicenseView) {
         super.onAttachView(view)
@@ -20,21 +25,23 @@ class LicensePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item !is LicenseItem) return
-        view?.run { item.library.license?.licenseDescription?.let { openLicense(it) } }
+    fun onItemSelected(library: Library) {
+        view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } }
     }
 
     private fun loadData() {
-        disposable.add(Single.fromCallable { view?.appLibraries }
-            .map {
-                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
-                it.filter { library -> !exclude.contains(library.libraryName) }
+        flowWithResource {
+            withContext(dispatchers.backgroundThread) {
+                view?.appLibraries.orEmpty()
             }
-            .map { it.map { library -> LicenseItem(library) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnEvent { _, _ -> view?.showProgress(false) }
-            .subscribe({ view?.run { updateData(it) } }, { errorHandler.dispatch(it) }))
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("License data load started")
+                Status.SUCCESS -> view?.updateData(it.data!!)
+                Status.ERROR -> errorHandler.dispatch(it.error!!)
+            }
+        }.afterLoading {
+            view?.showProgress(false)
+        }.launch()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
index 3939d3e80..0680dbb73 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseView.kt
@@ -9,7 +9,7 @@ interface LicenseView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<LicenseItem>)
+    fun updateData(data: List<Library>)
 
     fun openLicense(licenseHtml: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
new file mode 100644
index 000000000..45c304aae
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerAdapter.kt
@@ -0,0 +1,22 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class LogViewerAdapter : RecyclerView.Adapter<LogViewerAdapter.ViewHolder>() {
+
+    var lines = emptyList<String>()
+
+    class ViewHolder(val textView: TextView) : RecyclerView.ViewHolder(textView)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(TextView(parent.context))
+    }
+
+    override fun getItemCount() = lines.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.textView.text = lines[position]
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
new file mode 100644
index 000000000..cf40975e7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerFragment.kt
@@ -0,0 +1,96 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import android.content.Intent
+import android.content.Intent.EXTRA_EMAIL
+import android.content.Intent.EXTRA_STREAM
+import android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION
+import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.LOLLIPOP
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import androidx.core.content.FileProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.BuildConfig.APPLICATION_ID
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLogviewerBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.main.MainView
+import java.io.File
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class LogViewerFragment : BaseFragment<FragmentLogviewerBinding>(R.layout.fragment_logviewer),
+    LogViewerView, MainView.TitledView {
+
+    @Inject
+    lateinit var presenter: LogViewerPresenter
+
+    private val logAdapter = LogViewerAdapter()
+
+    override val titleStringId: Int
+        get() = R.string.logviewer_title
+
+    companion object {
+        fun newInstance() = LogViewerFragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLogviewerBinding.bind(view)
+        messageContainer = binding.logViewerRecycler
+        presenter.onAttachView(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.action_menu_logviewer, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.logViewerMenuShare) presenter.onShareLogsSelected()
+        else false
+    }
+
+    override fun initView() {
+        with(binding.logViewerRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = logAdapter
+        }
+
+        binding.logViewRefreshButton.setOnClickListener { presenter.onRefreshClick() }
+    }
+
+    override fun setLines(lines: List<String>) {
+        logAdapter.lines = lines
+        logAdapter.notifyDataSetChanged()
+        binding.logViewerRecycler.scrollToPosition(lines.size - 1)
+    }
+
+    override fun shareLogs(files: List<File>) {
+        val intent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+            type = "text/plain"
+            putExtra(EXTRA_EMAIL, arrayOf("wulkanowyinc@gmail.com"))
+            addFlags(FLAG_GRANT_READ_URI_PERMISSION)
+            putParcelableArrayListExtra(EXTRA_STREAM, ArrayList(files.map {
+                if (SDK_INT < LOLLIPOP) Uri.fromFile(it)
+                else FileProvider.getUriForFile(requireContext(), "$APPLICATION_ID.fileprovider", it)
+            }))
+        }
+
+        startActivity(Intent.createChooser(intent, getString(R.string.logviewer_share)))
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
new file mode 100644
index 000000000..85eae8e6e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerPresenter.kt
@@ -0,0 +1,61 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.logger.LoggerRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class LogViewerPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val loggerRepository: LoggerRepository
+) : BasePresenter<LogViewerView>(errorHandler, studentRepository) {
+
+    override fun onAttachView(view: LogViewerView) {
+        super.onAttachView(view)
+        view.initView()
+        loadLogFile()
+    }
+
+    fun onShareLogsSelected(): Boolean {
+        flowWithResource { loggerRepository.getLogFiles() }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Loading logs files started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading logs files result: ${it.data!!.joinToString { file -> file.name }}")
+                    view?.shareLogs(it.data)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading logs files result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("share")
+        return true
+    }
+
+    fun onRefreshClick() {
+        loadLogFile()
+    }
+
+    private fun loadLogFile() {
+        flowWithResource { loggerRepository.getLastLogLines() }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Loading last log file started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading last log file result: load ${it.data!!.size} lines")
+                    view?.setLines(it.data)
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading last log file result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("file")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
new file mode 100644
index 000000000..bd98c24fd
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/about/logviewer/LogViewerView.kt
@@ -0,0 +1,13 @@
+package io.github.wulkanowy.ui.modules.about.logviewer
+
+import io.github.wulkanowy.ui.base.BaseView
+import java.io.File
+
+interface LogViewerView : BaseView {
+
+    fun initView()
+
+    fun setLines(lines: List<String>)
+
+    fun shareLogs(files: List<File>)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
new file mode 100644
index 000000000..dbcb499e8
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/Account.kt
@@ -0,0 +1,3 @@
+package io.github.wulkanowy.ui.modules.account
+
+data class Account(val email: String, val isParent: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
new file mode 100644
index 000000000..7ecb41399
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountAdapter.kt
@@ -0,0 +1,93 @@
+package io.github.wulkanowy.ui.modules.account
+
+import android.annotation.SuppressLint
+import android.graphics.PorterDuff
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.HeaderAccountBinding
+import io.github.wulkanowy.databinding.ItemAccountBinding
+import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class AccountAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<AccountItem<*>>()
+
+    var onClickListener: (StudentWithSemesters) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            AccountItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderAccountBinding.inflate(inflater, parent, false))
+            AccountItem.ViewType.ITEM.id -> ItemViewHolder(ItemAccountBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as Account)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as StudentWithSemesters)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: HeaderAccountBinding, account: Account) {
+        with(binding) {
+            accountHeaderEmail.text = account.email
+            accountHeaderType.setText(if (account.isParent) R.string.account_type_parent else R.string.account_type_student)
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindItemViewHolder(binding: ItemAccountBinding, studentWithSemesters: StudentWithSemesters) {
+        val student = studentWithSemesters.student
+        val semesters = studentWithSemesters.semesters
+        val diary = semesters.maxByOrNull { it.semesterId }
+
+        with(binding) {
+            accountItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
+            accountItemSchool.text = studentWithSemesters.student.schoolName
+            with(accountItemLoginMode) {
+                visibility = when (Sdk.Mode.valueOf(student.loginMode)) {
+                    Sdk.Mode.API -> {
+                        setText(R.string.account_login_mobile_api)
+                        VISIBLE
+                    }
+                    Sdk.Mode.HYBRID -> {
+                        setText(R.string.account_login_hybrid)
+                        VISIBLE
+                    }
+                    Sdk.Mode.SCRAPPER -> {
+                        GONE
+                    }
+                }
+            }
+
+            with(accountItemImage) {
+                val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
+                else context.getThemeAttrColor(R.attr.colorOnSurface, 153)
+
+                setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
+            }
+
+            root.setOnClickListener { onClickListener(studentWithSemesters) }
+        }
+    }
+
+    class HeaderViewHolder(val binding: HeaderAccountBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class ItemViewHolder(val binding: ItemAccountBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
index cfff31c98..1fa87268b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountDialog.kt
@@ -7,23 +7,22 @@ import android.view.ViewGroup
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.DialogAccountBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.dialog_account.*
 import javax.inject.Inject
 
-class AccountDialog : BaseDialogFragment(), AccountView {
+@AndroidEntryPoint
+class AccountDialog : BaseDialogFragment<DialogAccountBinding>(), AccountView {
 
     @Inject
     lateinit var presenter: AccountPresenter
 
     @Inject
-    lateinit var accountAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var accountAdapter: AccountAdapter
 
     companion object {
         fun newInstance() = AccountDialog()
@@ -35,7 +34,7 @@ class AccountDialog : BaseDialogFragment(), AccountView {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_account, container, false)
+        return DialogAccountBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -44,18 +43,23 @@ class AccountDialog : BaseDialogFragment(), AccountView {
     }
 
     override fun initView() {
-        accountAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
+        accountAdapter.onClickListener = presenter::onItemSelected
 
-        accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
-        accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
-        accountDialogRecycler.apply {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = accountAdapter
+        with(binding) {
+            accountDialogAdd.setOnClickListener { presenter.onAddSelected() }
+            accountDialogRemove.setOnClickListener { presenter.onRemoveSelected() }
+            accountDialogRecycler.apply {
+                layoutManager = LinearLayoutManager(context)
+                adapter = accountAdapter
+            }
         }
     }
 
-    override fun updateData(data: List<AccountItem>) {
-        accountAdapter.updateDataSet(data)
+    override fun updateData(data: List<AccountItem<*>>) {
+        with(accountAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun showError(text: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
index d3a3ee6a3..05a4a69ce 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountItem.kt
@@ -1,59 +1,9 @@
 package io.github.wulkanowy.ui.modules.account
 
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
-import android.view.View
-import androidx.core.graphics.ColorUtils
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
+data class AccountItem<out T>(val value: T, val viewType: ViewType) {
 
-class AccountItem(val student: Student) : AbstractFlexibleItem<AccountItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        val context = holder.contentView.context
-
-        val colorImage = if (student.isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
-
-        with(holder) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setColorFilter(colorImage, PorterDuff.Mode.SRC_IN)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AccountItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
index e9b4b81ee..4eaee4291 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountPresenter.kt
@@ -1,21 +1,22 @@
 package io.github.wulkanowy.ui.modules.account
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Single
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class AccountPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val syncManager: SyncManager
-) : BasePresenter<AccountView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<AccountView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: AccountView) {
         super.onAttachView(view)
@@ -35,20 +36,20 @@ class AccountPresenter @Inject constructor(
     }
 
     fun onLogoutConfirm() {
-        Timber.i("Attempt to logout current user ")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMapCompletable { studentRepository.logoutStudent(it) }
-            .andThen(studentRepository.getSavedStudents(false))
-            .flatMap {
-                if (it.isNotEmpty()) studentRepository.switchStudent(it[0]).toSingle { it }
-                else Single.just(it)
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent(false)
+            studentRepository.logoutStudent(student)
+
+            val students = studentRepository.getSavedStudents(false)
+            if (students.isNotEmpty()) {
+                studentRepository.switchStudent(students[0])
             }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally { view?.dismissView() }
-            .subscribe({
-                view?.apply {
-                    if (it.isEmpty()) {
+            students
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Attempt to logout current user ")
+                Status.SUCCESS -> view?.run {
+                    if (it.data!!.isEmpty()) {
                         Timber.i("Logout result: Open login view")
                         syncManager.stopSyncWorker()
                         openClearLoginView()
@@ -57,47 +58,58 @@ class AccountPresenter @Inject constructor(
                         recreateMainView()
                     }
                 }
-            }, {
-                Timber.i("Logout result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
+                Status.ERROR -> {
+                    Timber.i("Logout result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.dismissView()
+        }.launch("logout")
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item is AccountItem) {
-            Timber.i("Select student item ${item.student.id}")
-            if (item.student.isCurrent) {
-                view?.dismissView()
-            } else {
-                Timber.i("Attempt to change a student")
-                disposable.add(studentRepository.switchStudent(item.student)
-                    .subscribeOn(schedulers.backgroundThread)
-                    .observeOn(schedulers.mainThread)
-                    .doFinally { view?.dismissView() }
-                    .subscribe({
-                        Timber.i("Change a student result: Success")
-                        view?.recreateMainView()
-                    }, {
-                        Timber.i("Change a student result: An exception occurred")
-                        errorHandler.dispatch(it)
-                    }))
+    fun onItemSelected(studentWithSemesters: StudentWithSemesters) {
+        Timber.i("Select student item ${studentWithSemesters.student.id}")
+        if (studentWithSemesters.student.isCurrent) {
+            view?.dismissView()
+        } else flowWithResource { studentRepository.switchStudent(studentWithSemesters) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Attempt to change a student")
+                Status.SUCCESS -> {
+                    Timber.i("Change a student result: Success")
+                    view?.recreateMainView()
+                }
+                Status.ERROR -> {
+                    Timber.i("Change a student result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
             }
-        }
+        }.afterLoading {
+            view?.dismissView()
+        }.launch("switch")
+    }
+
+    private fun createAccountItems(items: List<StudentWithSemesters>): List<AccountItem<*>> {
+        return items.groupBy { Account(it.student.email, it.student.isParent) }.map { (account, students) ->
+            listOf(AccountItem(account, AccountItem.ViewType.HEADER)) + students.map { student ->
+                AccountItem(student, AccountItem.ViewType.ITEM)
+            }
+        }.flatten()
     }
 
     private fun loadData() {
-        Timber.i("Loading account data started")
-        disposable.add(studentRepository.getSavedStudents(false)
-            .map { it.map { item -> AccountItem(item) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Loading account result: Success")
-                view?.updateData(it)
-            }, {
-                Timber.i("Loading account result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
+        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading account data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading account result: Success")
+                    view?.updateData(createAccountItems(it.data!!))
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading account result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch()
     }
 }
-
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
index ede5023ba..a1f8086cd 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/account/AccountView.kt
@@ -6,7 +6,7 @@ interface AccountView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<AccountItem>)
+    fun updateData(data: List<AccountItem<*>>)
 
     fun dismissView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
new file mode 100644
index 000000000..8e8a6149d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceAdapter.kt
@@ -0,0 +1,81 @@
+package io.github.wulkanowy.ui.modules.attendance
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.data.repositories.attendance.SentExcuseStatus
+import io.github.wulkanowy.databinding.ItemAttendanceBinding
+import io.github.wulkanowy.utils.description
+import javax.inject.Inject
+
+class AttendanceAdapter @Inject constructor() :
+    RecyclerView.Adapter<AttendanceAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Attendance>()
+
+    var excuseActionMode: Boolean = false
+
+    var onClickListener: (Attendance) -> Unit = {}
+
+    var onExcuseCheckboxSelect: (attendanceItem: Attendance, checked: Boolean) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemAttendanceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            attendanceItemNumber.text = item.number.toString()
+            attendanceItemSubject.text = item.subject
+            attendanceItemDescription.setText(item.description)
+            attendanceItemAlert.visibility = item.run { if (absence && !excused) View.VISIBLE else View.INVISIBLE }
+            attendanceItemNumber.visibility = View.GONE
+            attendanceItemExcuseInfo.visibility = View.GONE
+            attendanceItemExcuseCheckbox.visibility = View.GONE
+            attendanceItemExcuseCheckbox.isChecked = false
+            attendanceItemExcuseCheckbox.setOnCheckedChangeListener { _, checked ->
+                onExcuseCheckboxSelect(item, checked)
+            }
+
+            when (if (item.excuseStatus != null) SentExcuseStatus.valueOf(item.excuseStatus) else null) {
+                SentExcuseStatus.WAITING -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_waiting)
+                    attendanceItemExcuseInfo.visibility = View.VISIBLE
+                    attendanceItemAlert.visibility = View.INVISIBLE
+                }
+                SentExcuseStatus.DENIED -> {
+                    attendanceItemExcuseInfo.setImageResource(R.drawable.ic_excuse_denied)
+                    attendanceItemExcuseInfo.visibility = View.VISIBLE
+                }
+                else -> {
+                    if (item.excusable && excuseActionMode) {
+                        attendanceItemNumber.visibility = View.GONE
+                        attendanceItemExcuseCheckbox.visibility = View.VISIBLE
+                    } else {
+                        attendanceItemNumber.visibility = View.VISIBLE
+                        attendanceItemExcuseCheckbox.visibility = View.GONE
+                    }
+                }
+            }
+            root.setOnClickListener {
+                onClickListener(item)
+
+                with(attendanceItemExcuseCheckbox) {
+                    if (excuseActionMode && isVisible) {
+                        isChecked = !isChecked
+                    }
+                }
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemAttendanceBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
index 611dd999e..d5e2fe122 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceDialog.kt
@@ -5,13 +5,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.databinding.DialogAttendanceBinding
+import io.github.wulkanowy.utils.description
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_attendance.*
 
 class AttendanceDialog : DialogFragment() {
 
+    private var binding: DialogAttendanceBinding by lifecycleAwareVariable()
+
     private lateinit var attendance: Attendance
 
     companion object {
@@ -33,16 +36,18 @@ class AttendanceDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_attendance, container, false)
+        return DialogAttendanceBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        attendanceDialogSubject.text = attendance.subject
-        attendanceDialogDescription.text = attendance.name
-        attendanceDialogDate.text = attendance.date.toFormattedString()
-        attendanceDialogNumber.text = attendance.number.toString()
-        attendanceDialogClose.setOnClickListener { dismiss() }
+        with(binding) {
+            attendanceDialogSubject.text = attendance.subject
+            attendanceDialogDescription.setText(attendance.description)
+            attendanceDialogDate.text = attendance.date.toFormattedString()
+            attendanceDialogNumber.text = attendance.number.toString()
+            attendanceDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
index bc7c1cacd..c7caef069 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceFragment.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance
 
+import android.content.DialogInterface.BUTTON_POSITIVE
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -9,33 +10,40 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.view.ActionMode
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Attendance
+import io.github.wulkanowy.databinding.DialogExcuseBinding
+import io.github.wulkanowy.databinding.FragmentAttendanceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_attendance.*
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import javax.inject.Inject
 
-class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildView,
+@AndroidEntryPoint
+class AttendanceFragment : BaseFragment<FragmentAttendanceBinding>(R.layout.fragment_attendance), AttendanceView, MainView.MainChildView,
     MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendancePresenter
 
     @Inject
-    lateinit var attendanceAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var attendanceAdapter: AttendanceAdapter
+
+    override val excuseSuccessString: String
+        get() = getString(R.string.attendance_excuse_success)
+
+    override val excuseNoSelectionString: String
+        get() = getString(R.string.attendance_excuse_no_selection)
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -45,45 +53,75 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
 
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceAdapter.isEmpty
+    override val isViewEmpty get() = attendanceAdapter.items.isEmpty()
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
+    override val excuseActionMode: Boolean get() = attendanceAdapter.excuseActionMode
+
+    private var actionMode: ActionMode? = null
+    private val actionModeCallback = object : ActionMode.Callback {
+        override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
+            val inflater = mode.menuInflater
+            inflater.inflate(R.menu.context_menu_excuse, menu)
+            return true
+        }
+
+        override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
+            mode.title = getString(R.string.attendance_excuse_title)
+            return presenter.onPrepareActionMode()
+        }
+
+        override fun onDestroyActionMode(mode: ActionMode) {
+            presenter.onDestroyActionMode()
+            actionMode = null
+        }
+
+        override fun onActionItemClicked(mode: ActionMode, menu: MenuItem): Boolean {
+            return when (menu.itemId) {
+                R.id.excuseMenuSubmit -> presenter.onExcuseSubmitButtonClick()
+                else -> false
+            }
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_attendance, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = attendanceRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAttendanceBinding.bind(view)
+        messageContainer = binding.attendanceRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        attendanceAdapter.setOnItemClickListener(presenter::onAttendanceItemSelected)
-
-        with(attendanceRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = attendanceAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false))
+        with(attendanceAdapter) {
+            onClickListener = presenter::onAttendanceItemSelected
+            onExcuseCheckboxSelect = presenter::onExcuseCheckboxSelect
         }
 
-        attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
-        attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding.attendanceRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = attendanceAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
 
-        attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        attendanceNavDate.setOnClickListener { presenter.onPickDate() }
-        attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+        with(binding) {
+            attendanceSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            attendanceErrorRetry.setOnClickListener { presenter.onRetry() }
+            attendanceErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+            attendancePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            attendanceNavDate.setOnClickListener { presenter.onPickDate() }
+            attendanceNextButton.setOnClickListener { presenter.onNextDay() }
+
+            attendanceExcuseButton.setOnClickListener { presenter.onExcuseButtonClick() }
+
+            attendanceNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -95,64 +133,78 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         else false
     }
 
-    override fun updateData(data: List<AttendanceItem>) {
-        attendanceAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Attendance>) {
+        with(attendanceAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        attendanceNavDate.text = date
+        binding.attendanceNavDate.text = date
     }
 
     override fun clearData() {
-        attendanceAdapter.clear()
+        with(attendanceAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        attendanceRecycler.smoothScrollToPosition(0)
+        binding.attendanceRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
+    override fun onFragmentChanged() {
+        if (::presenter.isInitialized) presenter.onMainViewChanged()
+    }
+
     override fun popView() {
         (activity as? MainActivity)?.popView()
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceEmpty.visibility = if (show) VISIBLE else GONE
+        binding.attendanceEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        attendanceError.visibility = if (show) VISIBLE else GONE
+        binding.attendanceError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        attendanceErrorMessage.text = message
+        binding.attendanceErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceProgress.visibility = if (show) VISIBLE else GONE
+        binding.attendanceProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        attendanceSwipe.isEnabled = enable
+        binding.attendanceSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        attendanceRecycler.visibility = if (show) VISIBLE else GONE
+        binding. attendanceRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        attendanceSwipe.isRefreshing = false
+        binding.attendanceSwipe.isRefreshing = false
     }
 
     override fun showPreButton(show: Boolean) {
-        attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.attendancePreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding. attendanceNextButton.visibility = if (show) VISIBLE else INVISIBLE
+    }
+
+    override fun showExcuseButton(show: Boolean) {
+        binding.attendanceExcuseButton.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showAttendanceDialog(lesson: Attendance) {
@@ -174,10 +226,39 @@ class AttendanceFragment : BaseFragment(), AttendanceView, MainView.MainChildVie
         }
     }
 
+    override fun showExcuseDialog() {
+        val dialogBinding = DialogExcuseBinding.inflate(LayoutInflater.from(context))
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.attendance_excuse_title)
+            .setView(dialogBinding.root)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .create()
+            .apply {
+                setButton(BUTTON_POSITIVE, getString(R.string.attendance_excuse_dialog_submit)) { _, _ ->
+                    presenter.onExcuseDialogSubmit(dialogBinding.excuseReason.text?.toString().orEmpty())
+                }
+            }.show()
+    }
+
     override fun openSummaryView() {
         (activity as? MainActivity)?.pushView(AttendanceSummaryFragment.newInstance())
     }
 
+    override fun startActionMode() {
+        actionMode = (activity as MainActivity?)?.startSupportActionMode(actionModeCallback)
+    }
+
+    override fun showExcuseCheckboxes(show: Boolean) {
+        attendanceAdapter.apply {
+            excuseActionMode = show
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun finishActionMode() {
+        actionMode?.finish()
+    }
+
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putLong(SAVED_DATE_KEY, presenter.currentDate.toEpochDay())
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
deleted file mode 100644
index 16a140cbf..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance
-
-import android.view.View
-import android.view.View.INVISIBLE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Attendance
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_attendance.*
-
-class AttendanceItem(val attendance: Attendance) : AbstractFlexibleItem<AttendanceItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_attendance
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            attendanceItemNumber.text = attendance.number.toString()
-            attendanceItemSubject.text = attendance.subject
-            attendanceItemDescription.text = attendance.name
-            attendanceItemAlert.visibility = attendance.run { if (absence && !excused) VISIBLE else INVISIBLE }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceItem
-
-        if (attendance != other.attendance) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = attendance.hashCode()
-        result = 31 * result + attendance.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
index 1490ee6e3..158f08ba3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendancePresenter.kt
@@ -1,7 +1,8 @@
 package io.github.wulkanowy.ui.modules.attendance
 
 import android.annotation.SuppressLint
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.repositories.attendance.AttendanceRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -9,29 +10,32 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousOrSameSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.ofEpochDay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class AttendancePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceRepository: AttendanceRepository,
     private val semesterRepository: SemesterRepository,
     private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<AttendanceView>(errorHandler, studentRepository) {
 
     private var baseDate: LocalDate = now().previousOrSameSchoolDay
 
@@ -40,6 +44,8 @@ class AttendancePresenter @Inject constructor(
 
     private lateinit var lastError: Throwable
 
+    private val attendanceToExcuseList = mutableListOf<Attendance>()
+
     fun onAttachView(view: AttendanceView, date: Long?) {
         super.onAttachView(view)
         view.initView()
@@ -51,11 +57,15 @@ class AttendancePresenter @Inject constructor(
     }
 
     fun onPreviousDay() {
+        view?.finishActionMode()
+        attendanceToExcuseList.clear()
         loadData(currentDate.previousSchoolDay)
         reloadView()
     }
 
     fun onNextDay() {
+        view?.finishActionMode()
+        attendanceToExcuseList.clear()
         loadData(currentDate.nextSchoolDay)
         reloadView()
     }
@@ -100,10 +110,59 @@ class AttendancePresenter @Inject constructor(
         }
     }
 
-    fun onAttendanceItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is AttendanceItem) {
-            Timber.i("Select attendance item ${item.attendance.id}")
-            view?.showAttendanceDialog(item.attendance)
+    fun onMainViewChanged() {
+        view?.finishActionMode()
+    }
+
+    fun onAttendanceItemSelected(attendance: Attendance) {
+        view?.apply {
+            if (!excuseActionMode) {
+                Timber.i("Select attendance item ${attendance.id}")
+                showAttendanceDialog(attendance)
+            }
+        }
+    }
+
+    fun onExcuseButtonClick() {
+        view?.startActionMode()
+    }
+
+    fun onExcuseCheckboxSelect(attendanceItem: Attendance, checked: Boolean) {
+        if (checked) attendanceToExcuseList.add(attendanceItem)
+        else attendanceToExcuseList.remove(attendanceItem)
+    }
+
+    fun onExcuseSubmitButtonClick(): Boolean {
+        view?.apply {
+            return if (attendanceToExcuseList.isNotEmpty()) {
+                showExcuseDialog()
+                true
+            } else {
+                showMessage(excuseNoSelectionString)
+                false
+            }
+        }
+        return false
+    }
+
+    fun onExcuseDialogSubmit(reason: String) {
+        view?.finishActionMode()
+        excuseAbsence(if (reason != "") reason else null, attendanceToExcuseList.toList())
+    }
+
+    fun onPrepareActionMode(): Boolean {
+        view?.apply {
+            showExcuseCheckboxes(true)
+            showExcuseButton(false)
+        }
+        attendanceToExcuseList.clear()
+        return true
+    }
+
+    fun onDestroyActionMode() {
+        view?.apply {
+            showExcuseCheckboxes(false)
+            showExcuseButton(true)
         }
     }
 
@@ -113,58 +172,93 @@ class AttendancePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-                currentDate = baseDate
-                reloadNavigation()
-            }) {
-                Timber.i("Loading semester result: An exception occurred")
-            })
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            currentDate = baseDate
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
         Timber.i("Loading attendance data started")
         currentDate = date
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { attendanceRepository.getAttendance(it, date, date, forceRefresh) }
-                .map { list ->
-                    if (prefRepository.isShowPresent) list
-                    else list.filter { !it.presence }
-                }
-                .map { items -> items.map { AttendanceItem(it) } }
-                .map { items -> items.sortedBy { it.attendance.number } }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            attendanceRepository.getAttendance(student, semester, date, date, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.showExcuseButton(false)
+                Status.SUCCESS -> {
                     Timber.i("Loading attendance result: Success")
                     view?.apply {
-                        updateData(it)
-                        showEmpty(it.isEmpty())
+                        updateData(it.data!!.let { items ->
+                            if (prefRepository.isShowPresent) items
+                            else items.filter { item -> !item.presence }
+                        }.sortedBy { item -> item.number })
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(it.isNotEmpty())
+                        showContent(it.data.isNotEmpty())
+                        showExcuseButton(it.data.any { item -> item.excusable })
                     }
-                    analytics.logEvent("load_attendance", "items" to it.size, "force_refresh" to forceRefresh)
-                }) {
-                    Timber.i("Loading attendance result: An exception occurred")
-                    errorHandler.dispatch(it)
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "attendance",
+                        "items" to it.data!!.size
+                    )
                 }
-            )
-        }
+                Status.ERROR -> {
+                    Timber.i("Loading attendance result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
+    }
+
+    private fun excuseAbsence(reason: String?, toExcuseList: List<Attendance>) {
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            attendanceRepository.excuseForAbsence(student, semester, toExcuseList, reason)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Excusing absence started")
+                    showProgress(true)
+                    showContent(false)
+                    showExcuseButton(false)
+                }
+                Status.SUCCESS -> {
+                    Timber.i("Excusing for absence result: Success")
+                    analytics.logEvent("excuse_absence", "items" to attendanceToExcuseList.size)
+                    attendanceToExcuseList.clear()
+                    view?.run {
+                        showExcuseButton(false)
+                        showMessage(excuseSuccessString)
+                        showContent(true)
+                        showProgress(false)
+                    }
+                    loadData(currentDate, forceRefresh = true)
+                }
+                Status.ERROR -> {
+                    Timber.i("Excusing for absence result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    loadData(currentDate)
+                }
+            }
+        }.launch("excuse")
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
index a6d0d4ba9..d54fb8bf1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/AttendanceView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.attendance
 
 import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 interface AttendanceView : BaseView {
 
@@ -10,9 +10,15 @@ interface AttendanceView : BaseView {
 
     val currentStackSize: Int?
 
+    val excuseSuccessString: String
+
+    val excuseNoSelectionString: String
+
+    val excuseActionMode: Boolean
+
     fun initView()
 
-    fun updateData(data: List<AttendanceItem>)
+    fun updateData(data: List<Attendance>)
 
     fun updateNavigationDay(date: String)
 
@@ -38,11 +44,21 @@ interface AttendanceView : BaseView {
 
     fun showNextButton(show: Boolean)
 
+    fun showExcuseButton(show: Boolean)
+
     fun showAttendanceDialog(lesson: Attendance)
 
     fun showDatePickerDialog(currentDate: LocalDate)
 
+    fun showExcuseDialog()
+
     fun openSummaryView()
 
+    fun startActionMode()
+
+    fun showExcuseCheckboxes(show: Boolean)
+
+    fun finishActionMode()
+
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
new file mode 100644
index 000000000..4250a9109
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryAdapter.kt
@@ -0,0 +1,101 @@
+package io.github.wulkanowy.ui.modules.attendance.summary
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.databinding.ItemAttendanceSummaryBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderAttendanceSummaryBinding
+import io.github.wulkanowy.utils.calculatePercentage
+import io.github.wulkanowy.utils.getFormattedName
+import java.time.Month
+import java.util.Locale
+import javax.inject.Inject
+
+class AttendanceSummaryAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
+    }
+
+    var items = emptyList<AttendanceSummary>()
+
+    override fun getItemCount() = if (items.isNotEmpty()) items.size + 2 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.HEADER.id
+        else -> ViewType.ITEM.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderAttendanceSummaryBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemAttendanceSummaryBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, position - 2)
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderAttendanceSummaryBinding) {
+        binding.attendanceSummaryScrollableHeaderPercentage.text = formatPercentage(items.calculatePercentage())
+    }
+
+    private fun bindItemViewHolder(binding: ItemAttendanceSummaryBinding, position: Int) {
+        val item = if (position == -1) getTotalItem() else items[position]
+
+        with(binding) {
+            attendanceSummaryMonth.text = when (position) {
+                -1 -> root.context.getString(R.string.attendance_summary_total)
+                else -> item.month.getFormattedName()
+            }
+            attendanceSummaryPercentage.text = when (position) {
+                -1 -> formatPercentage(items.calculatePercentage())
+                else -> formatPercentage(item.calculatePercentage())
+            }
+
+            attendanceSummaryPresent.text = item.presence.toString()
+            attendanceSummaryAbsenceUnexcused.text = item.absence.toString()
+            attendanceSummaryAbsenceExcused.text = item.absenceExcused.toString()
+            attendanceSummaryAbsenceSchool.text = item.absenceForSchoolReasons.toString()
+            attendanceSummaryExemption.text = item.exemption.toString()
+            attendanceSummaryLatenessUnexcused.text = item.lateness.toString()
+            attendanceSummaryLatenessExcused.text = item.latenessExcused.toString()
+        }
+    }
+
+    private fun getTotalItem() = AttendanceSummary(
+        month = Month.APRIL,
+        presence = items.sumBy { it.presence },
+        absence = items.sumBy { it.absence },
+        absenceExcused = items.sumBy { it.absenceExcused },
+        absenceForSchoolReasons = items.sumBy { it.absenceForSchoolReasons },
+        exemption = items.sumBy { it.exemption },
+        lateness = items.sumBy { it.lateness },
+        latenessExcused = items.sumBy { it.latenessExcused },
+        diaryId = -1,
+        studentId = -1,
+        subjectId = -1
+    )
+
+    private fun formatPercentage(percentage: Double): String {
+        return if (percentage == 0.0) "0%"
+        else "${String.format(Locale.FRANCE, "%.2f", percentage)}%"
+    }
+
+    class HeaderViewHolder(val binding: ScrollableHeaderAttendanceSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class ItemViewHolder(val binding: ItemAttendanceSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
index fc3601847..2f8622374 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryFragment.kt
@@ -1,32 +1,33 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.databinding.FragmentAttendanceSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnItemSelectedListener
-import kotlinx.android.synthetic.main.fragment_attendance_summary.*
 import javax.inject.Inject
 
-class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainView.TitledView {
+@AndroidEntryPoint
+class AttendanceSummaryFragment :
+    BaseFragment<FragmentAttendanceSummaryBinding>(R.layout.fragment_attendance_summary),
+    AttendanceSummaryView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: AttendanceSummaryPresenter
 
     @Inject
-    lateinit var attendanceSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var attendanceSummaryAdapter: AttendanceSummaryAdapter
 
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
@@ -38,37 +39,36 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
 
     override val titleStringId get() = R.string.attendance_title
 
-    override val isViewEmpty get() = attendanceSummaryAdapter.isEmpty
+    override val isViewEmpty get() = attendanceSummaryAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_attendance_summary, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = attendanceSummaryRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentAttendanceSummaryBinding.bind(view)
+        messageContainer = binding.attendanceSummaryRecycler
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SUBJECT_KEY))
     }
 
     override fun initView() {
-        with(attendanceSummaryRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.attendanceSummaryRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = attendanceSummaryAdapter
         }
 
-        attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-        attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            attendanceSummarySwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            attendanceSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+            attendanceSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(attendanceSummarySubjects) {
+        with(binding.attendanceSummarySubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        binding.attendanceSummarySubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -79,48 +79,50 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
         }
     }
 
-    override fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader) {
+    override fun updateDataSet(data: List<AttendanceSummary>) {
         with(attendanceSummaryAdapter) {
-            updateDataSet(data, true)
-            removeAllScrollableHeaders()
-            addScrollableHeader(header)
+            items = data
+            notifyDataSetChanged()
         }
     }
 
     override fun clearView() {
-        attendanceSummaryAdapter.clear()
+        with(attendanceSummaryAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        attendanceSummaryError.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        attendanceSummaryErrorMessage.text = message
+        binding.attendanceSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        attendanceSummarySwipe.isEnabled = enable
+        binding.attendanceSummarySwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
+        binding.attendanceSummaryRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showSubjects(show: Boolean) {
-        attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
+        binding.attendanceSummarySubjectsContainer.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun hideRefresh() {
-        attendanceSummarySwipe.isRefreshing = false
+        binding.attendanceSummarySwipe.isRefreshing = false
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -129,7 +131,7 @@ class AttendanceSummaryFragment : BaseFragment(), AttendanceSummaryView, MainVie
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
deleted file mode 100644
index 265d6ce44..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryItem.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_attendance_summary.*
-
-class AttendanceSummaryItem(
-    private val month: String,
-    private val percentage: String,
-    private val present: String,
-    private val absence: String,
-    private val excusedAbsence: String,
-    private val schoolAbsence: String,
-    private val exemption: String,
-    private val lateness: String,
-    private val excusedLateness: String
-) : AbstractFlexibleItem<AttendanceSummaryItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_attendance_summary
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            attendanceSummaryMonth.text = month
-            attendanceSummaryPercentage.text = percentage
-            attendanceSummaryPresent.text = present
-            attendanceSummaryAbsenceUnexcused.text = absence
-            attendanceSummaryAbsenceExcused.text = excusedAbsence
-            attendanceSummaryAbsenceSchool.text = schoolAbsence
-            attendanceSummaryExemption.text = exemption
-            attendanceSummaryLatenessUnexcused.text = lateness
-            attendanceSummaryLatenessExcused.text = excusedLateness
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceSummaryItem
-
-        if (month != other.month) return false
-        if (percentage != other.percentage) return false
-        if (present != other.present) return false
-        if (absence != other.absence) return false
-        if (excusedAbsence != other.excusedAbsence) return false
-        if (schoolAbsence != other.schoolAbsence) return false
-        if (exemption != other.exemption) return false
-        if (lateness != other.lateness) return false
-        if (excusedLateness != other.excusedLateness) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = month.hashCode()
-        result = 31 * result + percentage.hashCode()
-        result = 31 * result + present.hashCode()
-        result = 31 * result + absence.hashCode()
-        result = 31 * result + excusedAbsence.hashCode()
-        result = 31 * result + schoolAbsence.hashCode()
-        result = 31 * result + exemption.hashCode()
-        result = 31 * result + lateness.hashCode()
-        result = 31 * result + excusedLateness.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
index 3ce85d815..e5dce9ac8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
-import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.attendancesummary.AttendanceSummaryRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -9,24 +9,21 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calculatePercentage
-import io.github.wulkanowy.utils.getFormattedName
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.lang.String.format
-import java.util.Locale.FRANCE
-import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.time.Month
 import javax.inject.Inject
 
 class AttendanceSummaryPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val attendanceSummaryRepository: AttendanceSummaryRepository,
     private val subjectRepository: SubjectRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<AttendanceSummaryView>(errorHandler, studentRepository) {
 
     private var subjects = emptyList<Subject>()
 
@@ -77,38 +74,43 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadData(subjectId: Int, forceRefresh: Boolean = false) {
-        Timber.i("Loading attendance summary data started")
         currentSubjectId = subjectId
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { attendanceSummaryRepository.getAttendanceSummary(it, subjectId, forceRefresh) }
-                .map { createAttendanceSummaryItems(it) to AttendanceSummaryScrollableHeader(formatPercentage(it.calculatePercentage())) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            attendanceSummaryRepository.getAttendanceSummary(student, semester, subjectId, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading attendance summary data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading attendance summary result: Success")
                     view?.apply {
-                        showEmpty(it.first.isEmpty())
-                        showContent(it.first.isNotEmpty())
-                        updateDataSet(it.first, it.second)
+                        showEmpty(it.data!!.isEmpty())
+                        showContent(it.data.isNotEmpty())
+                        updateDataSet(it.data.sortedByDescending { item ->
+                            if (item.month.value <= Month.JUNE.value) item.month.value + 12 else item.month.value
+                        })
                     }
-                    analytics.logEvent("load_attendance_summary", "items" to it.first.size, "force_refresh" to forceRefresh, "item_id" to subjectId)
-                }) {
-                    Timber.i("Loading attendance summary result: An exception occurred")
-                    errorHandler.dispatch(it)
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "attendance_summary",
+                        "items" to it.data!!.size,
+                        "item_id" to subjectId
+                    )
                 }
-            )
-        }
+                Status.ERROR -> {
+                    Timber.i("Loading attendance summary result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -123,45 +125,27 @@ class AttendanceSummaryPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        Timber.i("Loading attendance summary subjects started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { subjectRepository.getSubjects(it) }
-            .doOnSuccess { subjects = it }
-            .map { ArrayList(it.map { subject -> subject.name }) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Loading attendance summary subjects result: Success")
-                view?.run {
-                    view?.updateSubjects(it)
-                    showSubjects(true)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            subjectRepository.getSubjects(student, semester)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading attendance summary subjects started")
+                Status.SUCCESS -> {
+                    subjects = it.data!!
+
+                    Timber.i("Loading attendance summary subjects result: Success")
+                    view?.run {
+                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
+                        showSubjects(true)
+                    }
                 }
-            }, {
-                Timber.i("Loading attendance summary subjects result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-        )
-    }
-
-    private fun createAttendanceSummaryItems(attendanceSummary: List<AttendanceSummary>): List<AttendanceSummaryItem> {
-        return attendanceSummary.sortedByDescending { it.id }.map {
-            AttendanceSummaryItem(
-                month = it.month.getFormattedName(),
-                percentage = formatPercentage(it.calculatePercentage()),
-                present = it.presence.toString(),
-                absence = it.absence.toString(),
-                excusedAbsence = it.absenceExcused.toString(),
-                schoolAbsence = it.absenceForSchoolReasons.toString(),
-                exemption = it.exemption.toString(),
-                lateness = it.lateness.toString(),
-                excusedLateness = it.latenessExcused.toString()
-            )
-        }
-    }
-
-    private fun formatPercentage(percentage: Double): String {
-        return if (percentage == 0.0) "0%"
-        else "${format(FRANCE, "%.2f", percentage)}%"
+                Status.ERROR -> {
+                    Timber.i("Loading attendance summary subjects result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("subjects")
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
deleted file mode 100644
index c258f71d2..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryScrollableHeader.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.wulkanowy.ui.modules.attendance.summary
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.scrollable_header_attendance_summary.*
-
-class AttendanceSummaryScrollableHeader(private val percentage: String) :
-    AbstractFlexibleItem<AttendanceSummaryScrollableHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.scrollable_header_attendance_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?, position: Int, payloads: MutableList<Any>?) {
-        holder?.apply { attendanceSummaryScrollableHeaderPercentage.text = percentage }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as AttendanceSummaryScrollableHeader
-
-        if (percentage != other.percentage) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return percentage.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
index b86f6590d..dd4053c72 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/attendance/summary/AttendanceSummaryView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.attendance.summary
 
+import io.github.wulkanowy.data.db.entities.AttendanceSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface AttendanceSummaryView : BaseView {
@@ -22,7 +23,7 @@ interface AttendanceSummaryView : BaseView {
 
     fun setErrorDetails(message: String)
 
-    fun updateDataSet(data: List<AttendanceSummaryItem>, header: AttendanceSummaryScrollableHeader)
+    fun updateDataSet(data: List<AttendanceSummary>)
 
     fun updateSubjects(data: ArrayList<String>)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
new file mode 100644
index 000000000..535587399
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamAdapter.kt
@@ -0,0 +1,65 @@
+package io.github.wulkanowy.ui.modules.exam
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.HeaderExamBinding
+import io.github.wulkanowy.databinding.ItemExamBinding
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import java.time.LocalDate
+import javax.inject.Inject
+
+class ExamAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<ExamItem<*>>()
+
+    var onClickListener: (Exam) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ExamItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderExamBinding.inflate(inflater, parent, false))
+            ExamItem.ViewType.ITEM.id -> ItemViewHolder(ItemExamBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Exam)
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun bindHeaderViewHolder(binding: HeaderExamBinding, date: LocalDate) {
+        with(binding) {
+            examHeaderDay.text = date.weekDayName.capitalize()
+            examHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemExamBinding, exam: Exam) {
+        with(binding) {
+            examItemSubject.text = exam.subject
+            examItemTeacher.text = exam.teacher
+            examItemType.text = exam.type
+
+            root.setOnClickListener { onClickListener(exam) }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: HeaderExamBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemExamBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
index ed5092c96..c1a6f1f0d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
@@ -5,13 +5,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.DialogExamBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_exam.*
 
 class ExamDialog : DialogFragment() {
 
+    private var binding: DialogExamBinding by lifecycleAwareVariable()
+
     private lateinit var exam: Exam
 
     companion object {
@@ -33,18 +35,20 @@ class ExamDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_exam, container, false)
+        return DialogExamBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        examDialogSubjectValue.text = exam.subject
-        examDialogTypeValue.text = exam.type
-        examDialogTeacherValue.text = exam.teacher
-        examDialogDateValue.text = exam.entryDate.toFormattedString()
-        examDialogDescriptionValue.text = exam.description
+        with(binding) {
+            examDialogSubjectValue.text = exam.subject
+            examDialogTypeValue.text = exam.type
+            examDialogTeacherValue.text = exam.teacher
+            examDialogDateValue.text = exam.entryDate.toFormattedString()
+            examDialogDescriptionValue.text = exam.description
 
-        examDialogClose.setOnClickListener { dismiss() }
+            examDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
index b880f4650..000da00f8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamFragment.kt
@@ -1,33 +1,31 @@
 package io.github.wulkanowy.ui.modules.exam
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Exam
+import io.github.wulkanowy.databinding.FragmentExamBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_exam.*
 import javax.inject.Inject
 
-class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.TitledView {
+@AndroidEntryPoint
+class ExamFragment : BaseFragment<FragmentExamBinding>(R.layout.fragment_exam), ExamView,
+    MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: ExamPresenter
 
     @Inject
-    lateinit var examAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var examAdapter: ExamAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -37,57 +35,60 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
 
     override val titleStringId get() = R.string.exam_title
 
-    override val isViewEmpty get() = examAdapter.isEmpty
+    override val isViewEmpty get() = examAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_exam, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = examRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentExamBinding.bind(view)
+        messageContainer = binding.examRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        examAdapter.setOnItemClickListener(presenter::onExamItemSelected)
+        examAdapter.onClickListener = presenter::onExamItemSelected
 
-        with(examRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.examRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = examAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider(R.layout.item_exam)
-                .withDrawDividerOnLastItem(false))
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        examErrorRetry.setOnClickListener { presenter.onRetry() }
-        examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            examSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            examErrorRetry.setOnClickListener { presenter.onRetry() }
+            examErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
-        examNextButton.setOnClickListener { presenter.onNextWeek() }
+            examPreviousButton.setOnClickListener { presenter.onPreviousWeek() }
+            examNextButton.setOnClickListener { presenter.onNextWeek() }
 
-        examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+            examNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+        }
     }
 
     override fun hideRefresh() {
-        examSwipe.isRefreshing = false
+        binding.examSwipe.isRefreshing = false
     }
 
-    override fun updateData(data: List<ExamItem>) {
-        examAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<ExamItem<*>>) {
+        with(examAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationWeek(date: String) {
-        examNavDate.text = date
+        binding.examNavDate.text = date
     }
 
     override fun clearData() {
-        examAdapter.clear()
+        with(examAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        examRecycler.scrollToPosition(0)
+        binding.examRecycler.scrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -95,35 +96,35 @@ class ExamFragment : BaseFragment(), ExamView, MainView.MainChildView, MainView.
     }
 
     override fun showEmpty(show: Boolean) {
-        examEmpty.visibility = if (show) VISIBLE else GONE
+        binding.examEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        examError.visibility = if (show) VISIBLE else GONE
+        binding.examError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        examErrorMessage.text = message
+        binding.examErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        examProgress.visibility = if (show) VISIBLE else GONE
+        binding.examProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        examSwipe.isEnabled = enable
+        binding.examSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        examRecycler.visibility = if (show) VISIBLE else GONE
+        binding.examRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.examPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        examNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.examNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showExamDialog(exam: Exam) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
deleted file mode 100644
index 0a5b862c3..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamHeader.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.github.wulkanowy.ui.modules.exam
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_exam.*
-import org.threeten.bp.LocalDate
-
-class ExamHeader(private val date: LocalDate) : AbstractHeaderItem<ExamHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_exam
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            examHeaderDay.text = date.weekDayName.capitalize()
-            examHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as ExamHeader
-
-        if (date != other.date) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return date.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
-            LayoutContainer {
-
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
index 8971b4df3..579e37203 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamItem.kt
@@ -1,50 +1,9 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Exam
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_exam.*
+data class ExamItem<out T>(val value: T, val viewType: ViewType) {
 
-class ExamItem(header: ExamHeader, val exam: Exam) : AbstractSectionableItem<ExamItem.ViewHolder, ExamHeader>(header) {
-
-    override fun getLayoutRes() = R.layout.item_exam
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            examItemSubject.text = exam.subject
-            examItemTeacher.text = exam.teacher
-            examItemType.text = exam.type
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as ExamItem
-
-        if (exam != other.exam) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = exam.hashCode()
-        result = 31 * result + exam.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
index 35cf5b945..f63316a8d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.exam
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Exam
 import io.github.wulkanowy.data.repositories.exam.ExamRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,28 +8,30 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.ofEpochDay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class ExamPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val examRepository: ExamRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<ExamView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<ExamView>(errorHandler, studentRepository) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -75,11 +77,9 @@ class ExamPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onExamItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is ExamItem) {
-            Timber.i("Select exam item ${item.exam.id}")
-            view?.showExamDialog(item.exam)
-        }
+    fun onExamItemSelected(exam: Exam) {
+        Timber.i("Select exam item ${exam.id}")
+        view?.showExamDialog(exam)
     }
 
     fun onViewReselected() {
@@ -93,53 +93,54 @@ class ExamPresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-                currentDate = baseDate
-                reloadNavigation()
-            }) {
-                Timber.i("Loading semester result: An exception occurred")
-            })
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            currentDate = baseDate
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
-        Timber.i("Loading exam data started")
         currentDate = date
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .delay(200, MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { examRepository.getExams(it, currentDate.monday, currentDate.friday, forceRefresh) }
-                .map { it.groupBy { exam -> exam.date }.toSortedMap() }
-                .map { createExamItems(it) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            examRepository.getExams(student, semester, currentDate.monday, currentDate.sunday, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading exam data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading exam result: Success")
                     view?.apply {
-                        updateData(it)
-                        showEmpty(it.isEmpty())
+                        updateData(createExamItems(it.data!!))
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(it.isNotEmpty())
+                        showContent(it.data.isNotEmpty())
                     }
-                    analytics.logEvent("load_exam", "items" to it.size, "force_refresh" to forceRefresh)
-                }) {
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "exam",
+                        "items" to it.data!!.size
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Loading exam result: An exception occurred")
-                    errorHandler.dispatch(it)
-                })
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -153,12 +154,12 @@ class ExamPresenter @Inject constructor(
         }
     }
 
-    private fun createExamItems(items: Map<LocalDate, List<Exam>>): List<ExamItem> {
-        return items.flatMap {
-            ExamHeader(it.key).let { header ->
-                it.value.reversed().map { item -> ExamItem(header, item) }
+    private fun createExamItems(items: List<Exam>): List<ExamItem<*>> {
+        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
+            listOf(ExamItem(date, ExamItem.ViewType.HEADER)) + exams.reversed().map { exam ->
+                ExamItem(exam, ExamItem.ViewType.ITEM)
             }
-        }
+        }.flatten()
     }
 
     private fun reloadView() {
@@ -179,7 +180,7 @@ class ExamPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.friday.toFormattedString("dd.MM"))
+                currentDate.sunday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
index 5f4a74306..00429bae6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamView.kt
@@ -9,7 +9,7 @@ interface ExamView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<ExamItem>)
+    fun updateData(data: List<ExamItem<*>>)
 
     fun updateNavigationWeek(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
new file mode 100644
index 000000000..1960c3df7
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageMode.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy.ui.modules.grade
+
+enum class GradeAverageMode(val value: String) {
+    ALL_YEAR("all_year"),
+    ONE_SEMESTER("only_one_semester"),
+    BOTH_SEMESTERS("both_semesters");
+
+    companion object {
+        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ONE_SEMESTER
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
index 88635c37b..5d0a310f2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProvider.kt
@@ -1,73 +1,136 @@
 package io.github.wulkanowy.ui.modules.grade
 
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ALL_YEAR
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.BOTH_SEMESTERS
+import io.github.wulkanowy.ui.modules.grade.GradeAverageMode.ONE_SEMESTER
 import io.github.wulkanowy.utils.calcAverage
 import io.github.wulkanowy.utils.changeModifier
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.flatMapConcat
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
+@OptIn(FlowPreview::class)
 class GradeAverageProvider @Inject constructor(
-    private val preferencesRepository: PreferencesRepository,
+    private val semesterRepository: SemesterRepository,
     private val gradeRepository: GradeRepository,
-    private val gradeSummaryRepository: GradeSummaryRepository
+    private val preferencesRepository: PreferencesRepository
 ) {
 
-    fun getGradeAverage(student: Student, semesters: List<Semester>, selectedSemesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
-        return when (preferencesRepository.gradeAverageMode) {
-            "all_year" -> getAllYearAverage(student, semesters, selectedSemesterId, forceRefresh)
-            "only_one_semester" -> getOnlyOneSemesterAverage(student, semesters, selectedSemesterId, forceRefresh)
-            else -> throw IllegalArgumentException("Incorrect grade average mode: ${preferencesRepository.gradeAverageMode} ")
+    private val plusModifier get() = preferencesRepository.gradePlusModifier
+
+    private val minusModifier get() = preferencesRepository.gradeMinusModifier
+
+    fun getGradesDetailsWithAverage(student: Student, semesterId: Int, forceRefresh: Boolean) = flowWithResourceIn {
+        val semesters = semesterRepository.getSemesters(student)
+
+        when (preferencesRepository.gradeAverageMode) {
+            ONE_SEMESTER -> getSemesterDetailsWithAverage(student, semesters.single { it.semesterId == semesterId }, forceRefresh)
+            BOTH_SEMESTERS -> calculateBothSemestersAverage(student, semesters, semesterId, forceRefresh)
+            ALL_YEAR -> calculateAllYearAverage(student, semesters, semesterId, forceRefresh)
+        }
+    }.distinctUntilChanged()
+
+    private fun calculateBothSemestersAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
+        val selectedSemester = semesters.single { it.semesterId == semesterId }
+        val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
+
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
+            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
+
+            if (selectedSemester != firstSemester) {
+                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
+                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
+                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
+                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                            val selectedGrades = selected.grades.updateModifiers(student).calcAverage()
+                            (selectedGrades + (second?.grades?.updateModifiers(student)?.calcAverage() ?: selectedGrades)) / 2
+                        } else (selected.average + (second?.average ?: selected.average)) / 2)
+                    })
+                }.filter { it.status != Status.LOADING }.filter { it.data != null }
+            } else flowOf(selectedDetails)
         }
     }
 
-    private fun getAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
+    private fun calculateAllYearAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
         val selectedSemester = semesters.single { it.semesterId == semesterId }
         val firstSemester = semesters.single { it.diaryId == selectedSemester.diaryId && it.semesterName == 1 }
-        val plusModifier = preferencesRepository.gradePlusModifier
-        val minusModifier = preferencesRepository.gradeMinusModifier
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
-            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
-                .flatMap { firstGrades ->
-                    if (selectedSemester == firstSemester) Single.just(firstGrades)
-                    else {
-                        gradeRepository.getGrades(student, firstSemester)
-                            .map { secondGrades -> secondGrades + firstGrades }
-                    }
-                }.map { grades ->
-                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
-                        .groupBy { it.subject }
-                        .mapValues { it.value.calcAverage() }
-                })
+        return getSemesterDetailsWithAverage(student, selectedSemester, forceRefresh).flatMapConcat { selectedDetails ->
+            val isAnyAverage = selectedDetails.data.orEmpty().any { it.average != .0 }
+
+            if (selectedSemester != firstSemester) {
+                getSemesterDetailsWithAverage(student, firstSemester, forceRefresh).map { secondDetails ->
+                    secondDetails.copy(data = selectedDetails.data?.map { selected ->
+                        val second = secondDetails.data.orEmpty().singleOrNull { it.subject == selected.subject }
+                        selected.copy(average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                            (selected.grades.updateModifiers(student) + second?.grades?.updateModifiers(student).orEmpty()).calcAverage()
+                        } else selected.average)
+                    })
+                }.filter { it.status != Status.LOADING }.filter { it.data != null }
+            } else flowOf(selectedDetails)
+        }
     }
 
-    private fun getOnlyOneSemesterAverage(student: Student, semesters: List<Semester>, semesterId: Int, forceRefresh: Boolean): Single<Map<String, Double>> {
-        val selectedSemester = semesters.single { it.semesterId == semesterId }
-        val plusModifier = preferencesRepository.gradePlusModifier
-        val minusModifier = preferencesRepository.gradeMinusModifier
+    private fun getSemesterDetailsWithAverage(student: Student, semester: Semester, forceRefresh: Boolean): Flow<Resource<List<GradeDetailsWithAverage>>> {
+        return gradeRepository.getGrades(student, semester, forceRefresh = forceRefresh).map { res ->
+            val (details, summaries) = res.data ?: null to null
+            val isAnyAverage = summaries.orEmpty().any { it.average != .0 }
+            val allGrades = details.orEmpty().groupBy { it.subject }
 
-        return getAverageFromGradeSummary(selectedSemester, forceRefresh)
-            .switchIfEmpty(gradeRepository.getGrades(student, selectedSemester, forceRefresh)
-                .map { grades ->
-                    grades.map { if (student.loginMode == Sdk.Mode.SCRAPPER.name) it.changeModifier(plusModifier, minusModifier) else it }
-                        .groupBy { it.subject }
-                        .mapValues { it.value.calcAverage() }
-                })
+            Resource(res.status, summaries?.emulateEmptySummaries(student, semester, allGrades.toList(), isAnyAverage)?.map { summary ->
+                val grades = allGrades[summary.subject].orEmpty()
+                GradeDetailsWithAverage(
+                    subject = summary.subject,
+                    average = if (!isAnyAverage || preferencesRepository.gradeAverageForceCalc) {
+                        grades.updateModifiers(student).calcAverage()
+                    } else summary.average,
+                    points = summary.pointsSum,
+                    summary = summary,
+                    grades = grades
+                )
+            }, res.error)
+        }
     }
 
-    private fun getAverageFromGradeSummary(selectedSemester: Semester, forceRefresh: Boolean): Maybe<Map<String, Double>> {
-        return gradeSummaryRepository.getGradesSummary(selectedSemester, forceRefresh)
-            .toMaybe()
-            .flatMap {
-                if (it.any { summary -> summary.average != .0 }) {
-                    Maybe.just(it.map { summary -> summary.subject to summary.average }.toMap())
-                } else Maybe.empty()
-            }.filter { !preferencesRepository.gradeAverageForceCalc }
+    private fun List<GradeSummary>.emulateEmptySummaries(student: Student, semester: Semester, grades: List<Pair<String, List<Grade>>>, calcAverage: Boolean): List<GradeSummary> {
+        if (isNotEmpty() && size > grades.size) return this
+
+        return grades.mapIndexed { i, (subject, details) ->
+            singleOrNull { it.subject == subject }?.let { return@mapIndexed it }
+            GradeSummary(
+                studentId = student.studentId,
+                semesterId = semester.semesterId,
+                position = i,
+                subject = subject,
+                predictedGrade = "",
+                finalGrade = "",
+                proposedPoints = "",
+                finalPoints = "",
+                pointsSum = "",
+                average = if (calcAverage) details.updateModifiers(student).calcAverage() else .0
+            )
+        }
+    }
+
+    private fun List<Grade>.updateModifiers(student: Student): List<Grade> {
+        return if (student.loginMode == Sdk.Mode.SCRAPPER.name) {
+            map { it.changeModifier(plusModifier, minusModifier) }
+        } else this
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
new file mode 100644
index 000000000..3f5d706b3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeDetailsWithAverage.kt
@@ -0,0 +1,12 @@
+package io.github.wulkanowy.ui.modules.grade
+
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.data.db.entities.GradeSummary
+
+data class GradeDetailsWithAverage(
+    val subject: String,
+    val average: Double,
+    val points: String,
+    val summary: GradeSummary,
+    val grades: List<Grade>
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
index e8d970010..0678e13ef 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeFragment.kt
@@ -1,16 +1,16 @@
 package io.github.wulkanowy.ui.modules.grade
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentGradeBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
@@ -19,16 +19,16 @@ import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_grade.*
 import javax.inject.Inject
 
-class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainView.TitledView {
+@AndroidEntryPoint
+class GradeFragment : BaseFragment<FragmentGradeBinding>(R.layout.fragment_grade), GradeView,
+    MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: GradePresenter
 
-    @Inject
-    lateinit var pagerAdapter: BaseFragmentPagerAdapter
+    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
 
     private var semesterSwitchMenu: MenuItem? = null
 
@@ -40,19 +40,18 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
 
     override val titleStringId get() = R.string.grade_title
 
-    override val currentPageIndex get() = gradeViewPager.currentItem
+    override var subtitleString = ""
+
+    override val currentPageIndex get() = binding.gradeViewPager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getInt(SAVED_SEMESTER_KEY))
     }
 
@@ -64,7 +63,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = gradeViewPager.id
+            containerId = binding.gradeViewPager.id
             addFragmentsWithTitle(mapOf(
                 GradeDetailsFragment.newInstance() to getString(R.string.all_details),
                 GradeSummaryFragment.newInstance() to getString(R.string.grade_menu_summary),
@@ -72,19 +71,21 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             ))
         }
 
-        with(gradeViewPager) {
+        with(binding.gradeViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 3
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(gradeTabLayout) {
-            setupWithViewPager(gradeViewPager)
+        with(binding.gradeTabLayout) {
+            setupWithViewPager(binding.gradeViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        gradeErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            gradeErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -97,20 +98,22 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun showContent(show: Boolean) {
-        gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        with(binding) {
+            gradeViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            gradeTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        gradeError.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        gradeErrorMessage.text = message
+        binding.gradeErrorMessage.text = message
     }
 
     override fun showSemesterSwitch(show: Boolean) {
@@ -133,6 +136,11 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
             .show()
     }
 
+    override fun setCurrentSemesterName(semester: Int, schoolYear: Int) {
+        subtitleString = getString(R.string.grade_subtitle, semester, schoolYear, schoolYear + 1)
+        (activity as MainView).setViewSubTitle(subtitleString)
+    }
+
     fun onChildRefresh() {
         presenter.onChildViewRefresh()
     }
@@ -159,7 +167,7 @@ class GradeFragment : BaseFragment(), GradeView, MainView.MainChildView, MainVie
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
deleted file mode 100644
index 6e6ca2d63..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeModule.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerChildFragment
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.grade.details.GradeDetailsFragment
-import io.github.wulkanowy.ui.modules.grade.statistics.GradeStatisticsFragment
-import io.github.wulkanowy.ui.modules.grade.summary.GradeSummaryFragment
-
-@Suppress("unused")
-@Module(includes = [GradeModule.Static::class])
-abstract class GradeModule {
-
-    @Module
-    object Static {
-
-        @PerFragment
-        @Provides
-        fun provideGradeAdapter(fragment: GradeFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
-    }
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun bindGradeDetailsFragment(): GradeDetailsFragment
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun binGradeSummaryFragment(): GradeSummaryFragment
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun binGradeStatisticsFragment(): GradeStatisticsFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index d8c202381..d4c9f210a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -1,26 +1,31 @@
 package io.github.wulkanowy.ui.modules.grade
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.getCurrentOrLast
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<GradeView>(errorHandler, studentRepository) {
 
     var selectedIndex = 0
         private set
 
+    private var schoolYear = 0
+
     private var semesters = emptyList<Semester>()
 
     private val loadedSemesterId = mutableMapOf<Int, Int>()
@@ -56,6 +61,7 @@ class GradePresenter @Inject constructor(
             selectedIndex = index + 1
             loadedSemesterId.clear()
             view?.let {
+                it.setCurrentSemesterName(index + 1, schoolYear)
                 notifyChildrenSemesterChange()
                 loadChild(it.currentPageIndex)
             }
@@ -93,40 +99,46 @@ class GradePresenter @Inject constructor(
     }
 
     private fun loadData() {
-        Timber.i("Loading grade data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .doOnSuccess {
-                it.first { item -> item.isCurrent }.also { current ->
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            delay(200)
+            semesterRepository.getSemesters(student, refreshOnNoCurrent = true)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading grade data started")
+                Status.SUCCESS -> {
+                    val current = it.data!!.getCurrentOrLast()
                     selectedIndex = if (selectedIndex == 0) current.semesterName else selectedIndex
-                    semesters = it.filter { semester -> semester.diaryId == current.diaryId }
+                    schoolYear = current.schoolYear
+                    semesters = it.data.filter { semester -> semester.diaryId == current.diaryId }
+                    view?.setCurrentSemesterName(current.semesterName, schoolYear)
+
+                    view?.run {
+                        Timber.i("Loading grade result: Attempt load index $currentPageIndex")
+                        loadChild(currentPageIndex)
+                        showErrorView(false)
+                        showSemesterSwitch(true)
+                    }
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading grade result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
             }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally { view?.showProgress(false) }
-            .subscribe({
-                view?.run {
-                    Timber.i("Loading grade result: Attempt load index $currentPageIndex")
-                    loadChild(currentPageIndex)
-                    showErrorView(false)
-                    showSemesterSwitch(true)
-                }
-            }) {
-                Timber.i("Loading grade result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
         lastError = error
         view?.run {
+            showProgress(false)
             showErrorView(true)
             setErrorDetails(message)
         }
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
+        Timber.d("Load grade tab child. Selected semester: $selectedIndex, semesters: ${semesters.joinToString { it.semesterName.toString() }}")
         semesters.first { it.semesterName == selectedIndex }.semesterId.also {
             if (forceRefresh || loadedSemesterId[index] != it) {
                 Timber.i("Load grade child view index: $index")
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSortingMode.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSortingMode.kt
new file mode 100644
index 000000000..1e6b26e8c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeSortingMode.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.ui.modules.grade
+
+enum class GradeSortingMode(val value: String) {
+    ALPHABETIC("alphabetic"),
+    DATE("date");
+
+    companion object {
+        fun getByValue(value: String) = values().firstOrNull { it.value == value } ?: ALPHABETIC
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
index bbdbc32ea..7b52daa88 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradeView.kt
@@ -20,6 +20,8 @@ interface GradeView : BaseView {
 
     fun showSemesterDialog(selectedIndex: Int)
 
+    fun setCurrentSemesterName(semester: Int, schoolYear: Int)
+
     fun notifyChildLoadData(index: Int, semesterId: Int, forceRefresh: Boolean)
 
     fun notifyChildParentReselected(index: Int)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
new file mode 100644
index 000000000..c129d9485
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsAdapter.kt
@@ -0,0 +1,198 @@
+package io.github.wulkanowy.ui.modules.grade.details
+
+import android.annotation.SuppressLint
+import android.content.res.Resources
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_POSITION
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.HeaderGradeDetailsBinding
+import io.github.wulkanowy.databinding.ItemGradeDetailsBinding
+import io.github.wulkanowy.ui.base.BaseExpandableAdapter
+import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.toFormattedString
+import timber.log.Timber
+import javax.inject.Inject
+
+class GradeDetailsAdapter @Inject constructor() : BaseExpandableAdapter<RecyclerView.ViewHolder>() {
+
+    private var headers = mutableListOf<GradeDetailsItem>()
+
+    private var items = mutableListOf<GradeDetailsItem>()
+
+    private var expandedPosition = NO_POSITION
+
+    private var isExpandable = false
+
+    var onClickListener: (Grade, position: Int) -> Unit = { _, _ -> }
+
+    var colorTheme = ""
+
+    fun setDataItems(data: List<GradeDetailsItem>, isExpanded: Boolean = isExpandable) {
+        headers = data.filter { it.viewType == ViewType.HEADER }.toMutableList()
+        items = if (isExpanded) headers else data.toMutableList()
+        isExpandable = isExpanded
+        expandedPosition = NO_POSITION
+    }
+
+    fun updateDetailsItem(position: Int, grade: Grade) {
+        if (items.getOrNull(position)?.viewType != ViewType.ITEM) {
+            Timber.e("Trying to update item $position on list ${items.size} size, expanded position: $expandedPosition")
+            return
+        }
+        items[position] = GradeDetailsItem(grade, ViewType.ITEM)
+        notifyItemChanged(position)
+    }
+
+    fun getHeaderItem(subject: String): GradeDetailsItem {
+        val candidates = headers.filter { (it.value as GradeDetailsHeader).subject == subject }
+
+        if (candidates.size > 1) {
+            Timber.e("Header with subject $subject found ${candidates.size} times! Expanded: $expandedPosition. Items: $candidates")
+        }
+
+        return candidates.first()
+    }
+
+    fun updateHeaderItem(item: GradeDetailsItem) {
+        val headerPosition = headers.indexOf(item)
+        val itemPosition = items.indexOf(item)
+
+        if (headerPosition == NO_POSITION || itemPosition == NO_POSITION) {
+            Timber.e("Invalid update header positions! Header: $headerPosition, item: $itemPosition")
+        }
+
+        headers[headerPosition] = item
+        items[itemPosition] = item
+        notifyItemChanged(itemPosition)
+    }
+
+    fun collapseAll() {
+        if (expandedPosition != -1) {
+            refreshList(headers)
+            expandedPosition = NO_POSITION
+        }
+    }
+
+    @Synchronized
+    private fun refreshList(newItems: MutableList<GradeDetailsItem>) {
+        val diffCallback = GradeDetailsDiffUtil(items, newItems)
+        val diffResult = DiffUtil.calculateDiff(diffCallback)
+        items = newItems
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(HeaderGradeDetailsBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemGradeDetailsBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(
+                holder = holder,
+                header = items[position].value as GradeDetailsHeader,
+                position = position
+            )
+            is ItemViewHolder -> bindItemViewHolder(
+                holder = holder,
+                grade = items[position].value as Grade
+            )
+        }
+    }
+
+    private fun bindHeaderViewHolder(holder: HeaderViewHolder, header: GradeDetailsHeader, position: Int) {
+        val headerPosition = headers.indexOf(items[position])
+        val adapterPosition = holder.adapterPosition
+
+        with(holder.binding) {
+            gradeHeaderDivider.visibility = if (adapterPosition == 0) View.GONE else View.VISIBLE
+            with(gradeHeaderSubject) {
+                text = header.subject
+                maxLines = if (headerPosition == expandedPosition) 2 else 1
+            }
+            gradeHeaderAverage.text = formatAverage(header.average, root.context.resources)
+            gradeHeaderPointsSum.text = root.context.getString(R.string.grade_points_sum, header.pointsSum)
+            gradeHeaderPointsSum.visibility = if (!header.pointsSum.isNullOrEmpty()) View.VISIBLE else View.GONE
+            gradeHeaderNumber.text = root.context.resources.getQuantityString(R.plurals.grade_number_item, header.grades.size, header.grades.size)
+            gradeHeaderNote.visibility = if (header.newGrades > 0) View.VISIBLE else View.GONE
+            if (header.newGrades > 0) gradeHeaderNote.text = header.newGrades.toString(10)
+
+            gradeHeaderContainer.isEnabled = isExpandable
+            gradeHeaderContainer.setOnClickListener {
+                expandedPosition = if (expandedPosition == adapterPosition) -1 else adapterPosition
+
+                if (expandedPosition != NO_POSITION) {
+                    refreshList(headers.toMutableList().apply {
+                        addAll(headerPosition + 1, header.grades)
+                    })
+                    scrollToHeaderWithSubItems(headerPosition, header.grades.size)
+                } else {
+                    refreshList(headers)
+                }
+            }
+        }
+    }
+
+    private fun formatAverage(average: Double?, resources: Resources): String {
+        return if (average == null || average == .0) resources.getString(R.string.grade_no_average)
+        else resources.getString(R.string.grade_average, average)
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindItemViewHolder(holder: ItemViewHolder, grade: Grade) {
+        with(holder.binding) {
+            gradeItemValue.run {
+                text = grade.entry
+                setBackgroundResource(grade.getBackgroundColor(colorTheme))
+            }
+            gradeItemDescription.text = when {
+                grade.description.isNotBlank() -> grade.description
+                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
+                else -> root.context.getString(R.string.all_no_description)
+            }
+            gradeItemDate.text = grade.date.toFormattedString()
+            gradeItemWeight.text = "${root.context.getString(R.string.grade_weight)}: ${grade.weight}"
+            gradeItemNote.visibility = if (!grade.isRead) View.VISIBLE else View.GONE
+
+            root.setOnClickListener {
+                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(grade, it) }
+            }
+        }
+    }
+
+    private class HeaderViewHolder(val binding: HeaderGradeDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemGradeDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class GradeDetailsDiffUtil(private val old: List<GradeDetailsItem>, private val new: List<GradeDetailsItem>) :
+        DiffUtil.Callback() {
+
+        override fun getOldListSize() = old.size
+
+        override fun getNewListSize() = new.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
index 0abeaeea0..698aff3ea 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsDialog.kt
@@ -8,13 +8,17 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.DialogGradeBinding
 import io.github.wulkanowy.utils.colorStringId
 import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.getGradeColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_grade.*
 
 class GradeDetailsDialog : DialogFragment() {
 
+    private var binding: DialogGradeBinding by lifecycleAwareVariable()
+
     private lateinit var grade: Grade
 
     private lateinit var colorScheme: String
@@ -43,42 +47,49 @@ class GradeDetailsDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_grade, container, false)
+        return DialogGradeBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        gradeDialogSubject.text = grade.subject
-        gradeDialogWeightValue.text = grade.weight
-        gradeDialogDateValue.text = grade.date.toFormattedString()
-        gradeDialogColorValue.text = getString(grade.colorStringId)
+        with(binding) {
+            gradeDialogSubject.text = grade.subject
 
-        gradeDialogCommentValue.apply {
-            if (grade.comment.isBlank()) {
-                visibility = GONE
-                gradeDialogComment.visibility = GONE
-            } else text = grade.comment
-        }
-
-        gradeDialogValue.run {
-            text = grade.entry
-            setBackgroundResource(grade.getBackgroundColor(colorScheme))
-        }
-
-        gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
-            getString(R.string.all_no_data)
-        } else grade.teacher
-
-        gradeDialogDescriptionValue.text = grade.run {
-            when {
-                description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
-                description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
-                gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
-                else -> description
+            gradeDialogColorAndWeightValue.run {
+                text = context.getString(R.string.grade_weight_value, grade.weight)
+                setBackgroundResource(grade.getGradeColor())
             }
-        }
 
-        gradeDialogClose.setOnClickListener { dismiss() }
+            gradeDialogDateValue.text = grade.date.toFormattedString()
+            gradeDialogColorValue.text = getString(grade.colorStringId)
+
+            gradeDialogCommentValue.apply {
+                if (grade.comment.isBlank()) {
+                    visibility = GONE
+                    gradeDialogComment.visibility = GONE
+                } else text = grade.comment
+            }
+
+            gradeDialogValue.run {
+                text = grade.entry
+                setBackgroundResource(grade.getBackgroundColor(colorScheme))
+            }
+
+            gradeDialogTeacherValue.text = if (grade.teacher.isBlank()) {
+                getString(R.string.all_no_data)
+            } else grade.teacher
+
+            gradeDialogDescriptionValue.text = grade.run {
+                when {
+                    description.isBlank() && gradeSymbol.isNotBlank() -> gradeSymbol
+                    description.isBlank() && gradeSymbol.isBlank() -> getString(R.string.all_no_description)
+                    gradeSymbol.isNotBlank() && description.isNotBlank() -> "$gradeSymbol - $description"
+                    else -> description
+                }
+            }
+
+            gradeDialogClose.setOnClickListener { dismiss() }
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
index 195ae11df..ef9a932e1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsFragment.kt
@@ -1,7 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -9,29 +8,27 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IExpandable
-import eu.davidea.flexibleadapter.items.IFlexible
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
+import io.github.wulkanowy.databinding.FragmentGradeDetailsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_grade_details.*
 import javax.inject.Inject
 
-class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeChildView {
+@AndroidEntryPoint
+class GradeDetailsFragment :
+    BaseFragment<FragmentGradeDetailsBinding>(R.layout.fragment_grade_details), GradeDetailsView,
+    GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeDetailsPresenter
 
     @Inject
-    lateinit var gradeDetailsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var gradeDetailsAdapter: GradeDetailsAdapter
 
     private var gradeDetailsMenu: Menu? = null
 
@@ -39,33 +36,18 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
         fun newInstance() = GradeDetailsFragment()
     }
 
-    override val emptyAverageString: String
-        get() = getString(R.string.grade_no_average)
-
-    override val averageString: String
-        get() = getString(R.string.grade_average)
-
-    override val weightString: String
-        get() = getString(R.string.grade_weight)
-
-    override val noDescriptionString: String
-        get() = getString(R.string.all_no_description)
-
     override val isViewEmpty
-        get() = gradeDetailsAdapter.isEmpty
+        get() = gradeDetailsAdapter.itemCount == 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_details, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeDetailsRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeDetailsBinding.bind(view)
+        messageContainer = binding.gradeDetailsRecycler
         presenter.onAttachView(this)
     }
 
@@ -76,22 +58,17 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     }
 
     override fun initView() {
-        gradeDetailsAdapter.run {
-            isAutoCollapseOnExpand = true
-            isAutoScrollOnExpand = true
-            setOnItemClickListener { presenter.onGradeItemSelected(it) }
-        }
+        gradeDetailsAdapter.onClickListener = presenter::onGradeItemSelected
 
-        gradeDetailsRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = gradeDetailsAdapter
-            addItemDecoration(GradeDetailsHeaderItemDecoration(context)
-                .withDefaultDivider(R.layout.header_grade_details)
-            )
+        with(binding) {
+            with(gradeDetailsRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = gradeDetailsAdapter
+            }
+            gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        gradeDetailsSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeDetailsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeDetailsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -99,16 +76,23 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
         else false
     }
 
-    override fun updateData(data: List<GradeDetailsHeader>) {
-        gradeDetailsAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String) {
+        with(gradeDetailsAdapter) {
+            colorTheme = gradeColorTheme
+            setDataItems(data, isGradeExpandable)
+            notifyDataSetChanged()
+        }
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        gradeDetailsAdapter.updateItem(item)
+    override fun updateItem(item: Grade, position: Int) {
+        gradeDetailsAdapter.updateDetailsItem(position, item)
     }
 
     override fun clearView() {
-        gradeDetailsAdapter.clear()
+        with(gradeDetailsAdapter) {
+            setDataItems(mutableListOf())
+            notifyDataSetChanged()
+        }
     }
 
     override fun collapseAllItems() {
@@ -116,43 +100,43 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     }
 
     override fun scrollToStart() {
-        gradeDetailsRecycler.scrollToPosition(0)
+        binding.gradeDetailsRecycler.smoothScrollToPosition(0)
     }
 
-    override fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>? {
-        return gradeDetailsAdapter.getExpandableOf(item)
+    override fun getHeaderOfItem(subject: String): GradeDetailsItem {
+        return gradeDetailsAdapter.getHeaderItem(subject)
     }
 
-    override fun getGradeNumberString(number: Int): String {
-        return resources.getQuantityString(R.plurals.grade_number_item, number, number)
+    override fun updateHeaderItem(item: GradeDetailsItem) {
+        gradeDetailsAdapter.updateHeaderItem(item)
     }
 
     override fun showProgress(show: Boolean) {
-        gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
+        binding.gradeDetailsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeDetailsSwipe.isEnabled = enable
+        binding.gradeDetailsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeDetailsRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeDetailsEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        gradeDetailsError.visibility = if (show) VISIBLE else GONE
+        binding.gradeDetailsError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        gradeDetailsErrorMessage.text = message
+        binding.gradeDetailsErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeDetailsSwipe.isRefreshing = show
+        binding.gradeDetailsSwipe.isRefreshing = show
     }
 
     override fun showGradeDialog(grade: Grade, colorScheme: String) {
@@ -184,7 +168,7 @@ class GradeDetailsFragment : BaseFragment(), GradeDetailsView, GradeView.GradeCh
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
deleted file mode 100644
index 9ed412808..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeader.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractExpandableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_grade_details.*
-
-class GradeDetailsHeader(
-    private val subject: String,
-    private val number: String,
-    private val average: String,
-    var newGrades: Int,
-    private val isExpandable: Boolean
-) : AbstractExpandableItem<GradeDetailsHeader.ViewHolder, GradeDetailsItem>() {
-
-    init {
-        isExpanded = !isExpandable
-    }
-
-    override fun getLayoutRes() = R.layout.header_grade_details
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeHeaderSubject.apply {
-                text = subject
-                maxLines = if (isExpanded) 2 else 1
-            }
-            gradeHeaderAverage.text = average
-            gradeHeaderNumber.text = number
-            gradeHeaderNote.visibility = if (newGrades > 0) VISIBLE else GONE
-            if (newGrades > 0) gradeHeaderNote.text = newGrades.toString(10)
-            gradeHeaderContainer.isEnabled = isExpandable
-
-            isViewExpandable = isExpandable
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeDetailsHeader
-
-        if (subject != other.subject) return false
-        if (number != other.number) return false
-        if (average != other.average) return false
-        if (isExpandable != other.isExpandable) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = subject.hashCode()
-        result = 31 * result + number.hashCode()
-        result = 31 * result + average.hashCode()
-        result = 31 * result + isExpandable.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) :
-        ExpandableViewHolder(view, adapter), LayoutContainer {
-
-        var isViewExpandable = true
-
-        init {
-            contentView.setOnClickListener(this)
-        }
-
-        override val containerView: View
-            get() = contentView
-
-        override fun isViewCollapsibleOnClick() = isViewExpandable
-
-        override fun isViewExpandableOnClick() = isViewExpandable
-
-        override fun onClick(view: View?) {
-            super.onClick(view)
-            mAdapter.getItem(adapterPosition)?.let { mAdapter.updateItem(it) }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
deleted file mode 100644
index 39a911e62..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsHeaderItemDecoration.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.details
-
-import android.content.Context
-import android.graphics.Canvas
-import androidx.recyclerview.widget.RecyclerView
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-
-class GradeDetailsHeaderItemDecoration(context: Context) : FlexibleItemDecoration(context) {
-
-    override fun drawVertical(canvas: Canvas, parent: RecyclerView) {
-        canvas.save()
-        val left: Int
-        val right: Int
-        if (parent.clipToPadding) {
-            left = parent.paddingLeft
-            right = parent.width - parent.paddingRight
-            canvas.clipRect(left, parent.paddingTop, right,
-                parent.height - parent.paddingBottom)
-        } else {
-            left = 0
-            right = parent.width
-        }
-
-        val itemCount = parent.childCount
-        for (i in 1 until itemCount) {
-            val child = parent.getChildAt(i)
-            val viewHolder = parent.getChildViewHolder(child)
-            if (shouldDrawDivider(viewHolder)) {
-                parent.getDecoratedBoundsWithMargins(child, mBounds)
-                val bottom = mBounds.top + Math.round(child.translationY)
-                val top = bottom - mDivider.intrinsicHeight
-                mDivider.setBounds(left, top, right, bottom)
-                mDivider.draw(canvas)
-            }
-        }
-        canvas.restore()
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
index 1e47eca5d..281974969 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsItem.kt
@@ -1,74 +1,19 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import android.annotation.SuppressLint
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Grade
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_grade_details.*
-
-class GradeDetailsItem(
-    val grade: Grade,
-    private val valueBgColor: Int,
-    private val weightString: String,
-    private val noDescriptionString: String
-) : AbstractFlexibleItem<GradeDetailsItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_grade_details
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeItemValue.run {
-                text = grade.entry
-                setBackgroundResource(valueBgColor)
-            }
-            gradeItemDescription.text = when {
-                grade.description.isNotBlank() -> grade.description
-                grade.gradeSymbol.isNotBlank() -> grade.gradeSymbol
-                else -> noDescriptionString
-            }
-            gradeItemDate.text = grade.date.toFormattedString()
-            gradeItemWeight.text = "$weightString: ${grade.weight}"
-            gradeItemNote.visibility = if (!grade.isRead) VISIBLE else GONE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeDetailsItem
-
-        if (grade != other.grade) return false
-        if (grade.id != other.grade.id) return false
-        if (weightString != other.weightString) return false
-        if (valueBgColor != other.valueBgColor) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = grade.hashCode()
-        result = 31 * result + grade.id.toInt()
-        result = 31 * result + weightString.hashCode()
-        result = 31 * result + valueBgColor
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
+enum class ViewType(val id: Int) {
+    HEADER(1),
+    ITEM(2)
 }
+
+data class GradeDetailsItem(
+    val value: Any,
+    val viewType: ViewType
+)
+
+data class GradeDetailsHeader(
+    val subject: String,
+    val average: Double?,
+    val pointsSum: String?,
+    var newGrades: Int,
+    val grades: List<GradeDetailsItem>
+)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
index 647047c69..9f4f8f267 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsPresenter.kt
@@ -1,6 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import android.annotation.SuppressLint
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -9,14 +10,19 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
+import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
+import io.github.wulkanowy.ui.modules.grade.GradeSortingMode.ALPHABETIC
+import io.github.wulkanowy.ui.modules.grade.GradeSortingMode.DATE
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.getBackgroundColor
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeDetailsPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeRepository: GradeRepository,
@@ -24,7 +30,7 @@ class GradeDetailsPresenter @Inject constructor(
     private val preferencesRepository: PreferencesRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<GradeDetailsView>(errorHandler, studentRepository) {
 
     private var newGradesAmount: Int = 0
 
@@ -40,50 +46,51 @@ class GradeDetailsPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
+
         loadData(semesterId, forceRefresh)
+        if (!forceRefresh) view?.showErrorView(false)
     }
 
-    fun onGradeItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is GradeDetailsItem) {
-            Timber.i("Select grade item ${item.grade.id}")
-            view?.apply {
-                showGradeDialog(item.grade, preferencesRepository.gradeColorTheme)
-                if (!item.grade.isRead) {
-                    item.grade.isRead = true
-                    updateItem(item)
-                    getHeaderOfItem(item)?.let { header ->
-                        if (header is GradeDetailsHeader) {
-                            header.newGrades--
-                            updateItem(header)
-                        }
-                    }
-                    newGradesAmount--
-                    updateMarkAsDoneButton()
-                    updateGrade(item.grade)
+    fun onGradeItemSelected(grade: Grade, position: Int) {
+        Timber.i("Select grade item ${grade.id}, position: $position")
+        view?.apply {
+            showGradeDialog(grade, preferencesRepository.gradeColorTheme)
+            if (!grade.isRead) {
+                grade.isRead = true
+                updateItem(grade, position)
+                getHeaderOfItem(grade.subject).let { header ->
+                    (header.value as GradeDetailsHeader).newGrades--
+                    updateHeaderItem(header)
                 }
+                newGradesAmount--
+                updateMarkAsDoneButton()
+                updateGrade(grade)
             }
         }
     }
 
     fun onMarkAsReadSelected(): Boolean {
-        Timber.i("Select mark grades as read")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeRepository.getUnreadGrades(it.first { item -> item.semesterId == currentSemesterId }) }
-            .map { it.map { grade -> grade.apply { isRead = true } } }
-            .flatMapCompletable {
-                Timber.i("Mark as read ${it.size} grades")
-                gradeRepository.updateGrades(it)
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            val semesters = semesterRepository.getSemesters(student)
+            val semester = semesters.first { item -> item.semesterId == currentSemesterId }
+            val unreadGrades = gradeRepository.getUnreadGrades(semester).first()
+
+            Timber.i("Mark as read ${unreadGrades.size} grades")
+            gradeRepository.updateGrades(unreadGrades.map { it.apply { isRead = true } })
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Select mark grades as read")
+                Status.SUCCESS -> {
+                    Timber.i("Mark as read result: Success")
+                    loadData(currentSemesterId, false)
+                }
+                Status.ERROR -> {
+                    Timber.i("Mark as read result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
             }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Mark as read result: Success")
-                loadData(currentSemesterId, false)
-            }, {
-                Timber.i("Mark as read result: An exception occurred")
-                errorHandler.dispatch(it)
-            }))
+        }.launch("mark")
         return true
     }
 
@@ -122,7 +129,7 @@ class GradeDetailsPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        disposable.clear()
+        cancelJobs("load")
     }
 
     fun updateMarkAsDoneButton() {
@@ -130,43 +137,46 @@ class GradeDetailsPresenter @Inject constructor(
     }
 
     private fun loadData(semesterId: Int, forceRefresh: Boolean) {
-        Timber.i("Loading grade details data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it).map { semester -> it to semester } }
-            .flatMap { (student, semesters) ->
-                averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
-                    .flatMap { averages ->
-                        gradeRepository.getGrades(student, semesters.first { it.semesterId == semesterId }, forceRefresh)
-                            .map { it.sortedByDescending { grade -> grade.date } }
-                            .map { it.groupBy { grade -> grade.subject }.toSortedMap() }
-                            .map { createGradeItems(it, averages) }
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading grade details data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading grade details result: Success")
+                    newGradesAmount = it.data!!.sumBy { item -> item.grades.sumBy { grade -> if (!grade.isRead) 1 else 0 } }
+                    updateMarkAsDoneButton()
+                    val items = createGradeItems(it.data)
+                    view?.run {
+                        showEmpty(items.isEmpty())
+                        showErrorView(false)
+                        showContent(items.isNotEmpty())
+                        updateData(
+                            data = items,
+                            isGradeExpandable = preferencesRepository.isGradeExpandable,
+                            gradeColorTheme = preferencesRepository.gradeColorTheme
+                        )
                     }
-            }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "grade_details",
+                        "items" to it.data.size
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading grade details result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
             }
-            .subscribe({
-                Timber.i("Loading grade details result: Success")
-                newGradesAmount = it.sumBy { gradeDetailsHeader -> gradeDetailsHeader.newGrades }
-                updateMarkAsDoneButton()
-                view?.run {
-                    showEmpty(it.isEmpty())
-                    showErrorView(false)
-                    showContent(it.isNotEmpty())
-                    updateData(it)
-                }
-                analytics.logEvent("load_grade_details", "items" to it.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.i("Loading grade details result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
+        }.afterLoading {
+            view?.run {
+                showRefresh(false)
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded(semesterId)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -180,49 +190,45 @@ class GradeDetailsPresenter @Inject constructor(
         }
     }
 
-    private fun createGradeItems(items: Map<String, List<Grade>>, averages: Map<String, Double>): List<GradeDetailsHeader> {
-        val isGradeExpandable = preferencesRepository.isGradeExpandable
-        val gradeColorTheme = preferencesRepository.gradeColorTheme
-
-        val noDescriptionString = view?.noDescriptionString.orEmpty()
-        val weightString = view?.weightString.orEmpty()
-
-        return items.map {
-            GradeDetailsHeader(
-                subject = it.key,
-                average = formatAverage(averages[it.key]),
-                number = view?.getGradeNumberString(it.value.size).orEmpty(),
-                newGrades = it.value.filter { grade -> !grade.isRead }.size,
-                isExpandable = isGradeExpandable
-            ).apply {
-                subItems = it.value.map { item ->
-                    GradeDetailsItem(
-                        grade = item,
-                        valueBgColor = item.getBackgroundColor(gradeColorTheme),
-                        weightString = weightString,
-                        noDescriptionString = noDescriptionString
-                    )
+    @SuppressLint("DefaultLocale")
+    private fun createGradeItems(items: List<GradeDetailsWithAverage>): List<GradeDetailsItem> {
+        return items
+            .let { gradesWithAverages ->
+                if (!preferencesRepository.showSubjectsWithoutGrades) {
+                    gradesWithAverages.filter { it.grades.isNotEmpty() }
+                } else gradesWithAverages
+            }
+            .let {
+                when (preferencesRepository.gradeSortingMode) {
+                    DATE -> it.sortedByDescending { gradeDetailsWithAverage -> gradeDetailsWithAverage.grades.firstOrNull()?.date }
+                    ALPHABETIC -> it.sortedBy { gradeDetailsWithAverage -> gradeDetailsWithAverage.subject.toLowerCase() }
                 }
             }
-        }
-    }
+            .map { (subject, average, points, _, grades) ->
+                val subItems = grades
+                    .sortedByDescending { it.date }
+                    .map { GradeDetailsItem(it, ViewType.ITEM) }
 
-    private fun formatAverage(average: Double?): String {
-        return view?.run {
-            if (average == null || average == .0) emptyAverageString
-            else averageString.format(average)
-        }.orEmpty()
+                listOf(GradeDetailsItem(GradeDetailsHeader(
+                    subject = subject,
+                    average = average,
+                    pointsSum = points,
+                    newGrades = grades.filter { grade -> !grade.isRead }.size,
+                    grades = subItems
+                ), ViewType.HEADER)) + if (preferencesRepository.isGradeExpandable) emptyList() else subItems
+            }.flatten()
     }
 
     private fun updateGrade(grade: Grade) {
-        Timber.i("Attempt to update grade ${grade.id}")
-        disposable.add(gradeRepository.updateGrade(grade)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({ Timber.i("Update grade result: Success") })
-            { error ->
-                Timber.i("Update grade result: An exception occurred")
-                errorHandler.dispatch(error)
-            })
+        flowWithResource { gradeRepository.updateGrade(grade) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Attempt to update grade ${grade.id}")
+                Status.SUCCESS -> Timber.i("Update grade result: Success")
+                Status.ERROR -> {
+                    Timber.i("Update grade result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("update")
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
index dad4ac6eb..e71fcc3c8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/details/GradeDetailsView.kt
@@ -1,8 +1,5 @@
 package io.github.wulkanowy.ui.modules.grade.details
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IExpandable
-import eu.davidea.flexibleadapter.items.IFlexible
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -10,19 +7,13 @@ interface GradeDetailsView : BaseView {
 
     val isViewEmpty: Boolean
 
-    val emptyAverageString: String
-
-    val averageString: String
-
-    val weightString: String
-
-    val noDescriptionString: String
-
     fun initView()
 
-    fun updateData(data: List<GradeDetailsHeader>)
+    fun updateData(data: List<GradeDetailsItem>, isGradeExpandable: Boolean, gradeColorTheme: String)
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateItem(item: Grade, position: Int)
+
+    fun updateHeaderItem(item: GradeDetailsItem)
 
     fun clearView()
 
@@ -52,7 +43,5 @@ interface GradeDetailsView : BaseView {
 
     fun enableMarkAsDoneButton(enable: Boolean)
 
-    fun getGradeNumberString(number: Int): String
-
-    fun getHeaderOfItem(item: AbstractFlexibleItem<*>): IExpandable<*, out IFlexible<*>>?
+    fun getHeaderOfItem(subject: String): GradeDetailsItem
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
new file mode 100644
index 000000000..dbb60910a
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsAdapter.kt
@@ -0,0 +1,208 @@
+package io.github.wulkanowy.ui.modules.grade.statistics
+
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.components.LegendEntry
+import com.github.mikephil.charting.data.BarData
+import com.github.mikephil.charting.data.BarDataSet
+import com.github.mikephil.charting.data.BarEntry
+import com.github.mikephil.charting.data.PieData
+import com.github.mikephil.charting.data.PieDataSet
+import com.github.mikephil.charting.data.PieEntry
+import com.github.mikephil.charting.formatter.ValueFormatter
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradePointsStatistics
+import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.databinding.ItemGradeStatisticsBarBinding
+import io.github.wulkanowy.databinding.ItemGradeStatisticsPieBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class GradeStatisticsAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<GradeStatisticsItem>()
+
+    var theme: String = "vulcan"
+
+    var showAllSubjectsOnList: Boolean = false
+
+    private val vulcanGradeColors = listOf(
+        6 to R.color.grade_vulcan_six,
+        5 to R.color.grade_vulcan_five,
+        4 to R.color.grade_vulcan_four,
+        3 to R.color.grade_vulcan_three,
+        2 to R.color.grade_vulcan_two,
+        1 to R.color.grade_vulcan_one
+    )
+
+    private val materialGradeColors = listOf(
+        6 to R.color.grade_material_six,
+        5 to R.color.grade_material_five,
+        4 to R.color.grade_material_four,
+        3 to R.color.grade_material_three,
+        2 to R.color.grade_material_two,
+        1 to R.color.grade_material_one
+    )
+
+    private val gradePointsColors = listOf(
+        Color.parseColor("#37c69c"),
+        Color.parseColor("#d8b12a")
+    )
+
+    private val gradeLabels = listOf(
+        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
+    )
+
+    override fun getItemCount() = if (showAllSubjectsOnList) items.size else (if (items.isEmpty()) 0 else 1)
+
+    override fun getItemViewType(position: Int) = items[position].type.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            ViewType.PARTIAL.id, ViewType.SEMESTER.id -> PieViewHolder(ItemGradeStatisticsPieBinding.inflate(inflater, parent, false))
+            ViewType.POINTS.id -> BarViewHolder(ItemGradeStatisticsBarBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is PieViewHolder -> bindPieChart(holder, items[position].partial)
+            is BarViewHolder -> bindBarChart(holder, items[position].points!!)
+        }
+    }
+
+    private fun bindPieChart(holder: PieViewHolder, partials: List<GradeStatistics>) {
+        with(holder.binding.gradeStatisticsPieTitle) {
+            text = partials.firstOrNull()?.subject
+            visibility = if (items.size == 1 || !showAllSubjectsOnList) GONE else VISIBLE
+        }
+
+        val gradeColors = when (theme) {
+            "vulcan" -> vulcanGradeColors
+            else -> materialGradeColors
+        }
+
+        val dataset = PieDataSet(partials.map {
+            PieEntry(it.amount.toFloat(), it.grade.toString())
+        }, "Legenda")
+
+        with(dataset) {
+            valueTextSize = 12f
+            sliceSpace = 1f
+            valueTextColor = Color.WHITE
+            setColors(partials.map {
+                gradeColors.single { color -> color.first == it.grade }.second
+            }.toIntArray(), holder.binding.root.context)
+        }
+
+        with(holder.binding.gradeStatisticsPie) {
+            setTouchEnabled(false)
+            if (partials.size == 1) animateXY(1000, 1000)
+            data = PieData(dataset).apply {
+                setValueFormatter(object : ValueFormatter() {
+                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
+                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
+                    }
+                })
+            }
+            with(legend) {
+                textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                setCustom(gradeLabels.mapIndexed { i, it ->
+                    LegendEntry().apply {
+                        label = it
+                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
+                        form = Legend.LegendForm.SQUARE
+                    }
+                })
+            }
+
+            minAngleForSlices = 25f
+            description.isEnabled = false
+            centerText = partials.fold(0) { acc, it -> acc + it.amount }
+                .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
+
+            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
+            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
+            invalidate()
+        }
+    }
+
+    private fun bindBarChart(holder: BarViewHolder, points: GradePointsStatistics) {
+        with(holder.binding.gradeStatisticsBarTitle) {
+            text = points.subject
+            visibility = if (items.size == 1) GONE else VISIBLE
+        }
+
+        val dataset = BarDataSet(listOf(
+            BarEntry(1f, points.others.toFloat()),
+            BarEntry(2f, points.student.toFloat())
+        ), "Legenda")
+
+        with(dataset) {
+            valueTextSize = 12f
+            valueTextColor = holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary)
+            valueFormatter = object : ValueFormatter() {
+                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
+            }
+            colors = gradePointsColors
+        }
+
+        with(holder.binding.gradeStatisticsBar) {
+            setTouchEnabled(false)
+            if (items.size == 1) animateXY(1000, 1000)
+            data = BarData(dataset).apply {
+                barWidth = 0.5f
+                setFitBars(true)
+            }
+            legend.setCustom(listOf(
+                LegendEntry().apply {
+                    label = "Średnia klasy"
+                    formColor = gradePointsColors[0]
+                    form = Legend.LegendForm.SQUARE
+                },
+                LegendEntry().apply {
+                    label = "Uczeń"
+                    formColor = gradePointsColors[1]
+                    form = Legend.LegendForm.SQUARE
+                }
+            ))
+            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+
+            description.isEnabled = false
+
+            holder.binding.root.context.getThemeAttrColor(android.R.attr.textColorPrimary).let {
+                axisLeft.textColor = it
+                axisRight.textColor = it
+            }
+            xAxis.setDrawLabels(false)
+            xAxis.setDrawGridLines(false)
+            with(axisLeft) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
+            with(axisRight) {
+                axisMinimum = 0f
+                axisMaximum = 100f
+                labelCount = 11
+            }
+            invalidate()
+        }
+    }
+
+    private class PieViewHolder(val binding: ItemGradeStatisticsPieBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class BarViewHolder(val binding: ItemGradeStatisticsBarBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
index a65cab9c9..75050249a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsFragment.kt
@@ -1,40 +1,32 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import android.graphics.Color
-import android.graphics.Color.WHITE
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.TextView
-import androidx.core.content.ContextCompat
-import com.github.mikephil.charting.components.Legend
-import com.github.mikephil.charting.components.LegendEntry
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarDataSet
-import com.github.mikephil.charting.data.BarEntry
-import com.github.mikephil.charting.data.PieData
-import com.github.mikephil.charting.data.PieDataSet
-import com.github.mikephil.charting.data.PieEntry
-import com.github.mikephil.charting.formatter.ValueFormatter
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
+import io.github.wulkanowy.databinding.FragmentGradeStatisticsBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.setOnItemSelectedListener
-import kotlinx.android.synthetic.main.fragment_grade_statistics.*
 import javax.inject.Inject
 
-class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.GradeChildView {
+@AndroidEntryPoint
+class GradeStatisticsFragment :
+    BaseFragment<FragmentGradeStatisticsBinding>(R.layout.fragment_grade_statistics),
+    GradeStatisticsView, GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeStatisticsPresenter
 
+    @Inject
+    lateinit var statisticsAdapter: GradeStatisticsAdapter
+
     private lateinit var subjectsAdapter: ArrayAdapter<String>
 
     companion object {
@@ -43,86 +35,43 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         fun newInstance() = GradeStatisticsFragment()
     }
 
-    override val isPieViewEmpty get() = gradeStatisticsChart.isEmpty
-
-    override val isBarViewEmpty get() = gradeStatisticsChartPoints.isEmpty
+    override val isViewEmpty get() = statisticsAdapter.items.isEmpty()
 
     override val currentType
-        get() = when (gradeStatisticsTypeSwitch.checkedRadioButtonId) {
+        get() = when (binding.gradeStatisticsTypeSwitch.checkedRadioButtonId) {
             R.id.gradeStatisticsTypeSemester -> ViewType.SEMESTER
             R.id.gradeStatisticsTypePartial -> ViewType.PARTIAL
             else -> ViewType.POINTS
         }
 
-    private lateinit var gradeColors: List<Pair<Int, Int>>
-
-    private val vulcanGradeColors = listOf(
-        6 to R.color.grade_vulcan_six,
-        5 to R.color.grade_vulcan_five,
-        4 to R.color.grade_vulcan_four,
-        3 to R.color.grade_vulcan_three,
-        2 to R.color.grade_vulcan_two,
-        1 to R.color.grade_vulcan_one
-    )
-
-    private val materialGradeColors = listOf(
-        6 to R.color.grade_material_six,
-        5 to R.color.grade_material_five,
-        4 to R.color.grade_material_four,
-        3 to R.color.grade_material_three,
-        2 to R.color.grade_material_two,
-        1 to R.color.grade_material_one
-    )
-
-    private val gradePointsColors = listOf(
-        Color.parseColor("#37c69c"),
-        Color.parseColor("#d8b12a")
-    )
-
-    private val gradeLabels = listOf(
-        "6, 6-", "5, 5-, 5+", "4, 4-, 4+", "3, 3-, 3+", "2, 2-, 2+", "1, 1+"
-    )
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_statistics, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeStatisticsSwipe
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeStatisticsBinding.bind(view)
+        messageContainer = binding.gradeStatisticsSwipe
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_CHART_TYPE) as? ViewType)
     }
 
     override fun initView() {
-        with(gradeStatisticsChart) {
-            description.isEnabled = false
-            setHoleColor(context.getThemeAttrColor(android.R.attr.windowBackground))
-            setCenterTextColor(context.getThemeAttrColor(android.R.attr.textColorPrimary))
-            animateXY(1000, 1000)
-            minAngleForSlices = 25f
-            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
-        }
-
-        with(gradeStatisticsChartPoints) {
-            description.isEnabled = false
-
-            animateXY(1000, 1000)
-            legend.textColor = context.getThemeAttrColor(android.R.attr.textColorPrimary)
+        with(binding.gradeStatisticsRecycler) {
+            layoutManager = LinearLayoutManager(requireContext())
+            adapter = statisticsAdapter
         }
 
         subjectsAdapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, mutableListOf())
         subjectsAdapter.setDropDownViewResource(R.layout.item_attendance_summary_subject)
 
-        with(gradeStatisticsSubjects) {
+        with(binding.gradeStatisticsSubjects) {
             adapter = subjectsAdapter
             setOnItemSelectedListener<TextView> { presenter.onSubjectSelected(it?.text?.toString()) }
         }
 
-        gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
+        with(binding) {
+            gradeStatisticsSubjectsContainer.setElevationCompat(requireContext().dpToPx(1f))
 
-        gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            gradeStatisticsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            gradeStatisticsErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeStatisticsErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
     override fun updateSubjects(data: ArrayList<String>) {
@@ -133,128 +82,53 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
         }
     }
 
-    override fun updatePieData(items: List<GradeStatistics>, theme: String) {
-        gradeColors = when (theme) {
-            "vulcan" -> vulcanGradeColors
-            else -> materialGradeColors
-        }
-
-        val dataset = PieDataSet(items.map {
-            PieEntry(it.amount.toFloat(), it.grade.toString())
-        }, "Legenda").apply {
-            valueTextSize = 12f
-            sliceSpace = 1f
-            valueTextColor = WHITE
-            setColors(items.map {
-                gradeColors.single { color -> color.first == it.grade }.second
-            }.toIntArray(), context)
-        }
-
-        with(gradeStatisticsChart) {
-            data = PieData(dataset).apply {
-                setTouchEnabled(false)
-                setValueFormatter(object : ValueFormatter() {
-                    override fun getPieLabel(value: Float, pieEntry: PieEntry): String {
-                        return resources.getQuantityString(R.plurals.grade_number_item, value.toInt(), value.toInt())
-                    }
-                })
-                centerText = items.fold(0) { acc, it -> acc + it.amount }
-                    .let { resources.getQuantityString(R.plurals.grade_number_item, it, it) }
-            }
-            legend.apply {
-                setCustom(gradeLabels.mapIndexed { i, it ->
-                    LegendEntry().apply {
-                        label = it
-                        formColor = ContextCompat.getColor(context, gradeColors[i].second)
-                        form = Legend.LegendForm.SQUARE
-                    }
-                })
-            }
-            invalidate()
-        }
-    }
-
-    override fun updateBarData(item: GradePointsStatistics) {
-        val dataset = BarDataSet(listOf(
-            BarEntry(1f, item.others.toFloat()),
-            BarEntry(2f, item.student.toFloat())
-        ), "Legenda").apply {
-            valueTextSize = 12f
-            valueTextColor = requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
-            valueFormatter = object : ValueFormatter() {
-                override fun getBarLabel(barEntry: BarEntry) = "${barEntry.y}%"
-            }
-            colors = gradePointsColors
-        }
-
-        with(gradeStatisticsChartPoints) {
-            data = BarData(dataset).apply {
-                barWidth = 0.5f
-                setFitBars(true)
-            }
-            setTouchEnabled(false)
-            xAxis.setDrawLabels(false)
-            xAxis.setDrawGridLines(false)
-            requireContext().getThemeAttrColor(android.R.attr.textColorPrimary).let {
-                axisLeft.textColor = it
-                axisRight.textColor = it
-            }
-            legend.setCustom(listOf(
-                LegendEntry().apply {
-                    label = "Średnia klasy"
-                    formColor = gradePointsColors[0]
-                    form = Legend.LegendForm.SQUARE
-                },
-                LegendEntry().apply {
-                    label = "Uczeń"
-                    formColor = gradePointsColors[1]
-                    form = Legend.LegendForm.SQUARE
-                }
-            ))
-            invalidate()
+    override fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean) {
+        with(statisticsAdapter) {
+            this.showAllSubjectsOnList = showAllSubjectsOnStatisticsList
+            this.theme = theme
+            this.items = items
+            notifyDataSetChanged()
         }
     }
 
     override fun showSubjects(show: Boolean) {
-        gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.INVISIBLE
-        gradeStatisticsTypeSwitch.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.gradeStatisticsSubjectsContainer.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun clearView() {
-        gradeStatisticsChart.clear()
-        gradeStatisticsChartPoints.clear()
+        statisticsAdapter.items = emptyList()
     }
 
-    override fun showPieContent(show: Boolean) {
-        gradeStatisticsChart.visibility = if (show) View.VISIBLE else View.GONE
+    override fun resetView() {
+        binding.gradeStatisticsScroll.scrollTo(0, 0)
     }
 
-    override fun showBarContent(show: Boolean) {
-        gradeStatisticsChartPoints.visibility = if (show) View.VISIBLE else View.GONE
+    override fun showContent(show: Boolean) {
+        binding.gradeStatisticsRecycler.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
+        binding.gradeStatisticsEmpty.visibility = if (show) View.VISIBLE else View.INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
+        binding.gradeStatisticsError.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun setErrorDetails(message: String) {
-        gradeStatisticsErrorMessage.text = message
+        binding.gradeStatisticsErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.gradeStatisticsProgress.visibility = if (show) View.VISIBLE else View.GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeStatisticsSwipe.isEnabled = enable
+        binding.gradeStatisticsSwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeStatisticsSwipe.isRefreshing = show
+        binding.gradeStatisticsSwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -262,7 +136,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     }
 
     override fun onParentReselected() {
-        //
+        presenter.onParentViewReselected()
     }
 
     override fun onParentChangeSemester() {
@@ -279,7 +153,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
 
     override fun onResume() {
         super.onResume()
-        gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
+        binding.gradeStatisticsTypeSwitch.setOnCheckedChangeListener { _, _ -> presenter.onTypeChange() }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -288,7 +162,7 @@ class GradeStatisticsFragment : BaseFragment(), GradeStatisticsView, GradeView.G
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
index bea70ea42..73cee9e96 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsPresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Subject
 import io.github.wulkanowy.data.repositories.gradestatistics.GradeStatisticsRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
@@ -9,12 +10,13 @@ import io.github.wulkanowy.data.repositories.subject.SubjectRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class GradeStatisticsPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val gradeStatisticsRepository: GradeStatisticsRepository,
@@ -22,7 +24,7 @@ class GradeStatisticsPresenter @Inject constructor(
     private val semesterRepository: SemesterRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<GradeStatisticsView>(errorHandler, studentRepository) {
 
     private var subjects = emptyList<Subject>()
 
@@ -45,20 +47,27 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         currentSemesterId = semesterId
         loadSubjects()
+        if (!forceRefresh) view?.showErrorView(false)
         loadDataByType(semesterId, currentSubjectName, currentType, forceRefresh)
     }
 
+    fun onParentViewReselected() {
+        view?.run {
+            if (!isViewEmpty) resetView()
+        }
+    }
+
     fun onParentViewChangeSemester() {
         view?.run {
             showProgress(true)
             enableSwipe(false)
             showRefresh(false)
-            showBarContent(false)
+            showContent(false)
             showErrorView(false)
             showEmpty(false)
             clearView()
         }
-        disposable.clear()
+        cancelJobs("load")
     }
 
     fun onSwipeRefresh() {
@@ -81,8 +90,7 @@ class GradeStatisticsPresenter @Inject constructor(
     fun onSubjectSelected(name: String?) {
         Timber.i("Select grade stats subject $name")
         view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -95,12 +103,11 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     fun onTypeChange() {
-        val type = view?.let { it.currentType } ?: ViewType.POINTS
+        val type = view?.currentType ?: ViewType.POINTS
         Timber.i("Select grade stats semester: $type")
-        disposable.clear()
+        cancelJobs("load")
         view?.run {
-            showBarContent(false)
-            showPieContent(false)
+            showContent(false)
             showProgress(true)
             enableSwipe(false)
             showEmpty(false)
@@ -111,111 +118,82 @@ class GradeStatisticsPresenter @Inject constructor(
     }
 
     private fun loadSubjects() {
-        Timber.i("Loading grade stats subjects started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { subjectRepository.getSubjects(it) }
-            .doOnSuccess { subjects = it }
-            .map { ArrayList(it.map { subject -> subject.name }) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                Timber.i("Loading grade stats subjects result: Success")
-                view?.run {
-                    updateSubjects(it)
-                    showSubjects(true)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            subjectRepository.getSubjects(student, semester)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading grade stats subjects started")
+                Status.SUCCESS -> {
+                    subjects = it.data!!
+
+                    Timber.i("Loading grade stats subjects result: Success")
+                    view?.run {
+                        view?.updateSubjects(ArrayList(it.data.map { subject -> subject.name }))
+                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    }
                 }
-            }, {
-                Timber.e("Loading grade stats subjects result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-        )
+                Status.ERROR -> {
+                    Timber.i("Loading grade stats subjects result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("subjects")
     }
 
     private fun loadDataByType(semesterId: Int, subjectName: String, type: ViewType, forceRefresh: Boolean = false) {
-        currentSubjectName = subjectName
+        currentSubjectName = if (preferencesRepository.showAllSubjectsOnStatisticsList) "Wszystkie" else subjectName
         currentType = type
-        when (type) {
-            ViewType.SEMESTER -> loadData(semesterId, subjectName, true, forceRefresh)
-            ViewType.PARTIAL -> loadData(semesterId, subjectName, false, forceRefresh)
-            ViewType.POINTS -> loadPointsData(semesterId, subjectName, forceRefresh)
-        }
-    }
 
-    private fun loadData(semesterId: Int, subjectName: String, isSemester: Boolean, forceRefresh: Boolean = false) {
-        Timber.i("Loading grade stats data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMap { gradeStatisticsRepository.getGradesStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, isSemester, forceRefresh) }
-            .map { list -> list.sortedByDescending { it.grade } }
-            .map { list -> list.filter { it.amount != 0 } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semesters = semesterRepository.getSemesters(student)
+            val semester = semesters.first { item -> item.semesterId == semesterId }
+
+            with(gradeStatisticsRepository) {
+                when (type) {
+                    ViewType.SEMESTER -> getGradesStatistics(student, semester, currentSubjectName, true, forceRefresh)
+                    ViewType.PARTIAL -> getGradesStatistics(student, semester, currentSubjectName, false, forceRefresh)
+                    ViewType.POINTS -> getGradesPointsStatistics(student, semester, currentSubjectName, forceRefresh)
                 }
             }
-            .subscribe({
-                Timber.i("Loading grade stats result: Success")
-                view?.run {
-                    showEmpty(it.isEmpty())
-                    showBarContent(false)
-                    showPieContent(it.isNotEmpty())
-                    showErrorView(false)
-                    updatePieData(it, preferencesRepository.gradeColorTheme)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading grade stats data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading grade stats result: Success")
+                    view?.run {
+                        showEmpty(it.data!!.isEmpty() || it.data.first().partial.isEmpty())
+                        showContent(it.data.isNotEmpty() && it.data.first().partial.isNotEmpty())
+                        showErrorView(false)
+                        updateData(it.data, preferencesRepository.gradeColorTheme, preferencesRepository.showAllSubjectsOnStatisticsList)
+                        showSubjects(!preferencesRepository.showAllSubjectsOnStatisticsList)
+                    }
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "grade_statistics",
+                        "items" to it.data!!.size
+                    )
                 }
-                analytics.logEvent("load_grade_statistics", "items" to it.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.e("Loading grade stats result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-    }
-
-    private fun loadPointsData(semesterId: Int, subjectName: String, forceRefresh: Boolean = false) {
-        Timber.i("Loading grade points stats data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it) }
-            .flatMapMaybe { gradeStatisticsRepository.getGradesPointsStatistics(it.first { item -> item.semesterId == semesterId }, subjectName, forceRefresh) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
+                Status.ERROR -> {
+                    Timber.i("Loading grade stats result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
             }
-            .subscribe({
-                Timber.i("Loading grade points stats result: Success")
-                view?.run {
-                    showEmpty(false)
-                    showPieContent(false)
-                    showBarContent(true)
-                    showErrorView(false)
-                    updateBarData(it)
-                }
-                analytics.logEvent("load_grade_points_statistics", "force_refresh" to forceRefresh)
-            }, {
-                Timber.e("Loading grade points stats result: An exception occurred")
-                errorHandler.dispatch(it)
-            }, {
-                Timber.d("Loading grade points stats result: No point stats found")
-                view?.run {
-                    showBarContent(false)
-                    showEmpty(true)
-                }
-            })
-        )
+        }.afterLoading {
+            view?.run {
+                showRefresh(false)
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded(semesterId)
+            }
+        }.launch("load")
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
-            if ((isBarViewEmpty && currentType == ViewType.POINTS) || (isPieViewEmpty) && currentType != ViewType.POINTS) {
+            if (isViewEmpty) {
                 lastError = error
                 setErrorDetails(message)
                 showErrorView(true)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
index 003520fbd..26b4a119a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/GradeStatisticsView.kt
@@ -1,14 +1,11 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-import io.github.wulkanowy.data.db.entities.GradePointsStatistics
-import io.github.wulkanowy.data.db.entities.GradeStatistics
+import io.github.wulkanowy.data.pojos.GradeStatisticsItem
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeStatisticsView : BaseView {
 
-    val isPieViewEmpty: Boolean
-
-    val isBarViewEmpty: Boolean
+    val isViewEmpty: Boolean
 
     val currentType: ViewType
 
@@ -16,9 +13,7 @@ interface GradeStatisticsView : BaseView {
 
     fun updateSubjects(data: ArrayList<String>)
 
-    fun updatePieData(items: List<GradeStatistics>, theme: String)
-
-    fun updateBarData(item: GradePointsStatistics)
+    fun updateData(items: List<GradeStatisticsItem>, theme: String, showAllSubjectsOnStatisticsList: Boolean)
 
     fun showSubjects(show: Boolean)
 
@@ -28,9 +23,9 @@ interface GradeStatisticsView : BaseView {
 
     fun clearView()
 
-    fun showPieContent(show: Boolean)
+    fun resetView()
 
-    fun showBarContent(show: Boolean)
+    fun showContent(show: Boolean)
 
     fun showEmpty(show: Boolean)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
index 08c37d587..02e95b0e5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/statistics/ViewType.kt
@@ -1,7 +1,7 @@
 package io.github.wulkanowy.ui.modules.grade.statistics
 
-enum class ViewType {
-    SEMESTER,
-    PARTIAL,
-    POINTS
+enum class ViewType(val id: Int) {
+    SEMESTER(1),
+    PARTIAL(2),
+    POINTS(3)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
new file mode 100644
index 000000000..ccebe94f0
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryAdapter.kt
@@ -0,0 +1,85 @@
+package io.github.wulkanowy.ui.modules.grade.summary
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.databinding.ItemGradeSummaryBinding
+import io.github.wulkanowy.databinding.ScrollableHeaderGradeSummaryBinding
+import io.github.wulkanowy.utils.calcAverage
+import java.util.Locale
+import javax.inject.Inject
+
+class GradeSummaryAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
+    }
+
+    var items = emptyList<GradeSummary>()
+
+    override fun getItemCount() = items.size + if (items.isNotEmpty()) 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.HEADER.id
+        else -> ViewType.ITEM.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.HEADER.id -> HeaderViewHolder(ScrollableHeaderGradeSummaryBinding.inflate(inflater, parent, false))
+            ViewType.ITEM.id -> ItemViewHolder(ItemGradeSummaryBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position - 1])
+        }
+    }
+
+    private fun bindHeaderViewHolder(binding: ScrollableHeaderGradeSummaryBinding) {
+        if (items.isEmpty()) return
+
+        with(binding) {
+            gradeSummaryScrollableHeaderFinal.text = formatAverage(items.calcAverage())
+            gradeSummaryScrollableHeaderCalculated.text = formatAverage(items
+                .filter { value -> value.average != 0.0 }
+                .map { values -> values.average }
+                .reversed() // fix average precision
+                .average()
+            )
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindItemViewHolder(binding: ItemGradeSummaryBinding, item: GradeSummary) {
+        with(binding) {
+            gradeSummaryItemTitle.text = item.subject
+            gradeSummaryItemPoints.text = item.pointsSum
+            gradeSummaryItemAverage.text = formatAverage(item.average, "")
+            gradeSummaryItemPredicted.text = "${item.predictedGrade} ${item.proposedPoints}".trim()
+            gradeSummaryItemFinal.text = "${item.finalGrade} ${item.finalPoints}".trim()
+
+            gradeSummaryItemPointsContainer.visibility = if (item.pointsSum.isBlank()) View.GONE else View.VISIBLE
+        }
+    }
+
+    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
+        return if (average == 0.0) defaultValue
+        else String.format(Locale.FRANCE, "%.2f", average)
+    }
+
+    private class HeaderViewHolder(val binding: ScrollableHeaderGradeSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class ItemViewHolder(val binding: ItemGradeSummaryBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
index 05fde5227..4d12dcd50 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryFragment.kt
@@ -1,36 +1,37 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.github.wulkanowy.databinding.FragmentGradeSummaryBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.grade.GradeFragment
 import io.github.wulkanowy.ui.modules.grade.GradeView
-import kotlinx.android.synthetic.main.fragment_grade_summary.*
 import javax.inject.Inject
 
-class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeChildView {
+@AndroidEntryPoint
+class GradeSummaryFragment :
+    BaseFragment<FragmentGradeSummaryBinding>(R.layout.fragment_grade_summary), GradeSummaryView,
+    GradeView.GradeChildView {
 
     @Inject
     lateinit var presenter: GradeSummaryPresenter
 
     @Inject
-    lateinit var gradeSummaryAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var gradeSummaryAdapter: GradeSummaryAdapter
 
     companion object {
         fun newInstance() = GradeSummaryFragment()
     }
 
     override val isViewEmpty
-        get() = gradeSummaryAdapter.isEmpty
+        get() = gradeSummaryAdapter.items.isEmpty()
 
     override val predictedString
         get() = getString(R.string.grade_summary_predicted_grade)
@@ -38,70 +39,69 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
     override val finalString
         get() = getString(R.string.grade_summary_final_grade)
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_grade_summary, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = gradeSummaryRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentGradeSummaryBinding.bind(view)
+        messageContainer = binding.gradeSummaryRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        gradeSummaryAdapter.setDisplayHeadersAtStartUp(true)
-
-        gradeSummaryRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.gradeSummaryRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = gradeSummaryAdapter
         }
-        gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
-        gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            gradeSummarySwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            gradeSummaryErrorRetry.setOnClickListener { presenter.onRetry() }
+            gradeSummaryErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
-    override fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader) {
-        gradeSummaryAdapter.apply {
-            updateDataSet(data, true)
-            removeAllScrollableHeaders()
-            addScrollableHeader(header)
+    override fun updateData(data: List<GradeSummary>) {
+        with(gradeSummaryAdapter) {
+            items = data
+            notifyDataSetChanged()
         }
     }
 
     override fun clearView() {
-        gradeSummaryAdapter.clear()
+        with(gradeSummaryAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun resetView() {
-        gradeSummaryRecycler.scrollToPosition(0)
+        binding.gradeSummaryRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeSummaryRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeSummaryEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
+        binding.gradeSummaryError.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun setErrorDetails(message: String) {
-        gradeSummaryErrorMessage.text = message
+        binding.gradeSummaryErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
+        binding.gradeSummaryProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        gradeSummarySwipe.isEnabled = enable
+        binding.gradeSummarySwipe.isEnabled = enable
     }
 
     override fun showRefresh(show: Boolean) {
-        gradeSummarySwipe.isRefreshing = show
+        binding.gradeSummarySwipe.isRefreshing = show
     }
 
     override fun onParentLoadData(semesterId: Int, forceRefresh: Boolean) {
@@ -125,7 +125,7 @@ class GradeSummaryFragment : BaseFragment(), GradeSummaryView, GradeView.GradeCh
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
deleted file mode 100644
index 95c32d176..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryItem.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.annotation.SuppressLint
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.GradeSummary
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_grade_summary.*
-
-class GradeSummaryItem(
-    val summary: GradeSummary,
-    private val average: String
-) : AbstractFlexibleItem<GradeSummaryItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_grade_summary
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.run {
-            gradeSummaryItemTitle.text = summary.subject
-            gradeSummaryItemPoints.text = summary.pointsSum
-            gradeSummaryItemAverage.text = average
-            gradeSummaryItemPredicted.text = "${summary.predictedGrade} ${summary.proposedPoints}".trim()
-            gradeSummaryItemFinal.text = "${summary.finalGrade} ${summary.finalPoints}".trim()
-
-            gradeSummaryItemPointsContainer.visibility = if (summary.pointsSum.isBlank()) GONE else VISIBLE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryItem
-
-        if (average != other.average) return false
-        if (summary != other.summary) return false
-        if (summary.id != other.summary.id) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = summary.hashCode()
-        result = 31 * result + summary.id.hashCode()
-        result = 31 * result + average.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
index 1aaa9d097..caa3cb84d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryPresenter.kt
@@ -1,29 +1,25 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.grade.GradeAverageProvider
+import io.github.wulkanowy.ui.modules.grade.GradeDetailsWithAverage
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.calcAverage
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.lang.String.format
-import java.util.Locale.FRANCE
 import javax.inject.Inject
 
 class GradeSummaryPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
-    private val gradeSummaryRepository: GradeSummaryRepository,
-    private val semesterRepository: SemesterRepository,
     private val averageProvider: GradeAverageProvider,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<GradeSummaryView>(errorHandler, studentRepository) {
 
     private lateinit var lastError: Throwable
 
@@ -35,38 +31,46 @@ class GradeSummaryPresenter @Inject constructor(
 
     fun onParentViewLoadData(semesterId: Int, forceRefresh: Boolean) {
         Timber.i("Loading grade summary data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getSemesters(it).map { semesters -> it to semesters } }
-            .flatMap { (student, semesters) ->
-                gradeSummaryRepository.getGradesSummary(semesters.first { it.semesterId == semesterId }, forceRefresh)
-                    .map { it.sortedBy { subject -> subject.subject } }
-                    .flatMap { gradesSummary ->
-                        averageProvider.getGradeAverage(student, semesters, semesterId, forceRefresh)
-                            .map { averages -> createGradeSummaryItemsAndHeader(gradesSummary, averages) }
+
+        loadData(semesterId, forceRefresh)
+        if (!forceRefresh) view?.showErrorView(false)
+    }
+
+    private fun loadData(semesterId: Int, forceRefresh: Boolean) {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            averageProvider.getGradesDetailsWithAverage(student, semesterId, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading grade summary started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading grade summary result: Success")
+                    val items = createGradeSummaryItems(it.data!!)
+                    view?.run {
+                        showEmpty(items.isEmpty())
+                        showContent(items.isNotEmpty())
+                        showErrorView(false)
+                        updateData(items)
                     }
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "grade_summary",
+                        "items" to it.data.size
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading grade summary result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
             }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showRefresh(false)
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded(semesterId)
-                }
-            }.subscribe({ (gradeSummaryItems, gradeSummaryHeader) ->
-                Timber.i("Loading grade summary result: Success")
-                view?.run {
-                    showEmpty(gradeSummaryItems.isEmpty())
-                    showContent(gradeSummaryItems.isNotEmpty())
-                    showErrorView(false)
-                    updateData(gradeSummaryItems, gradeSummaryHeader)
-                }
-                analytics.logEvent("load_grade_summary", "items" to gradeSummaryItems.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.i("Loading grade summary result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
+        }.afterLoading {
+            view?.run {
+                showRefresh(false)
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded(semesterId)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -112,35 +116,22 @@ class GradeSummaryPresenter @Inject constructor(
             showEmpty(false)
             clearView()
         }
-        disposable.clear()
+        cancelJobs("load")
     }
 
-    private fun createGradeSummaryItemsAndHeader(gradesSummary: List<GradeSummary>, averages: Map<String, Double>)
-        : Pair<List<GradeSummaryItem>, GradeSummaryScrollableHeader> {
-        return averages.filterValues { value -> value != 0.0 }
-            .let { filteredAverages ->
-                gradesSummary.filter { !checkEmpty(it, filteredAverages) }
-                    .map {
-                        GradeSummaryItem(
-                            summary = it,
-                            average = formatAverage(filteredAverages.getOrElse(it.subject) { 0.0 }, "")
-                        )
-                    }.let {
-                        it to GradeSummaryScrollableHeader(
-                            formatAverage(gradesSummary.calcAverage()),
-                            formatAverage(filteredAverages.values.average()))
-                    }
-            }
+    private fun createGradeSummaryItems(items: List<GradeDetailsWithAverage>): List<GradeSummary> {
+        return items
+            .filter { !checkEmpty(it) }
+            .sortedBy { it.subject }
+            .map { it.summary.copy(average = it.average) }
     }
 
-    private fun checkEmpty(gradeSummary: GradeSummary, averages: Map<String, Double>): Boolean {
+    private fun checkEmpty(gradeSummary: GradeDetailsWithAverage): Boolean {
         return gradeSummary.run {
-            finalGrade.isBlank() && predictedGrade.isBlank() && averages[subject] == null
+            summary.finalGrade.isBlank()
+                && summary.predictedGrade.isBlank()
+                && average == .0
+                && points.isBlank()
         }
     }
-
-    private fun formatAverage(average: Double, defaultValue: String = "-- --"): String {
-        return if (average == 0.0) defaultValue
-        else format(FRANCE, "%.2f", average)
-    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
deleted file mode 100644
index f1c535c71..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryScrollableHeader.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.grade.summary
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.scrollable_header_grade_summary.*
-
-class GradeSummaryScrollableHeader(private val finalAverage: String, private val calculatedAverage: String)
-    : AbstractFlexibleItem<GradeSummaryScrollableHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.scrollable_header_grade_summary
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: ViewHolder?,
-                                position: Int, payloads: MutableList<Any>?) {
-        holder?.apply {
-            gradeSummaryScrollableHeaderFinal.text = finalAverage
-            gradeSummaryScrollableHeaderCalculated.text = calculatedAverage
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as GradeSummaryScrollableHeader
-
-        if (calculatedAverage != other.calculatedAverage) return false
-        if (finalAverage != other.finalAverage) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = calculatedAverage.hashCode()
-        result = 31 * result + finalAverage.hashCode()
-        return result
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-            LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
index cf3184873..974d91415 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/summary/GradeSummaryView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.grade.summary
 
+import io.github.wulkanowy.data.db.entities.GradeSummary
 import io.github.wulkanowy.ui.base.BaseView
 
 interface GradeSummaryView : BaseView {
@@ -12,7 +13,7 @@ interface GradeSummaryView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<GradeSummaryItem>, header: GradeSummaryScrollableHeader)
+    fun updateData(data: List<GradeSummary>)
 
     fun resetView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
new file mode 100644
index 000000000..8ae06aeb5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkAdapter.kt
@@ -0,0 +1,67 @@
+package io.github.wulkanowy.ui.modules.homework
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.HeaderHomeworkBinding
+import io.github.wulkanowy.databinding.ItemHomeworkBinding
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import java.time.LocalDate
+import javax.inject.Inject
+
+class HomeworkAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var items = emptyList<HomeworkItem<*>>()
+
+    var onClickListener: (Homework) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = items[position].viewType.id
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            HomeworkItem.ViewType.HEADER.id -> HeaderViewHolder(HeaderHomeworkBinding.inflate(inflater, parent, false))
+            HomeworkItem.ViewType.ITEM.id -> ItemViewHolder(ItemHomeworkBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is HeaderViewHolder -> bindHeaderViewHolder(holder.binding, items[position].value as LocalDate)
+            is ItemViewHolder -> bindItemViewHolder(holder.binding, items[position].value as Homework)
+        }
+    }
+
+    @SuppressLint("DefaultLocale")
+    private fun bindHeaderViewHolder(binding: HeaderHomeworkBinding, date: LocalDate) {
+        with(binding) {
+            homeworkHeaderDay.text = date.weekDayName.capitalize()
+            homeworkHeaderDate.text = date.toFormattedString()
+        }
+    }
+
+    private fun bindItemViewHolder(binding: ItemHomeworkBinding, homework: Homework) {
+        with(binding) {
+            homeworkItemSubject.text = homework.subject
+            homeworkItemTeacher.text = homework.teacher
+            homeworkItemContent.text = homework.content
+            homeworkItemCheckImage.visibility = if (homework.isDone) View.VISIBLE else View.GONE
+            homeworkItemAttachmentImage.visibility = if (!homework.isDone && homework.attachments.isNotEmpty()) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(homework) }
+        }
+    }
+
+    class HeaderViewHolder(val binding: HeaderHomeworkBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class ItemViewHolder(val binding: ItemHomeworkBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
deleted file mode 100644
index 427841886..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkDialog.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_homework.*
-
-class HomeworkDialog : DialogFragment() {
-
-    private lateinit var homework: Homework
-
-    companion object {
-        private const val ARGUMENT_KEY = "Item"
-
-        fun newInstance(homework: Homework): HomeworkDialog {
-            return HomeworkDialog().apply {
-                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, 0)
-        arguments?.run {
-            homework = getSerializable(HomeworkDialog.ARGUMENT_KEY) as Homework
-        }
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_homework, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-
-        homeworkDialogDate.text = homework.date.toFormattedString()
-        homeworkDialogEntryDate.text = homework.entryDate.toFormattedString()
-        homeworkDialogSubject.text = homework.subject
-        homeworkDialogTeacher.text = homework.teacher
-        homeworkDialogContent.text = homework.content
-        homeworkDialogClose.setOnClickListener { dismiss() }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
index 3f8f1359a..e1d7ac52f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkFragment.kt
@@ -1,32 +1,31 @@
 package io.github.wulkanowy.ui.modules.homework
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.FragmentHomeworkBinding
 import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.homework.details.HomeworkDetailsDialog
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_homework.*
 import javax.inject.Inject
 
-class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
+@AndroidEntryPoint
+class HomeworkFragment : BaseFragment<FragmentHomeworkBinding>(R.layout.fragment_homework),
+    HomeworkView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: HomeworkPresenter
 
     @Inject
-    lateinit var homeworkAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var homeworkAdapter: HomeworkAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -36,89 +35,92 @@ class HomeworkFragment : BaseFragment(), HomeworkView, MainView.TitledView {
 
     override val titleStringId get() = R.string.homework_title
 
-    override val isViewEmpty get() = homeworkAdapter.isEmpty
+    override val isViewEmpty get() = homeworkAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_homework, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = homeworkRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentHomeworkBinding.bind(view)
+        messageContainer = binding.homeworkRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        homeworkAdapter.setOnItemClickListener(presenter::onHomeworkItemSelected)
+        homeworkAdapter.onClickListener = presenter::onHomeworkItemSelected
 
-        with(homeworkRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.homeworkRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = homeworkAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false))
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
-        homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            homeworkSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            homeworkErrorRetry.setOnClickListener { presenter.onRetry() }
+            homeworkErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        homeworkNextButton.setOnClickListener { presenter.onNextDay() }
+            homeworkPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            homeworkNextButton.setOnClickListener { presenter.onNextDay() }
 
-        homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+            homeworkNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+        }
     }
 
-    override fun updateData(data: List<HomeworkItem>) {
-        homeworkAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<HomeworkItem<*>>) {
+        with(homeworkAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun clearData() {
-        homeworkAdapter.clear()
+        with(homeworkAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationWeek(date: String) {
-        homeworkNavDate.text = date
+        binding.homeworkNavDate.text = date
     }
 
     override fun hideRefresh() {
-        homeworkSwipe.isRefreshing = false
+        binding.homeworkSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        homeworkEmpty.visibility = if (show) VISIBLE else GONE
+        binding.homeworkEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        homeworkError.visibility = if (show) VISIBLE else GONE
+        binding.homeworkError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        homeworkErrorMessage.text = message
+        binding.homeworkErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        homeworkProgress.visibility = if (show) VISIBLE else GONE
+        binding.homeworkProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        homeworkSwipe.isEnabled = enable
+        binding.homeworkSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        homeworkRecycler.visibility = if (show) VISIBLE else GONE
+        binding.homeworkRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        binding.homeworkPreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        binding.homeworkNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(homework: Homework) {
-        (activity as? MainActivity)?.showDialogFragment(HomeworkDialog.newInstance(homework))
+        (activity as? MainActivity)?.showDialogFragment(HomeworkDetailsDialog.newInstance(homework))
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
deleted file mode 100644
index 490237883..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkHeader.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package io.github.wulkanowy.ui.modules.homework
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.ExpandableViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.utils.toFormattedString
-import io.github.wulkanowy.utils.weekDayName
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.header_homework.*
-import org.threeten.bp.LocalDate
-
-class HomeworkHeader(private val date: LocalDate) : AbstractHeaderItem<HomeworkHeader.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.header_homework
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(
-        adapter: FlexibleAdapter<IFlexible<*>>?, holder: HomeworkHeader.ViewHolder,
-        position: Int, payloads: MutableList<Any>?
-    ) {
-        holder.run {
-            homeworkHeaderDay.text = date.weekDayName.capitalize()
-            homeworkHeaderDate.text = date.toFormattedString()
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as HomeworkHeader
-
-        if (date != other.date) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return date.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : ExpandableViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
index 2de9233f2..7e0039583 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkItem.kt
@@ -1,50 +1,9 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractSectionableItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Homework
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_homework.*
+data class HomeworkItem<out T>(val value: T, val viewType: ViewType) {
 
-class HomeworkItem(header: HomeworkHeader, val homework: Homework) :
-    AbstractSectionableItem<HomeworkItem.ViewHolder, HomeworkHeader>(header) {
-
-    override fun getLayoutRes() = R.layout.item_homework
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            homeworkItemSubject.text = homework.subject
-            homeworkItemTeacher.text = homework.teacher
-            homeworkItemContent.text = homework.content
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as HomeworkItem
-
-        if (homework != other.homework) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = homework.hashCode()
-        result = 31 * result + homework.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
+    enum class ViewType(val id: Int) {
+        HEADER(1),
+        ITEM(2)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
index 7e1da314b..8af0d83f6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.homework
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Homework
 import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,27 +8,29 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.github.wulkanowy.utils.friday
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.monday
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.sunday
 import io.github.wulkanowy.utils.toFormattedString
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.ofEpochDay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
+import java.time.LocalDate
+import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class HomeworkPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val homeworkRepository: HomeworkRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<HomeworkView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<HomeworkView>(errorHandler, studentRepository) {
 
     private var baseDate: LocalDate = LocalDate.now().nextOrSameSchoolDay
 
@@ -74,62 +76,60 @@ class HomeworkPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onHomeworkItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is HomeworkItem) {
-            Timber.i("Select homework item ${item.homework.id}")
-            view?.showTimetableDialog(item.homework)
-        }
+    fun onHomeworkItemSelected(homework: Homework) {
+        Timber.i("Select homework item ${homework.id}")
+        view?.showTimetableDialog(homework)
     }
 
     private fun setBaseDateOnHolidays() {
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-                currentDate = baseDate
-                reloadNavigation()
-            }) {
-                Timber.i("Loading semester result: An exception occurred")
-            })
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            currentDate = baseDate
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
-        Timber.i("Loading homework data started")
         currentDate = date
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .delay(200, TimeUnit.MILLISECONDS)
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMap { homeworkRepository.getHomework(it, currentDate, currentDate, forceRefresh) }
-                .map { it.groupBy { homework -> homework.date }.toSortedMap() }
-                .map { createHomeworkItem(it) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            homeworkRepository.getHomework(student, semester, date, date, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading homework data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading homework result: Success")
                     view?.apply {
-                        updateData(it)
-                        showEmpty(it.isEmpty())
+                        updateData(createHomeworkItem(it.data!!))
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(it.isNotEmpty())
+                        showContent(it.data.isNotEmpty())
                     }
-                    analytics.logEvent("load_homework", "items" to it.size, "force_refresh" to forceRefresh)
-                }) {
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "homework",
+                        "items" to it.data!!.size
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Loading homework result: An exception occurred")
-
-                    errorHandler.dispatch(it)
-                })
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -143,12 +143,12 @@ class HomeworkPresenter @Inject constructor(
         }
     }
 
-    private fun createHomeworkItem(items: Map<LocalDate, List<Homework>>): List<HomeworkItem> {
-        return items.flatMap {
-            HomeworkHeader(it.key).let { header ->
-                it.value.reversed().map { item -> HomeworkItem(header, item) }
+    private fun createHomeworkItem(items: List<Homework>): List<HomeworkItem<*>> {
+        return items.groupBy { it.date }.toSortedMap().map { (date, exams) ->
+            listOf(HomeworkItem(date, HomeworkItem.ViewType.HEADER)) + exams.reversed().map { exam ->
+                HomeworkItem(exam, HomeworkItem.ViewType.ITEM)
             }
-        }
+        }.flatten()
     }
 
     private fun reloadView() {
@@ -169,7 +169,7 @@ class HomeworkPresenter @Inject constructor(
             showPreButton(!currentDate.minusDays(7).isHolidays)
             showNextButton(!currentDate.plusDays(7).isHolidays)
             updateNavigationWeek("${currentDate.monday.toFormattedString("dd.MM")} - " +
-                currentDate.friday.toFormattedString("dd.MM"))
+                currentDate.sunday.toFormattedString("dd.MM"))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
index 1d241df46..2a678cd4c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/HomeworkView.kt
@@ -9,7 +9,7 @@ interface HomeworkView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<HomeworkItem>)
+    fun updateData(data: List<HomeworkItem<*>>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
new file mode 100644
index 000000000..cd9a7e851
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsAdapter.kt
@@ -0,0 +1,106 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentBinding
+import io.github.wulkanowy.databinding.ItemHomeworkDialogAttachmentsHeaderBinding
+import io.github.wulkanowy.databinding.ItemHomeworkDialogDetailsBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class HomeworkDetailsAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        DETAILS(1),
+        ATTACHMENTS_HEADER(2),
+        ATTACHMENT(3)
+    }
+
+    private var attachments = emptyList<Pair<String, String>>()
+
+    var homework: Homework? = null
+        set(value) {
+            field = value
+            attachments = value?.attachments.orEmpty()
+        }
+
+    var isHomeworkFullscreen = false
+
+    var onAttachmentClickListener: (url: String) -> Unit = {}
+
+    var onFullScreenClickListener = {}
+
+    var onFullScreenExitClickListener = {}
+
+    override fun getItemCount() = 1 + if (attachments.isNotEmpty()) attachments.size + 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.DETAILS.id
+        1 -> ViewType.ATTACHMENTS_HEADER.id
+        else -> ViewType.ATTACHMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ATTACHMENTS_HEADER.id -> AttachmentsHeaderViewHolder(ItemHomeworkDialogAttachmentsHeaderBinding.inflate(inflater, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemHomeworkDialogAttachmentBinding.inflate(inflater, parent, false))
+            else -> DetailsViewHolder(ItemHomeworkDialogDetailsBinding.inflate(inflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is DetailsViewHolder -> bindDetailsViewHolder(holder)
+            is AttachmentViewHolder -> bindAttachmentViewHolder(holder, position - 2)
+        }
+    }
+
+    private fun bindDetailsViewHolder(holder: DetailsViewHolder) {
+        with(holder.binding) {
+            homeworkDialogDate.text = homework?.date?.toFormattedString()
+            homeworkDialogEntryDate.text = homework?.entryDate?.toFormattedString()
+            homeworkDialogSubject.text = homework?.subject
+            homeworkDialogTeacher.text = homework?.teacher
+            homeworkDialogContent.text = homework?.content
+            homeworkDialogFullScreen.visibility = if (isHomeworkFullscreen) GONE else VISIBLE
+            homeworkDialogFullScreenExit.visibility = if (isHomeworkFullscreen) VISIBLE else GONE
+            homeworkDialogFullScreen.setOnClickListener {
+                homeworkDialogFullScreen.visibility = GONE
+                homeworkDialogFullScreenExit.visibility = VISIBLE
+                onFullScreenClickListener()
+            }
+            homeworkDialogFullScreenExit.setOnClickListener {
+                homeworkDialogFullScreen.visibility = VISIBLE
+                homeworkDialogFullScreenExit.visibility = GONE
+                onFullScreenExitClickListener()
+            }
+        }
+    }
+
+    private fun bindAttachmentViewHolder(holder: AttachmentViewHolder, position: Int) {
+        val item = attachments[position]
+
+        with(holder.binding) {
+            homeworkDialogAttachment.text = item.second
+            root.setOnClickListener {
+                onAttachmentClickListener(item.first)
+            }
+        }
+    }
+
+    class DetailsViewHolder(val binding: ItemHomeworkDialogDetailsBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentsHeaderViewHolder(val binding: ItemHomeworkDialogAttachmentsHeaderBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentViewHolder(val binding: ItemHomeworkDialogAttachmentBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
new file mode 100644
index 000000000..aecaa394d
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsDialog.kt
@@ -0,0 +1,97 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.databinding.DialogHomeworkBinding
+import io.github.wulkanowy.ui.base.BaseDialogFragment
+import io.github.wulkanowy.utils.openInternetBrowser
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class HomeworkDetailsDialog : BaseDialogFragment<DialogHomeworkBinding>(), HomeworkDetailsView {
+
+    @Inject
+    lateinit var presenter: HomeworkDetailsPresenter
+
+    @Inject
+    lateinit var detailsAdapter: HomeworkDetailsAdapter
+
+    private lateinit var homework: Homework
+
+    companion object {
+        private const val ARGUMENT_KEY = "Item"
+
+        fun newInstance(homework: Homework): HomeworkDetailsDialog {
+            return HomeworkDetailsDialog().apply {
+                arguments = Bundle().apply { putSerializable(ARGUMENT_KEY, homework) }
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NO_TITLE, 0)
+        arguments?.run {
+            homework = getSerializable(ARGUMENT_KEY) as Homework
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return DialogHomeworkBinding.inflate(inflater).apply { binding = this }.root
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        presenter.onAttachView(this)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun initView() {
+        with(binding) {
+            homeworkDialogRead.text = view?.context?.getString(if (homework.isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+            homeworkDialogRead.setOnClickListener { presenter.toggleDone(homework) }
+            homeworkDialogClose.setOnClickListener { dismiss() }
+        }
+
+        if (presenter.isHomeworkFullscreen) {
+            dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT)
+        } else {
+            dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT)
+        }
+
+        with(binding.homeworkDialogRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = detailsAdapter.apply {
+                onAttachmentClickListener = { context.openInternetBrowser(it, ::showMessage) }
+                onFullScreenClickListener = {
+                    dialog?.window?.setLayout(MATCH_PARENT, MATCH_PARENT)
+                    presenter.isHomeworkFullscreen = true
+                }
+                onFullScreenExitClickListener = {
+                    dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT)
+                    presenter.isHomeworkFullscreen = false
+                }
+                isHomeworkFullscreen = presenter.isHomeworkFullscreen
+                homework = this@HomeworkDetailsDialog.homework
+            }
+        }
+    }
+
+    override fun updateMarkAsDoneLabel(isDone: Boolean) {
+        binding.homeworkDialogRead.text = view?.context?.getString(if (isDone) R.string.homework_mark_as_undone else R.string.homework_mark_as_done)
+    }
+
+    override fun onDestroyView() {
+        presenter.onDetachView()
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
new file mode 100644
index 000000000..e485dd748
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsPresenter.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.Homework
+import io.github.wulkanowy.data.repositories.homework.HomeworkRepository
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class HomeworkDetailsPresenter @Inject constructor(
+    errorHandler: ErrorHandler,
+    studentRepository: StudentRepository,
+    private val homeworkRepository: HomeworkRepository,
+    private val analytics: FirebaseAnalyticsHelper,
+    private val preferencesRepository: PreferencesRepository
+) : BasePresenter<HomeworkDetailsView>(errorHandler, studentRepository) {
+
+    var isHomeworkFullscreen
+        get() = preferencesRepository.isHomeworkFullscreen
+        set(value) {
+            preferencesRepository.isHomeworkFullscreen = value
+        }
+
+    override fun onAttachView(view: HomeworkDetailsView) {
+        super.onAttachView(view)
+        view.initView()
+        Timber.i("Homework details view was initialized")
+    }
+
+    fun toggleDone(homework: Homework) {
+        flowWithResource { homeworkRepository.toggleDone(homework) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Homework details update start")
+                Status.SUCCESS -> {
+                    Timber.i("Homework details update: Success")
+                    view?.updateMarkAsDoneLabel(homework.isDone)
+                    analytics.logEvent("homework_mark_as_done")
+                }
+                Status.ERROR -> {
+                    Timber.i("Homework details update result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("toggle")
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
new file mode 100644
index 000000000..697f22335
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/homework/details/HomeworkDetailsView.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.ui.modules.homework.details
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface HomeworkDetailsView : BaseView {
+
+    fun initView()
+
+    fun updateMarkAsDoneLabel(isDone: Boolean)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
index 455d1e8ec..aff1c84ca 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginActivity.kt
@@ -4,40 +4,57 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.ActivityLoginBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
 import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
+import io.github.wulkanowy.ui.modules.login.recover.LoginRecoverFragment
 import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
 import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
+import io.github.wulkanowy.utils.UpdateHelper
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.activity_login.*
 import javax.inject.Inject
 
-class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
+@AndroidEntryPoint
+class LoginActivity : BaseActivity<LoginPresenter, ActivityLoginBinding>(), LoginView {
 
     @Inject
     override lateinit var presenter: LoginPresenter
 
+    private val loginAdapter = BaseFragmentPagerAdapter(supportFragmentManager)
+
     @Inject
-    lateinit var loginAdapter: BaseFragmentPagerAdapter
+    lateinit var updateHelper: UpdateHelper
 
     companion object {
 
         fun getStartIntent(context: Context) = Intent(context, LoginActivity::class.java)
     }
 
-    override val currentViewIndex get() = loginViewpager.currentItem
+    override val currentViewIndex get() = binding.loginViewpager.currentItem
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login)
-        setSupportActionBar(loginToolbar)
-        messageContainer = loginContainer
+        setContentView(ActivityLoginBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.loginToolbar)
+        messageContainer = binding.loginContainer
+        updateHelper.messageContainer = binding.loginContainer
 
         presenter.onAttachView(this)
+        updateHelper.checkAndInstallUpdates(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        updateHelper.onResume(this)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        updateHelper.onActivityResult(requestCode, resultCode)
     }
 
     override fun initView() {
@@ -47,16 +64,17 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
         }
 
         with(loginAdapter) {
-            containerId = loginViewpager.id
+            containerId = binding.loginViewpager.id
             addFragments(listOf(
                 LoginFormFragment.newInstance(),
                 LoginSymbolFragment.newInstance(),
                 LoginStudentSelectFragment.newInstance(),
-                LoginAdvancedFragment.newInstance()
+                LoginAdvancedFragment.newInstance(),
+                LoginRecoverFragment.newInstance()
             ))
         }
 
-        with(loginViewpager) {
+        with(binding.loginViewpager) {
             offscreenPageLimit = 2
             adapter = loginAdapter
             setOnSelectPageListener(presenter::onViewSelected)
@@ -69,7 +87,7 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
     }
 
     override fun switchView(index: Int) {
-        loginViewpager.setCurrentItem(index, false)
+        binding.loginViewpager.setCurrentItem(index, false)
     }
 
     override fun showActionBar(show: Boolean) {
@@ -84,19 +102,23 @@ class LoginActivity : BaseActivity<LoginPresenter>(), LoginView {
         (loginAdapter.getFragmentInstance(1) as? LoginSymbolFragment)?.onParentInitSymbolFragment(loginData)
     }
 
-    override fun notifyInitStudentSelectFragment(students: List<Student>) {
-        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(students)
+    override fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
+        (loginAdapter.getFragmentInstance(2) as? LoginStudentSelectFragment)?.onParentInitStudentSelectFragment(studentsWithSemesters)
     }
 
-    fun onFormFragmentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
-        presenter.onFormViewAccountLogged(students, loginData)
+    fun onFormFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
+        presenter.onFormViewAccountLogged(studentsWithSemesters, loginData)
     }
 
-    fun onSymbolFragmentAccountLogged(students: List<Student>) {
-        presenter.onSymbolViewAccountLogged(students)
+    fun onSymbolFragmentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+        presenter.onSymbolViewAccountLogged(studentsWithSemesters)
     }
 
     fun onAdvancedLoginClick() {
         presenter.onAdvancedLoginClick()
     }
+
+    fun onRecoverClick() {
+        presenter.onRecoverClick()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
index 75a0ba6a6..f30825cff 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginErrorHandler.kt
@@ -2,20 +2,20 @@ package io.github.wulkanowy.ui.modules.login
 
 import android.content.res.Resources
 import android.database.sqlite.SQLiteConstraintException
-import com.readystatesoftware.chuck.api.ChuckCollector
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.R
-import io.github.wulkanowy.sdk.exception.BadCredentialsException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidPinException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidSymbolException
 import io.github.wulkanowy.sdk.mobile.exception.InvalidTokenException
 import io.github.wulkanowy.sdk.mobile.exception.TokenDeadException
+import io.github.wulkanowy.sdk.scrapper.login.BadCredentialsException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
 class LoginErrorHandler @Inject constructor(
     resources: Resources,
-    chuckCollector: ChuckCollector
-) : ErrorHandler(resources, chuckCollector) {
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onBadCredentials: () -> Unit = {}
 
@@ -43,5 +43,8 @@ class LoginErrorHandler @Inject constructor(
         super.clear()
         onBadCredentials = {}
         onStudentDuplicate = {}
+        onInvalidToken = {}
+        onInvalidPin = {}
+        onInvalidSymbol = {}
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
deleted file mode 100644
index 28339a467..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginModule.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.github.wulkanowy.ui.modules.login
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerActivity
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.login.advanced.LoginAdvancedFragment
-import io.github.wulkanowy.ui.modules.login.form.LoginFormFragment
-import io.github.wulkanowy.ui.modules.login.studentselect.LoginStudentSelectFragment
-import io.github.wulkanowy.ui.modules.login.symbol.LoginSymbolFragment
-
-@Suppress("unused")
-@Module(includes = [LoginModule.Static::class])
-internal abstract class LoginModule {
-
-    @Module
-    object Static {
-
-        @PerActivity
-        @Provides
-        fun provideLoginAdapter(activity: LoginActivity) = BaseFragmentPagerAdapter(activity.supportFragmentManager)
-    }
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLoginFormFragment(): LoginFormFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLoginAdvancedFragment(): LoginAdvancedFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLoginSymbolFragment(): LoginSymbolFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLoginSelectStudentFragment(): LoginStudentSelectFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
index afa2d145d..7e731772f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginPresenter.kt
@@ -1,18 +1,16 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<LoginView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<LoginView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: LoginView) {
         super.onAttachView(view)
@@ -23,24 +21,24 @@ class LoginPresenter @Inject constructor(
         Timber.i("Login view was initialized")
     }
 
-    fun onFormViewAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
+    fun onFormViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
         view?.apply {
-            if (students.isEmpty()) {
+            if (studentsWithSemesters.isEmpty()) {
                 Timber.i("Switch to symbol form")
                 notifyInitSymbolFragment(loginData)
                 switchView(1)
             } else {
                 Timber.i("Switch to student select")
-                notifyInitStudentSelectFragment(students)
+                notifyInitStudentSelectFragment(studentsWithSemesters)
                 switchView(2)
             }
         }
     }
 
-    fun onSymbolViewAccountLogged(students: List<Student>) {
+    fun onSymbolViewAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
         view?.apply {
             Timber.i("Switch to student select")
-            notifyInitStudentSelectFragment(students)
+            notifyInitStudentSelectFragment(studentsWithSemesters)
             switchView(2)
         }
     }
@@ -49,11 +47,15 @@ class LoginPresenter @Inject constructor(
         view?.switchView(3)
     }
 
+    fun onRecoverClick() {
+        view?.switchView(4)
+    }
+
     fun onViewSelected(index: Int) {
         view?.apply {
             when (index) {
                 0 -> showActionBar(false)
-                1, 2 -> showActionBar(true)
+                1, 2, 3, 4 -> showActionBar(true)
             }
         }
     }
@@ -62,7 +64,7 @@ class LoginPresenter @Inject constructor(
         Timber.i("Back pressed in login view")
         view?.apply {
             when (currentViewIndex) {
-                1, 2, 3 -> switchView(0)
+                1, 2, 3, 4 -> switchView(0)
                 else -> default()
             }
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
index 9c98a1d8d..2a5cf316a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/LoginView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginView : BaseView {
@@ -15,5 +15,5 @@ interface LoginView : BaseView {
 
     fun notifyInitSymbolFragment(loginData: Triple<String, String, String>)
 
-    fun notifyInitStudentSelectFragment(students: List<Student>)
+    fun notifyInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
index 353effa9b..9231914c8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedFragment.kt
@@ -1,25 +1,28 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
+import android.view.View.GONE
+import android.view.View.VISIBLE
 import android.widget.ArrayAdapter
-import androidx.appcompat.widget.AppCompatEditText
 import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentLoginAdvancedBinding
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
 import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.fragment_login_advanced.*
 import javax.inject.Inject
 
-class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
+@AndroidEntryPoint
+class LoginAdvancedFragment :
+    BaseFragment<FragmentLoginAdvancedBinding>(R.layout.fragment_login_advanced),
+    LoginAdvancedView {
 
     @Inject
     lateinit var presenter: LoginAdvancedPresenter
@@ -29,203 +32,251 @@ class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
     }
 
     override val formLoginType: String
-        get() = when (loginTypeSwitch.checkedRadioButtonId) {
+        get() = when (binding.loginTypeSwitch.checkedRadioButtonId) {
             R.id.loginTypeApi -> "API"
             R.id.loginTypeScrapper -> "SCRAPPER"
             else -> "HYBRID"
         }
 
-    override val formNameValue: String
-        get() = loginFormName.text.toString().trim()
+    override val formUsernameValue: String
+        get() = binding.loginFormUsername.text.toString().trim()
 
     override val formPassValue: String
-        get() = loginFormPass.text.toString().trim()
+        get() = binding.loginFormPass.text.toString().trim()
 
     private lateinit var hostKeys: Array<String>
 
     private lateinit var hostValues: Array<String>
 
-    override val formHostValue: String?
-        get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
+    private lateinit var hostSymbols: Array<String>
+
+    override val formHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
 
     override val formPinValue: String
-        get() = loginFormPin.text.toString().trim()
+        get() = binding.loginFormPin.text.toString().trim()
 
     override val formSymbolValue: String
-        get() = loginFormSymbol.text.toString().trim()
+        get() = binding.loginFormSymbol.text.toString().trim()
 
     override val formTokenValue: String
-        get() = loginFormToken.text.toString().trim()
+        get() = binding.loginFormToken.text.toString().trim()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_advanced, container, false)
-    }
+    override val nicknameLabel: String
+        get() = getString(R.string.login_nickname_hint)
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override val emailLabel: String
+        get() = getString(R.string.login_email_hint)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginAdvancedBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         hostKeys = resources.getStringArray(R.array.hosts_keys)
         hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
-        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-        loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
-        loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
-        loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
-        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+        with(binding) {
+            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+            loginFormPin.doOnTextChanged { _, _, _, _ -> presenter.onPinTextChanged() }
+            loginFormSymbol.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+            loginFormToken.doOnTextChanged { _, _, _, _ -> presenter.onTokenTextChanged() }
+            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
 
-        loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
-            presenter.onLoginModeSelected(when (checkedId) {
-                R.id.loginTypeApi -> Sdk.Mode.API
-                R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
-                else -> Sdk.Mode.HYBRID
-            })
+            loginTypeSwitch.setOnCheckedChangeListener { _, checkedId ->
+                presenter.onLoginModeSelected(when (checkedId) {
+                    R.id.loginTypeApi -> Sdk.Mode.API
+                    R.id.loginTypeScrapper -> Sdk.Mode.SCRAPPER
+                    else -> Sdk.Mode.HYBRID
+                })
+            }
+
+            loginFormPin.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
+
+            loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
         }
 
-        loginFormPin.setOnEditorDoneSignIn()
-        loginFormPass.setOnEditorDoneSignIn()
-
-        loginFormSymbol.setAdapter(ArrayAdapter(requireContext(), android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
-
-        with(loginFormHost) {
-            setText(hostKeys.getOrElse(0) { "" })
+        with(binding.loginFormHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
-    private fun AppCompatEditText.setOnEditorDoneSignIn() {
-        setOnEditorActionListener { _, id, _ ->
-            if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) loginFormSignIn.callOnClick() else false
+    override fun showMobileApiWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_mobile_api)
+    }
+
+    override fun showScraperWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_scraper)
+    }
+
+    override fun showHybridWarningMessage() {
+        binding.loginFormAdvancedWarningInfo.text = getString(R.string.login_advanced_warning_hybrid)
+    }
+
+    override fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String) {
+        with(binding) {
+            loginFormUsername.setText(username)
+            loginFormPass.setText(pass)
+            loginFormToken.setText(token)
+            loginFormSymbol.setText(symbol)
+            loginFormPin.setText(pin)
         }
     }
 
-    override fun setDefaultCredentials(name: String, pass: String, symbol: String, token: String, pin: String) {
-        loginFormName.setText(name)
-        loginFormPass.setText(pass)
-        loginFormToken.setText(token)
-        loginFormSymbol.setText(symbol)
-        loginFormPin.setText(pin)
+    override fun setUsernameLabel(label: String) {
+        binding.loginFormUsernameLayout.hint = label
     }
 
-    override fun setErrorNameRequired() {
-        with(loginFormNameLayout) {
+    override fun setSymbol(symbol: String) {
+        binding.loginFormSymbol.setText(symbol)
+    }
+
+    override fun setErrorUsernameRequired() {
+        with(binding.loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
+    override fun setErrorLoginRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
     override fun setErrorPassRequired(focus: Boolean) {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
     override fun setErrorPinRequired() {
-        with(loginFormPinLayout) {
+        with(binding.loginFormPinLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPinInvalid(message: String) {
-        with(loginFormPinLayout) {
+        with(binding.loginFormPinLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorSymbolRequired() {
-        with(loginFormSymbolLayout) {
+        with(binding.loginFormSymbolLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorSymbolInvalid(message: String) {
-        with(loginFormSymbolLayout) {
+        with(binding.loginFormSymbolLayout) {
             requestFocus()
             error = message
         }
     }
 
     override fun setErrorTokenRequired() {
-        with(loginFormTokenLayout) {
+        with(binding.loginFormTokenLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorTokenInvalid(message: String) {
-        with(loginFormTokenLayout) {
+        with(binding.loginFormTokenLayout) {
             requestFocus()
             error = message
         }
     }
 
-    override fun clearNameError() {
-        loginFormNameLayout.error = null
+    override fun clearUsernameError() {
+        binding.loginFormUsernameLayout.error = null
     }
 
     override fun clearPassError() {
-        loginFormPassLayout.error = null
+        binding.loginFormPassLayout.error = null
     }
 
     override fun clearPinKeyError() {
-        loginFormPinLayout.error = null
+        binding.loginFormPinLayout.error = null
     }
 
     override fun clearSymbolError() {
-        loginFormSymbolLayout.error = null
+        binding.loginFormSymbolLayout.error = null
     }
 
     override fun clearTokenError() {
-        loginFormTokenLayout.error = null
+        binding.loginFormTokenLayout.error = null
     }
 
     override fun showOnlyHybridModeInputs() {
-        loginFormNameLayout.visibility = View.VISIBLE
-        loginFormPassLayout.visibility = View.VISIBLE
-        loginFormHostLayout.visibility = View.VISIBLE
-        loginFormPinLayout.visibility = View.GONE
-        loginFormSymbolLayout.visibility = View.VISIBLE
-        loginFormTokenLayout.visibility = View.GONE
+        with(binding) {
+            loginFormUsernameLayout.visibility = VISIBLE
+            loginFormPassLayout.visibility = VISIBLE
+            loginFormHostLayout.visibility = VISIBLE
+            loginFormPinLayout.visibility = GONE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = GONE
+        }
     }
 
     override fun showOnlyScrapperModeInputs() {
-        loginFormNameLayout.visibility = View.VISIBLE
-        loginFormPassLayout.visibility = View.VISIBLE
-        loginFormHostLayout.visibility = View.VISIBLE
-        loginFormPinLayout.visibility = View.GONE
-        loginFormSymbolLayout.visibility = View.VISIBLE
-        loginFormTokenLayout.visibility = View.GONE
+        with(binding) {
+            loginFormUsernameLayout.visibility = VISIBLE
+            loginFormPassLayout.visibility = VISIBLE
+            loginFormHostLayout.visibility = VISIBLE
+            loginFormPinLayout.visibility = GONE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = GONE
+        }
     }
 
     override fun showOnlyMobileApiModeInputs() {
-        loginFormNameLayout.visibility = View.GONE
-        loginFormPassLayout.visibility = View.GONE
-        loginFormHostLayout.visibility = View.GONE
-        loginFormPinLayout.visibility = View.VISIBLE
-        loginFormSymbolLayout.visibility = View.VISIBLE
-        loginFormTokenLayout.visibility = View.VISIBLE
+        with(binding) {
+            loginFormUsernameLayout.visibility = GONE
+            loginFormPassLayout.visibility = GONE
+            loginFormHostLayout.visibility = GONE
+            loginFormPinLayout.visibility = VISIBLE
+            loginFormSymbolLayout.visibility = VISIBLE
+            loginFormTokenLayout.visibility = VISIBLE
+        }
     }
 
     override fun showSoftKeyboard() {
@@ -237,23 +288,28 @@ class LoginAdvancedFragment : BaseFragment(), LoginAdvancedView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginFormProgress.visibility = if (show) View.VISIBLE else View.GONE
+        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginFormContainer.visibility = if (show) View.VISIBLE else View.GONE
+        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(students: List<Student>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, Triple(
-            loginFormName.text.toString(),
-            loginFormPass.text.toString(),
+    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, Triple(
+            binding.loginFormUsername.text.toString(),
+            binding.loginFormPass.text.toString(),
             resources.getStringArray(R.array.hosts_values)[1]
         ))
     }
 
+    override fun onResume() {
+        super.onResume()
+        presenter.updateUsernameLabel()
+    }
+
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
index 1e49e5d8b..dfe82ad8b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedPresenter.kt
@@ -1,23 +1,24 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.ifNullOrBlank
-import io.reactivex.Single
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginAdvancedPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository, schedulers) {
+) : BasePresenter<LoginAdvancedView>(loginErrorHandler, studentRepository) {
 
     override fun onAttachView(view: LoginAdvancedView) {
         super.onAttachView(view)
@@ -65,22 +66,39 @@ class LoginAdvancedPresenter @Inject constructor(
         }
     }
 
+    fun updateUsernameLabel() {
+        view?.apply {
+            setUsernameLabel(if ("vulcan" in formHostValue || "fakelog" in formHostValue) emailLabel else nicknameLabel)
+        }
+    }
+
     fun onHostSelected() {
         view?.apply {
             clearPassError()
-            clearNameError()
-            if (formHostValue?.contains("fakelog") == true) {
+            clearUsernameError()
+            if (formHostValue.contains("fakelog")) {
                 setDefaultCredentials("jan@fakelog.cf", "jan123", "powiatwulkanowy", "FK100000", "999999")
             }
+            setSymbol(formHostSymbol)
+            updateUsernameLabel()
         }
     }
 
     fun onLoginModeSelected(type: Sdk.Mode) {
         view?.run {
             when (type) {
-                Sdk.Mode.API -> showOnlyMobileApiModeInputs()
-                Sdk.Mode.SCRAPPER -> showOnlyScrapperModeInputs()
-                Sdk.Mode.HYBRID -> showOnlyHybridModeInputs()
+                Sdk.Mode.API -> {
+                    showOnlyMobileApiModeInputs()
+                    showMobileApiWarningMessage()
+                }
+                Sdk.Mode.SCRAPPER -> {
+                    showOnlyScrapperModeInputs()
+                    showScraperWarningMessage()
+                }
+                Sdk.Mode.HYBRID -> {
+                    showOnlyHybridModeInputs()
+                    showHybridWarningMessage()
+                }
             }
         }
     }
@@ -89,8 +107,8 @@ class LoginAdvancedPresenter @Inject constructor(
         view?.clearPassError()
     }
 
-    fun onNameTextChanged() {
-        view?.clearNameError()
+    fun onUsernameTextChanged() {
+        view?.clearUsernameError()
     }
 
     fun onPinTextChanged() {
@@ -108,36 +126,43 @@ class LoginAdvancedPresenter @Inject constructor(
     fun onSignInClick() {
         if (!validateCredentials()) return
 
-        disposable.add(getStudentsAppropriatesToLoginType()
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.apply {
+        flowWithResource { getStudentsAppropriatesToLoginType() }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Login started")
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Timber.i("Login started")
-            }
-            .doFinally {
-                view?.apply {
-                    showProgress(false)
-                    showContent(true)
+                Status.SUCCESS -> {
+                    Timber.i("Login result: Success")
+                    analytics.logEvent("registration_form",
+                        "success" to true,
+                        "students" to it.data!!.size,
+                        "error" to "No error"
+                    )
+                    view?.notifyParentAccountLogged(it.data)
+                }
+                Status.ERROR -> {
+                    Timber.i("Login result: An exception occurred")
+                    analytics.logEvent(
+                        "registration_form",
+                        "success" to false, "students" to -1,
+                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
+                    )
+                    loginErrorHandler.dispatch(it.error)
                 }
             }
-            .subscribe({
-                Timber.i("Login result: Success")
-                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "error" to "No error")
-                view?.notifyParentAccountLogged(it)
-            }, {
-                Timber.i("Login result: An exception occurred")
-                analytics.logEvent("registration_form", "success" to false, "students" to -1, "error" to it.message.ifNullOrBlank { "No message" })
-                loginErrorHandler.dispatch(it)
-            }))
+        }.afterLoading {
+            view?.apply {
+                showProgress(false)
+                showContent(true)
+            }
+        }.launch("login")
     }
 
-    private fun getStudentsAppropriatesToLoginType(): Single<List<Student>> {
-        val email = view?.formNameValue.orEmpty()
+    private suspend fun getStudentsAppropriatesToLoginType(): List<StudentWithSemesters> {
+        val email = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
         val endpoint = view?.formHostValue.orEmpty()
 
@@ -145,7 +170,7 @@ class LoginAdvancedPresenter @Inject constructor(
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
 
-        return when (Sdk.Mode.valueOf(view?.formLoginType ?: "")) {
+        return when (Sdk.Mode.valueOf(view?.formLoginType.orEmpty())) {
             Sdk.Mode.API -> studentRepository.getStudentsApi(pin, symbol, token)
             Sdk.Mode.SCRAPPER -> studentRepository.getStudentsScrapper(email, password, endpoint, symbol)
             Sdk.Mode.HYBRID -> studentRepository.getStudentsHybrid(email, password, endpoint, symbol)
@@ -153,9 +178,11 @@ class LoginAdvancedPresenter @Inject constructor(
     }
 
     private fun validateCredentials(): Boolean {
-        val login = view?.formNameValue.orEmpty()
+        val login = view?.formUsernameValue.orEmpty()
         val password = view?.formPassValue.orEmpty()
 
+        val host = view?.formHostValue.orEmpty()
+
         val pin = view?.formPinValue.orEmpty()
         val symbol = view?.formSymbolValue.orEmpty()
         val token = view?.formTokenValue.orEmpty()
@@ -179,26 +206,20 @@ class LoginAdvancedPresenter @Inject constructor(
                     isCorrect = false
                 }
             }
-            Sdk.Mode.SCRAPPER -> {
+            Sdk.Mode.HYBRID, Sdk.Mode.SCRAPPER -> {
                 if (login.isEmpty()) {
-                    view?.setErrorNameRequired()
+                    view?.setErrorUsernameRequired()
                     isCorrect = false
-                }
+                } else {
+                    if ("@" in login && "standard" !in host) {
+                        view?.setErrorLoginRequired()
+                        isCorrect = false
+                    }
 
-                if (password.isEmpty()) {
-                    view?.setErrorPassRequired(focus = isCorrect)
-                    isCorrect = false
-                }
-
-                if (password.length < 6 && password.isNotEmpty()) {
-                    view?.setErrorPassInvalid(focus = isCorrect)
-                    isCorrect = false
-                }
-            }
-            Sdk.Mode.HYBRID -> {
-                if (login.isEmpty()) {
-                    view?.setErrorNameRequired()
-                    isCorrect = false
+                    if ("@" !in login && "standard" in host) {
+                        view?.setErrorEmailRequired()
+                        isCorrect = false
+                    }
                 }
 
                 if (password.isEmpty()) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
index 85a85a331..029a6b4d4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/advanced/LoginAdvancedView.kt
@@ -1,15 +1,17 @@
 package io.github.wulkanowy.ui.modules.login.advanced
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginAdvancedView : BaseView {
 
-    val formNameValue: String
+    val formUsernameValue: String
 
     val formPassValue: String
 
-    val formHostValue: String?
+    val formHostValue: String
+
+    val formHostSymbol: String
 
     val formLoginType: String
 
@@ -19,11 +21,29 @@ interface LoginAdvancedView : BaseView {
 
     val formTokenValue: String
 
+    val nicknameLabel: String
+
+    val emailLabel: String
+
     fun initView()
 
-    fun setDefaultCredentials(name: String, pass: String, symbol: String, token: String, pin: String)
+    fun showMobileApiWarningMessage()
 
-    fun setErrorNameRequired()
+    fun showScraperWarningMessage()
+
+    fun showHybridWarningMessage()
+
+    fun setDefaultCredentials(username: String, pass: String, symbol: String, token: String, pin: String)
+
+    fun setUsernameLabel(label: String)
+
+    fun setSymbol(symbol: String)
+
+    fun setErrorUsernameRequired()
+
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
@@ -31,7 +51,7 @@ interface LoginAdvancedView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun clearNameError()
+    fun clearUsernameError()
 
     fun clearPassError()
 
@@ -49,7 +69,7 @@ interface LoginAdvancedView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(students: List<Student>)
+    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
 
     fun setErrorPinRequired()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
index cbd405c28..41345686a 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormFragment.kt
@@ -2,27 +2,27 @@ package io.github.wulkanowy.ui.modules.login.form
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
-import android.view.inputmethod.EditorInfo.IME_NULL
 import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentLoginFormBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.setOnEditorDoneSignIn
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.fragment_login_form.*
 import javax.inject.Inject
 
-class LoginFormFragment : BaseFragment(), LoginFormView {
+@AndroidEntryPoint
+class LoginFormFragment : BaseFragment<FragmentLoginFormBinding>(R.layout.fragment_login_form),
+    LoginFormView {
 
     @Inject
     lateinit var presenter: LoginFormPresenter
@@ -34,87 +34,120 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
         fun newInstance() = LoginFormFragment()
     }
 
-    override val formNameValue get() = loginFormName.text.toString()
+    override val formUsernameValue: String
+        get() = binding.loginFormUsername.text.toString()
 
-    override val formPassValue get() = loginFormPass.text.toString()
+    override val formPassValue: String
+        get() = binding.loginFormPass.text.toString()
 
-    override val formHostValue get() = hostValues.getOrNull(hostKeys.indexOf(loginFormHost.text.toString()))
+    override val formHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(binding.loginFormHost.text.toString())).orEmpty()
+
+    override val nicknameLabel: String
+        get() = getString(R.string.login_nickname_hint)
+
+    override val emailLabel: String
+        get() = getString(R.string.login_email_hint)
 
     private lateinit var hostKeys: Array<String>
 
     private lateinit var hostValues: Array<String>
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_form, container, false)
-    }
+    private lateinit var hostSymbols: Array<String>
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginFormBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         hostKeys = resources.getStringArray(R.array.hosts_keys)
         hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
 
-        loginFormName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
-        loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
-        loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
-        loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
-        loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
-        loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
-        loginFormFaq.setOnClickListener { presenter.onFaqClick() }
-        loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
-
-        loginFormPass.setOnEditorActionListener { _, id, _ ->
-            if (id == IME_ACTION_DONE || id == IME_NULL) loginFormSignIn.callOnClick() else false
+        with(binding) {
+            loginFormUsername.doOnTextChanged { _, _, _, _ -> presenter.onUsernameTextChanged() }
+            loginFormPass.doOnTextChanged { _, _, _, _ -> presenter.onPassTextChanged() }
+            loginFormHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginFormSignIn.setOnClickListener { presenter.onSignInClick() }
+            loginFormAdvancedButton.setOnClickListener { presenter.onAdvancedLoginClick() }
+            loginFormPrivacyLink.setOnClickListener { presenter.onPrivacyLinkClick() }
+            loginFormFaq.setOnClickListener { presenter.onFaqClick() }
+            loginFormContactEmail.setOnClickListener { presenter.onEmailClick() }
+            loginFormRecoverLink.setOnClickListener { presenter.onRecoverClick() }
+            loginFormPass.setOnEditorDoneSignIn { loginFormSignIn.callOnClick() }
         }
 
-        with(loginFormHost) {
-            setText(hostKeys.getOrElse(0) { "" })
+        with(binding.loginFormHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
             setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (binding.loginFormContainer.visibility == GONE) dismissDropDown() }
         }
     }
 
-    override fun setCredentials(name: String, pass: String) {
-        loginFormName.setText(name)
-        loginFormPass.setText(pass)
+    override fun setCredentials(username: String, pass: String) {
+        with(binding) {
+            loginFormUsername.setText(username)
+            loginFormPass.setText(pass)
+        }
     }
 
-    override fun setErrorNameRequired() {
-        with(loginFormNameLayout) {
+    override fun setUsernameLabel(label: String) {
+        binding.loginFormUsernameLayout.hint = label
+    }
+
+    override fun setErrorUsernameRequired() {
+        with(binding.loginFormUsernameLayout) {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
+    override fun setErrorLoginRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_login)
+        }
+    }
+
+    override fun setErrorEmailRequired() {
+        with(binding.loginFormUsernameLayout) {
+            requestFocus()
+            error = getString(R.string.login_invalid_email)
+        }
+    }
+
     override fun setErrorPassRequired(focus: Boolean) {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun setErrorPassInvalid(focus: Boolean) {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             if (focus) requestFocus()
             error = getString(R.string.login_invalid_password)
         }
     }
 
     override fun setErrorPassIncorrect() {
-        with(loginFormPassLayout) {
+        with(binding.loginFormPassLayout) {
             requestFocus()
             error = getString(R.string.login_incorrect_password)
         }
     }
 
-    override fun clearNameError() {
-        loginFormNameLayout.error = null
+    override fun clearUsernameError() {
+        binding.loginFormUsernameLayout.error = null
     }
 
     override fun clearPassError() {
-        loginFormPassLayout.error = null
+        binding.loginFormPassLayout.error = null
     }
 
     override fun showSoftKeyboard() {
@@ -126,20 +159,20 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginFormProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginFormProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginFormContainer.visibility = if (show) VISIBLE else GONE
+        binding.loginFormContainer.visibility = if (show) VISIBLE else GONE
     }
 
     @SuppressLint("SetTextI18n")
     override fun showVersion() {
-        loginFormVersion.text = "v${appInfo.versionName}"
+        binding.loginFormVersion.text = "v${appInfo.versionName}"
     }
 
-    override fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>) {
-        (activity as? LoginActivity)?.onFormFragmentAccountLogged(students, loginData)
+    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>) {
+        (activity as? LoginActivity)?.onFormFragmentAccountLogged(studentsWithSemesters, loginData)
     }
 
     override fun openPrivacyPolicyPage() {
@@ -147,28 +180,43 @@ class LoginFormFragment : BaseFragment(), LoginFormView {
     }
 
     override fun showContact(show: Boolean) {
-        loginFormContact.visibility = if (show) VISIBLE else GONE
+        binding.loginFormContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun openAdvancedLogin() {
         (activity as? LoginActivity)?.onAdvancedLoginClick()
     }
 
+    override fun onRecoverClick() {
+        (activity as? LoginActivity)?.onRecoverClick()
+    }
+
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 
     override fun openFaqPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/dlaczego-nie-moge-sie-zalogowac", ::showMessage)
     }
 
-    override fun openEmail() {
+    override fun onResume() {
+        super.onResume()
+        presenter.updateUsernameLabel()
+    }
+
+    override fun openEmail(lastError: String) {
         context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "$formHostValue/$formHostSymbol",
+                lastError
+            )
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
index 0b45c9a53..b921140c7 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenter.kt
@@ -1,20 +1,24 @@
 package io.github.wulkanowy.ui.modules.login.form
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.ifNullOrBlank
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LoginFormPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository, schedulers) {
+) : BasePresenter<LoginFormView>(loginErrorHandler, studentRepository) {
+
+    private var lastError: Throwable? = null
 
     override fun onAttachView(view: LoginFormView) {
         super.onAttachView(view)
@@ -42,10 +46,17 @@ class LoginFormPresenter @Inject constructor(
     fun onHostSelected() {
         view?.apply {
             clearPassError()
-            clearNameError()
-            if (formHostValue?.contains("fakelog") == true) {
+            clearUsernameError()
+            if (formHostValue.contains("fakelog")) {
                 setCredentials("jan@fakelog.cf", "jan123")
             }
+            updateUsernameLabel()
+        }
+    }
+
+    fun updateUsernameLabel() {
+        view?.run {
+            setUsernameLabel(if ("standard" in formHostValue) emailLabel else nicknameLabel)
         }
     }
 
@@ -53,44 +64,56 @@ class LoginFormPresenter @Inject constructor(
         view?.clearPassError()
     }
 
-    fun onNameTextChanged() {
-        view?.clearNameError()
+    fun onUsernameTextChanged() {
+        view?.clearUsernameError()
     }
 
     fun onSignInClick() {
-        val email = view?.formNameValue.orEmpty().trim()
+        val email = view?.formUsernameValue.orEmpty().trim()
         val password = view?.formPassValue.orEmpty().trim()
-        val endpoint = view?.formHostValue.orEmpty().trim()
+        val host = view?.formHostValue.orEmpty().trim()
+        val symbol = view?.formHostSymbol.orEmpty().trim()
 
-        if (!validateCredentials(email, password)) return
+        if (!validateCredentials(email, password, host)) return
 
-        disposable.add(studentRepository.getStudentsScrapper(email, password, endpoint)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.apply {
+        flowWithResource { studentRepository.getStudentsScrapper(email, password, host, symbol) }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Login started")
                     hideSoftKeyboard()
                     showProgress(true)
                     showContent(false)
                 }
-                Timber.i("Login started")
-            }
-            .doFinally {
-                view?.apply {
-                    showProgress(false)
-                    showContent(true)
+                Status.SUCCESS -> {
+                    Timber.i("Login result: Success")
+                    analytics.logEvent(
+                        "registration_form",
+                        "success" to true,
+                        "students" to it.data!!.size,
+                        "scrapperBaseUrl" to host,
+                        "error" to "No error"
+                    )
+                    view?.notifyParentAccountLogged(it.data, Triple(email, password, host))
+                }
+                Status.ERROR -> {
+                    Timber.i("Login result: An exception occurred")
+                    analytics.logEvent(
+                        "registration_form",
+                        "success" to false,
+                        "students" to -1,
+                        "scrapperBaseUrl" to host,
+                        "error" to it.error!!.message.ifNullOrBlank { "No message" })
+                    loginErrorHandler.dispatch(it.error)
+                    lastError = it.error
+                    view?.showContact(true)
                 }
             }
-            .subscribe({
-                Timber.i("Login result: Success")
-                analytics.logEvent("registration_form", "success" to true, "students" to it.size, "scrapperBaseUrl" to endpoint, "error" to "No error")
-                view?.notifyParentAccountLogged(it, Triple(email, password, endpoint))
-            }, {
-                Timber.i("Login result: An exception occurred")
-                analytics.logEvent("registration_form", "success" to false, "students" to -1, "scrapperBaseUrl" to endpoint, "error" to it.message.ifNullOrBlank { "No message" })
-                loginErrorHandler.dispatch(it)
-                view?.showContact(true)
-            }))
+        }.afterLoading {
+            view?.apply {
+                showProgress(false)
+                showContent(true)
+            }
+        }.launch("login")
     }
 
     fun onFaqClick() {
@@ -98,15 +121,29 @@ class LoginFormPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail()
+        view?.openEmail(lastError?.message.ifNullOrBlank { "none" })
     }
 
-    private fun validateCredentials(login: String, password: String): Boolean {
+    fun onRecoverClick() {
+        view?.onRecoverClick()
+    }
+
+    private fun validateCredentials(login: String, password: String, host: String): Boolean {
         var isCorrect = true
 
         if (login.isEmpty()) {
-            view?.setErrorNameRequired()
+            view?.setErrorUsernameRequired()
             isCorrect = false
+        } else {
+            if ("@" in login && "standard" !in host) {
+                view?.setErrorLoginRequired()
+                isCorrect = false
+            }
+
+            if ("@" !in login && "standard" in host) {
+                view?.setErrorEmailRequired()
+                isCorrect = false
+            }
         }
 
         if (password.isEmpty()) {
@@ -118,6 +155,7 @@ class LoginFormPresenter @Inject constructor(
             view?.setErrorPassInvalid(focus = isCorrect)
             isCorrect = false
         }
+
         return isCorrect
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
index 6da57c8c5..77e665389 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/form/LoginFormView.kt
@@ -1,21 +1,33 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginFormView : BaseView {
 
     fun initView()
 
-    val formNameValue: String
+    val formUsernameValue: String
 
     val formPassValue: String
 
-    val formHostValue: String?
+    val formHostValue: String
 
-    fun setCredentials(name: String, pass: String)
+    val formHostSymbol: String
 
-    fun setErrorNameRequired()
+    val nicknameLabel: String
+
+    val emailLabel: String
+
+    fun setCredentials(username: String, pass: String)
+
+    fun setUsernameLabel(label: String)
+
+    fun setErrorUsernameRequired()
+
+    fun setErrorLoginRequired()
+
+    fun setErrorEmailRequired()
 
     fun setErrorPassRequired(focus: Boolean)
 
@@ -23,7 +35,7 @@ interface LoginFormView : BaseView {
 
     fun setErrorPassIncorrect()
 
-    fun clearNameError()
+    fun clearUsernameError()
 
     fun clearPassError()
 
@@ -37,7 +49,7 @@ interface LoginFormView : BaseView {
 
     fun showVersion()
 
-    fun notifyParentAccountLogged(students: List<Student>, loginData: Triple<String, String, String>)
+    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>, loginData: Triple<String, String, String>)
 
     fun openPrivacyPolicyPage()
 
@@ -45,7 +57,9 @@ interface LoginFormView : BaseView {
 
     fun openFaqPage()
 
-    fun openEmail()
+    fun openEmail(lastError: String)
 
     fun openAdvancedLogin()
+
+    fun onRecoverClick()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
new file mode 100644
index 000000000..f0c9652fb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverFragment.kt
@@ -0,0 +1,212 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
+import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentLoginRecoverBinding
+import io.github.wulkanowy.ui.base.BaseFragment
+import io.github.wulkanowy.ui.modules.login.LoginActivity
+import io.github.wulkanowy.ui.modules.login.form.LoginSymbolAdapter
+import io.github.wulkanowy.utils.hideSoftInput
+import io.github.wulkanowy.utils.showSoftInput
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class LoginRecoverFragment :
+    BaseFragment<FragmentLoginRecoverBinding>(R.layout.fragment_login_recover), LoginRecoverView {
+
+    private var _binding: FragmentLoginRecoverBinding? = null
+
+    private val bindingLocal: FragmentLoginRecoverBinding get() = _binding!!
+
+    @Inject
+    lateinit var presenter: LoginRecoverPresenter
+
+    companion object {
+        fun newInstance() = LoginRecoverFragment()
+    }
+
+    private lateinit var hostKeys: Array<String>
+
+    private lateinit var hostValues: Array<String>
+
+    private lateinit var hostSymbols: Array<String>
+
+    override val recoverHostValue: String
+        get() = hostValues.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
+
+    override val formHostSymbol: String
+        get() = hostSymbols.getOrNull(hostKeys.indexOf(bindingLocal.loginRecoverHost.text.toString())).orEmpty()
+
+    override val recoverNameValue: String
+        get() = bindingLocal.loginRecoverName.text.toString().trim()
+
+    override val emailHintString: String
+        get() = getString(R.string.login_email_hint)
+
+    override val loginPeselEmailHintString: String
+        get() = getString(R.string.login_login_pesel_email_hint)
+
+    override val invalidEmailString: String
+        get() = getString(R.string.login_invalid_email)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        _binding = FragmentLoginRecoverBinding.bind(view)
+        presenter.onAttachView(this)
+    }
+
+    override fun initView() {
+        hostKeys = resources.getStringArray(R.array.hosts_keys)
+        hostValues = resources.getStringArray(R.array.hosts_values)
+        hostSymbols = resources.getStringArray(R.array.hosts_symbols)
+
+        with(bindingLocal) {
+            loginRecoverWebView.setBackgroundColor(Color.TRANSPARENT)
+            loginRecoverName.doOnTextChanged { _, _, _, _ -> presenter.onNameTextChanged() }
+            loginRecoverHost.setOnItemClickListener { _, _, _, _ -> presenter.onHostSelected() }
+            loginRecoverButton.setOnClickListener { presenter.onRecoverClick() }
+            loginRecoverErrorRetry.setOnClickListener { presenter.onRecoverClick() }
+            loginRecoverErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            loginRecoverLogin.setOnClickListener { (activity as LoginActivity).switchView(0) }
+        }
+
+        with(bindingLocal.loginRecoverHost) {
+            setText(hostKeys.getOrNull(0).orEmpty())
+            setAdapter(LoginSymbolAdapter(context, R.layout.support_simple_spinner_dropdown_item, hostKeys))
+            setOnClickListener { if (bindingLocal.loginRecoverFormContainer.visibility == GONE) dismissDropDown() }
+        }
+    }
+
+    override fun setDefaultCredentials(username: String) {
+        bindingLocal.loginRecoverName.setText(username)
+    }
+
+    override fun setErrorNameRequired() {
+        with(bindingLocal.loginRecoverNameLayout) {
+            requestFocus()
+            error = getString(R.string.login_field_required)
+        }
+    }
+
+    override fun setUsernameHint(hint: String) {
+        bindingLocal.loginRecoverNameLayout.hint = hint
+    }
+
+    override fun setUsernameError(message: String) {
+        with(bindingLocal.loginRecoverNameLayout) {
+            requestFocus()
+            error = message
+        }
+    }
+
+    override fun clearUsernameError() {
+        bindingLocal.loginRecoverNameLayout.error = null
+    }
+
+    override fun showProgress(show: Boolean) {
+        bindingLocal.loginRecoverProgress.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showRecoverForm(show: Boolean) {
+        bindingLocal.loginRecoverFormContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showCaptcha(show: Boolean) {
+        bindingLocal.loginRecoverCaptchaContainer.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun showErrorView(show: Boolean) {
+        bindingLocal.loginRecoverError.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setErrorDetails(message: String) {
+        bindingLocal.loginRecoverErrorMessage.text = message
+    }
+
+    override fun showSuccessView(show: Boolean) {
+        bindingLocal.loginRecoverSuccess.visibility = if (show) VISIBLE else GONE
+    }
+
+    override fun setSuccessTitle(title: String) {
+        bindingLocal.loginRecoverSuccessTitle.text = title
+    }
+
+    override fun setSuccessMessage(message: String) {
+        bindingLocal.loginRecoverSuccessMessage.text = message
+    }
+
+    override fun showSoftKeyboard() {
+        activity?.showSoftInput()
+    }
+
+    override fun hideSoftKeyboard() {
+        activity?.hideSoftInput()
+    }
+
+    @SuppressLint("SetJavaScriptEnabled", "AddJavascriptInterface")
+    override fun loadReCaptcha(siteKey: String, url: String) {
+        val html = """
+            <div style="position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%);" id="recaptcha"></div>
+            <script src="https://www.google.com/recaptcha/api.js?onload=cl&render=explicit&hl=pl" async defer></script>
+            <script>var cl=()=>grecaptcha.render("recaptcha",{
+            sitekey:'$siteKey',
+            callback:e =>Android.captchaCallback(e)})</script>
+        """.trimIndent()
+
+        with(bindingLocal.loginRecoverWebView) {
+            settings.javaScriptEnabled = true
+            webViewClient = object : WebViewClient() {
+                private var recoverWebViewSuccess: Boolean = true
+
+                override fun onPageFinished(view: WebView?, url: String?) {
+                    if (recoverWebViewSuccess) {
+                        showCaptcha(true)
+                        showProgress(false)
+                    } else {
+                        showProgress(false)
+                        showErrorView(true)
+                    }
+                }
+
+                override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
+                    recoverWebViewSuccess = false
+                }
+            }
+
+            loadDataWithBaseURL(url, html, "text/html", "UTF-8", null)
+            addJavascriptInterface(object {
+
+                @Suppress("UNUSED")
+                @JavascriptInterface
+                fun captchaCallback(reCaptchaResponse: String) {
+                    activity?.runOnUiThread {
+                        presenter.onReCaptchaVerified(reCaptchaResponse)
+                    }
+                }
+            }, "Android")
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        presenter.updateFields()
+    }
+
+    override fun onDestroyView() {
+        bindingLocal.loginRecoverWebView.destroy()
+        _binding = null
+        presenter.onDetachView()
+
+        super.onDestroyView()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
new file mode 100644
index 000000000..e58377058
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverPresenter.kt
@@ -0,0 +1,157 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.repositories.recover.RecoverRepository
+import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.ui.base.BasePresenter
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.ifNullOrBlank
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
+import javax.inject.Inject
+
+class LoginRecoverPresenter @Inject constructor(
+    studentRepository: StudentRepository,
+    private val loginErrorHandler: RecoverErrorHandler,
+    private val analytics: FirebaseAnalyticsHelper,
+    private val recoverRepository: RecoverRepository
+) : BasePresenter<LoginRecoverView>(loginErrorHandler, studentRepository) {
+
+    private lateinit var lastError: Throwable
+
+    override fun onAttachView(view: LoginRecoverView) {
+        super.onAttachView(view)
+        view.initView()
+
+        with(loginErrorHandler) {
+            showErrorMessage = ::showErrorMessage
+            onInvalidUsername = ::onInvalidUsername
+            onInvalidCaptcha = ::onInvalidCaptcha
+        }
+    }
+
+    fun onNameTextChanged() {
+        view?.clearUsernameError()
+    }
+
+    fun onHostSelected() {
+        view?.run {
+            if ("fakelog" in recoverHostValue) setDefaultCredentials("jan@fakelog.cf")
+            clearUsernameError()
+            updateFields()
+        }
+    }
+
+    fun updateFields() {
+        view?.run {
+            setUsernameHint(if ("standard" in recoverHostValue) emailHintString else loginPeselEmailHintString)
+        }
+    }
+
+    fun onRecoverClick() {
+        val username = view?.recoverNameValue.orEmpty()
+        val host = view?.recoverHostValue.orEmpty()
+        val symbol = view?.formHostSymbol.orEmpty()
+
+        if (!validateInput(username, host)) return
+
+        flowWithResource { recoverRepository.getReCaptchaSiteKey(host, symbol.ifBlank { "Default" }) }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    hideSoftKeyboard()
+                    showRecoverForm(false)
+                    showProgress(true)
+                    showErrorView(false)
+                    showCaptcha(false)
+                }
+                Status.SUCCESS -> view?.run {
+                    loadReCaptcha(url = it.data!!.first, siteKey = it.data.second)
+                    showProgress(false)
+                    showErrorView(false)
+                    showCaptcha(true)
+                }
+                Status.ERROR -> {
+                    Timber.i("Obtain captcha site key result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launch("captcha")
+    }
+
+    private fun validateInput(username: String, host: String): Boolean {
+        var isCorrect = true
+
+        if (username.isEmpty()) {
+            view?.setErrorNameRequired()
+            isCorrect = false
+        }
+
+        if ("standard" in host && "@" !in username) {
+            view?.setUsernameError(view?.invalidEmailString.orEmpty())
+            isCorrect = false
+        }
+
+        return isCorrect
+    }
+
+    fun onReCaptchaVerified(reCaptchaResponse: String) {
+        val username = view?.recoverNameValue.orEmpty()
+        val host = view?.recoverHostValue.orEmpty()
+        val symbol = view?.formHostSymbol.ifNullOrBlank { "Default" }
+
+        flowWithResource { recoverRepository.sendRecoverRequest(host, symbol, username, reCaptchaResponse) }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    showProgress(true)
+                    showRecoverForm(false)
+                    showCaptcha(false)
+                }
+                Status.SUCCESS -> view?.run {
+                    showSuccessView(true)
+                    setSuccessTitle(it.data!!.substringBefore(". "))
+                    setSuccessMessage(it.data.substringAfter(". "))
+                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to true)
+                }
+                Status.ERROR -> {
+                    Timber.i("Send recover request result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                    analytics.logEvent("account_recover", "register" to host, "symbol" to symbol, "success" to false)
+                }
+            }
+        }.afterLoading {
+            view?.showProgress(false)
+        }.launch("verified")
+    }
+
+    fun onDetailsClick() {
+        view?.showErrorDetailsDialog(lastError)
+    }
+
+    private fun showErrorMessage(message: String, error: Throwable) {
+        view?.run {
+            lastError = error
+            showProgress(false)
+            setErrorDetails(message)
+            showErrorView(true)
+        }
+    }
+
+    private fun onInvalidUsername(message: String) {
+        view?.run {
+            setUsernameError(message)
+            showRecoverForm(true)
+        }
+    }
+
+    private fun onInvalidCaptcha(message: String, error: Throwable) {
+        view?.run {
+            lastError = error
+            setErrorDetails(message)
+            showCaptcha(false)
+            showRecoverForm(false)
+            showErrorView(true)
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
new file mode 100644
index 000000000..2e21d3351
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/LoginRecoverView.kt
@@ -0,0 +1,52 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import io.github.wulkanowy.ui.base.BaseView
+
+interface LoginRecoverView : BaseView {
+
+    val recoverHostValue: String
+
+    val formHostSymbol: String
+
+    val recoverNameValue: String
+
+    val emailHintString: String
+
+    val loginPeselEmailHintString: String
+
+    val invalidEmailString: String
+
+    fun initView()
+
+    fun setDefaultCredentials(username: String)
+
+    fun clearUsernameError()
+
+    fun setErrorNameRequired()
+
+    fun setUsernameHint(hint: String)
+
+    fun setUsernameError(message: String)
+
+    fun showSoftKeyboard()
+
+    fun hideSoftKeyboard()
+
+    fun showProgress(show: Boolean)
+
+    fun showRecoverForm(show: Boolean)
+
+    fun showCaptcha(show: Boolean)
+
+    fun showErrorView(show: Boolean)
+
+    fun setErrorDetails(message: String)
+
+    fun showSuccessView(show: Boolean)
+
+    fun setSuccessMessage(message: String)
+
+    fun setSuccessTitle(title: String)
+
+    fun loadReCaptcha(siteKey: String, url: String)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
new file mode 100644
index 000000000..110dd82e5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/recover/RecoverErrorHandler.kt
@@ -0,0 +1,32 @@
+package io.github.wulkanowy.ui.modules.login.recover
+
+import android.content.res.Resources
+import com.chuckerteam.chucker.api.ChuckerCollector
+import io.github.wulkanowy.sdk.scrapper.exception.InvalidCaptchaException
+import io.github.wulkanowy.sdk.scrapper.exception.InvalidEmailException
+import io.github.wulkanowy.sdk.scrapper.exception.NoAccountFoundException
+import io.github.wulkanowy.ui.base.ErrorHandler
+import javax.inject.Inject
+
+class RecoverErrorHandler @Inject constructor(
+    resources: Resources,
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
+
+    var onInvalidUsername: (String) -> Unit = {}
+
+    var onInvalidCaptcha: (String, Throwable) -> Unit = { _, _ -> }
+
+    override fun proceed(error: Throwable) {
+        when (error) {
+            is InvalidEmailException, is NoAccountFoundException -> onInvalidUsername(error.localizedMessage.orEmpty())
+            is InvalidCaptchaException -> onInvalidCaptcha(error.localizedMessage.orEmpty(), error)
+            else -> super.proceed(error)
+        }
+    }
+
+    override fun clear() {
+        super.clear()
+        onInvalidUsername = {}
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
new file mode 100644
index 000000000..c046c2ff5
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectAdapter.kt
@@ -0,0 +1,66 @@
+package io.github.wulkanowy.ui.modules.login.studentselect
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.ItemLoginStudentSelectBinding
+import javax.inject.Inject
+
+class LoginStudentSelectAdapter @Inject constructor() :
+    RecyclerView.Adapter<LoginStudentSelectAdapter.ItemViewHolder>() {
+
+    private val checkedList = mutableMapOf<Int, Boolean>()
+
+    var items = emptyList<Pair<StudentWithSemesters, Boolean>>()
+        set(value) {
+            field = value
+            checkedList.clear()
+        }
+
+    var onClickListener: (StudentWithSemesters, alreadySaved: Boolean) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemLoginStudentSelectBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (studentAndSemesters, alreadySaved) = items[position]
+        val student = studentAndSemesters.student
+        val semesters = studentAndSemesters.semesters
+        val diary = semesters.maxByOrNull { it.semesterId }
+
+        with(holder.binding) {
+            loginItemName.text = "${student.studentName} ${diary?.diaryName.orEmpty()}"
+            loginItemSchool.text = student.schoolName
+            loginItemName.isEnabled = !alreadySaved
+            loginItemSchool.isEnabled = !alreadySaved
+            loginItemSignedIn.visibility = if (alreadySaved) View.VISIBLE else View.GONE
+
+            with(loginItemCheck) {
+                isEnabled = !alreadySaved
+                keyListener = null
+                isChecked = checkedList[position] ?: false
+            }
+
+            root.setOnClickListener {
+                onClickListener(studentAndSemesters, alreadySaved)
+
+                with(loginItemCheck) {
+                    if (isEnabled) {
+                        isChecked = !isChecked
+                        checkedList[position] = isChecked
+                    }
+                }
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemLoginStudentSelectBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
index 8478f7ccf..e71fc0f6f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectFragment.kt
@@ -1,33 +1,32 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentLoginStudentSelectBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_login_student_select.*
 import java.io.Serializable
 import javax.inject.Inject
 
-class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
+@AndroidEntryPoint
+class LoginStudentSelectFragment :
+    BaseFragment<FragmentLoginStudentSelectBinding>(R.layout.fragment_login_student_select),
+    LoginStudentSelectView {
 
     @Inject
     lateinit var presenter: LoginStudentSelectPresenter
 
     @Inject
-    lateinit var loginAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var loginAdapter: LoginStudentSelectAdapter
 
     @Inject
     lateinit var appInfo: AppInfo
@@ -38,29 +37,32 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
         fun newInstance() = LoginStudentSelectFragment()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_student_select, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginStudentSelectBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_STUDENTS))
     }
 
     override fun initView() {
-        loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
-        loginAdapter.apply { setOnItemClickListener { presenter.onItemSelected(it) } }
-        loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
-        loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
+        loginAdapter.onClickListener = presenter::onItemSelected
 
-        loginStudentSelectRecycler.apply {
-            adapter = loginAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding) {
+            loginStudentSelectSignIn.setOnClickListener { presenter.onSignIn() }
+            loginStudentSelectContactDiscord.setOnClickListener { presenter.onDiscordClick() }
+            loginStudentSelectContactEmail.setOnClickListener { presenter.onEmailClick() }
+
+            with(loginStudentSelectRecycler) {
+                layoutManager = LinearLayoutManager(context)
+                adapter = loginAdapter
+            }
         }
     }
 
-    override fun updateData(data: List<LoginStudentSelectItem>) {
-        loginAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>) {
+        with(loginAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun openMainView() {
@@ -68,19 +70,19 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSignIn(enable: Boolean) {
-        loginStudentSelectSignIn.isEnabled = enable
+        binding.loginStudentSelectSignIn.isEnabled = enable
     }
 
-    fun onParentInitStudentSelectFragment(students: List<Student>) {
-        presenter.onParentInitStudentSelectView(students)
+    fun onParentInitStudentSelectFragment(studentsWithSemesters: List<StudentWithSemesters>) {
+        presenter.onParentInitStudentSelectView(studentsWithSemesters)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -89,7 +91,7 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
     }
 
     override fun showContact(show: Boolean) {
-        loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
+        binding.loginStudentSelectContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
@@ -101,12 +103,17 @@ class LoginStudentSelectFragment : BaseFragment(), LoginStudentSelectView {
         context?.openInternetBrowser("https://discord.gg/vccAQBr", ::showMessage)
     }
 
-    override fun openEmail() {
+    override fun openEmail(lastError: String) {
         context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text, appInfo.systemModel,
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "Select users to log in",
+                lastError
+            )
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
deleted file mode 100644
index fa21cff94..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.ui.modules.login.studentselect
-
-import android.annotation.SuppressLint
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_login_student_select.*
-
-class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_login_student_select
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
-        return ItemViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ItemViewHolder, position: Int, payloads: MutableList<Any>) {
-        holder.apply {
-            loginItemName.text = "${student.studentName} ${student.className}"
-            loginItemSchool.text = student.schoolName
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as LoginStudentSelectItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return student.hashCode()
-    }
-
-    class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View
-            get() = itemView
-
-        init {
-            loginItemCheck.keyListener = null
-        }
-
-        override fun onClick(view: View?) {
-            super.onClick(view)
-            loginItemCheck.apply { isChecked = !isChecked }
-        }
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
index 841c225d7..1384f25a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
@@ -1,31 +1,34 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.ifNullOrBlank
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginStudentSelectPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository, schedulers) {
+) : BasePresenter<LoginStudentSelectView>(loginErrorHandler, studentRepository) {
 
-    var students = emptyList<Student>()
+    private var lastError: Throwable? = null
 
-    private var selectedStudents = mutableListOf<Student>()
+    var students = emptyList<StudentWithSemesters>()
+
+    private val selectedStudents = mutableListOf<StudentWithSemesters>()
 
     fun onAttachView(view: LoginStudentSelectView, students: Serializable?) {
         super.onAttachView(view)
-        view.run {
+        with(view) {
             initView()
             showContact(false)
             enableSignIn(false)
@@ -36,7 +39,7 @@ class LoginStudentSelectPresenter @Inject constructor(
         }
 
         if (students is List<*> && students.isNotEmpty()) {
-            loadData(students.filterIsInstance<Student>())
+            loadData(students.filterIsInstance<StudentWithSemesters>())
         }
     }
 
@@ -44,54 +47,83 @@ class LoginStudentSelectPresenter @Inject constructor(
         registerStudents(selectedStudents)
     }
 
-    fun onParentInitStudentSelectView(students: List<Student>) {
-        loadData(students)
-        if (students.size == 1) registerStudents(students)
+    fun onParentInitStudentSelectView(studentsWithSemesters: List<StudentWithSemesters>) {
+        loadData(studentsWithSemesters)
+        if (studentsWithSemesters.size == 1) registerStudents(studentsWithSemesters)
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is LoginStudentSelectItem) {
-            selectedStudents.removeAll { it == item.student }
-                .let { if (!it) selectedStudents.add(item.student) }
+    fun onItemSelected(studentWithSemester: StudentWithSemesters, alreadySaved: Boolean) {
+        if (alreadySaved) return
 
-            view?.enableSignIn(selectedStudents.isNotEmpty())
-        }
+        selectedStudents
+            .removeAll { it == studentWithSemester }
+            .let { if (!it) selectedStudents.add(studentWithSemester) }
+
+        view?.enableSignIn(selectedStudents.isNotEmpty())
     }
 
-    private fun loadData(students: List<Student>) {
-        this.students = students
-        view?.apply {
-            updateData(students.map { LoginStudentSelectItem(it) })
-        }
+    private fun compareStudents(a: Student, b: Student): Boolean {
+        return a.email == b.email
+            && a.symbol == b.symbol
+            && a.studentId == b.studentId
+            && a.schoolSymbol == b.schoolSymbol
+            && a.classId == b.classId
     }
 
-    private fun registerStudents(students: List<Student>) {
-        disposable.add(studentRepository.saveStudents(students)
-            .map { students.first().apply { id = it.first() } }
-            .flatMapCompletable { studentRepository.switchStudent(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.apply {
+    private fun loadData(studentsWithSemesters: List<StudentWithSemesters>) {
+        resetSelectedState()
+        this.students = studentsWithSemesters
+
+        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Login student select students load started")
+                Status.SUCCESS -> view?.updateData(studentsWithSemesters.map { studentWithSemesters ->
+                    studentWithSemesters to it.data!!.any { item -> compareStudents(studentWithSemesters.student, item.student) }
+                })
+                Status.ERROR -> {
+                    errorHandler.dispatch(it.error!!)
+                    lastError = it.error
+                    view?.updateData(studentsWithSemesters.map { student -> student to false })
+                }
+            }
+        }.launch()
+    }
+
+    private fun resetSelectedState() {
+        selectedStudents.clear()
+        view?.enableSignIn(false)
+    }
+
+    private fun registerStudents(studentsWithSemesters: List<StudentWithSemesters>) {
+        flowWithResource {
+            val savedStudents = studentRepository.saveStudents(studentsWithSemesters)
+            val firstRegistered = studentsWithSemesters.first().apply { student.id = savedStudents.first() }
+            studentRepository.switchStudent(firstRegistered)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Registration started")
                     showProgress(true)
                     showContent(false)
                 }
-                Timber.i("Registration started")
-            }
-            .subscribe({
-                students.forEach { analytics.logEvent("registration_student_select", "success" to true, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to "No error") }
-                Timber.i("Registration result: Success")
-                view?.openMainView()
-            }, { error ->
-                students.forEach { analytics.logEvent("registration_student_select", "success" to false, "scrapperBaseUrl" to it.scrapperBaseUrl, "symbol" to it.symbol, "error" to error.message.ifNullOrBlank { "No message" }) }
-                Timber.i("Registration result: An exception occurred ")
-                loginErrorHandler.dispatch(error)
-                view?.apply {
-                    showProgress(false)
-                    showContent(true)
-                    showContact(true)
+                Status.SUCCESS -> {
+                    Timber.i("Registration result: Success")
+                    view?.openMainView()
+                    logRegisterEvent(studentsWithSemesters)
                 }
-            }))
+                Status.ERROR -> {
+                    Timber.i("Registration result: An exception occurred ")
+                    view?.apply {
+                        showProgress(false)
+                        showContent(true)
+                        showContact(true)
+                    }
+                    lastError = it.error
+                    loginErrorHandler.dispatch(it.error!!)
+                    logRegisterEvent(studentsWithSemesters, it.error)
+                }
+            }
+        }.launch("register")
     }
 
     fun onDiscordClick() {
@@ -99,6 +131,17 @@ class LoginStudentSelectPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail()
+        view?.openEmail(lastError?.message.ifNullOrBlank { "empty" })
+    }
+
+    private fun logRegisterEvent(studentsWithSemesters: List<StudentWithSemesters>, error: Throwable? = null) {
+        studentsWithSemesters.forEach { student ->
+            analytics.logEvent(
+                "registration_student_select",
+                "success" to (error != null),
+                "scrapperBaseUrl" to student.student.scrapperBaseUrl,
+                "symbol" to student.student.symbol,
+                "error" to (error?.message?.ifBlank { "No message" } ?: "No error"))
+        }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
index 238771009..f2acd76c5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginStudentSelectView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<LoginStudentSelectItem>)
+    fun updateData(data: List<Pair<StudentWithSemesters, Boolean>>)
 
     fun openMainView()
 
@@ -20,5 +21,5 @@ interface LoginStudentSelectView : BaseView {
 
     fun openDiscordInvite()
 
-    fun openEmail()
+    fun openEmail(lastError: String)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
index 5e9ce3ba3..e2c37db61 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolFragment.kt
@@ -1,17 +1,17 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.view.inputmethod.EditorInfo.IME_NULL
 import android.widget.ArrayAdapter
 import androidx.core.widget.doOnTextChanged
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
+import io.github.wulkanowy.databinding.FragmentLoginSymbolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.utils.AppInfo
@@ -19,10 +19,11 @@ import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.openEmailClient
 import io.github.wulkanowy.utils.openInternetBrowser
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.fragment_login_symbol.*
 import javax.inject.Inject
 
-class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
+@AndroidEntryPoint
+class LoginSymbolFragment :
+    BaseFragment<FragmentLoginSymbolBinding>(R.layout.fragment_login_symbol), LoginSymbolView {
 
     @Inject
     lateinit var presenter: LoginSymbolPresenter
@@ -37,29 +38,28 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override val symbolNameError: CharSequence?
-        get() = loginSymbolNameLayout.error
+        get() = binding.loginSymbolNameLayout.error
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_login_symbol, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLoginSymbolBinding.bind(view)
         presenter.onAttachView(this, savedInstanceState?.getSerializable(SAVED_LOGIN_DATA))
     }
 
     override fun initView() {
-        loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
-        loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
-        loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
+        with(binding) {
+            loginSymbolSignIn.setOnClickListener { presenter.attemptLogin(loginSymbolName.text.toString()) }
+            loginSymbolFaq.setOnClickListener { presenter.onFaqClick() }
+            loginSymbolContactEmail.setOnClickListener { presenter.onEmailClick() }
 
-        loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
+            loginSymbolName.doOnTextChanged { _, _, _, _ -> presenter.onSymbolTextChanged() }
 
-        loginSymbolName.apply {
-            setOnEditorActionListener { _, id, _ ->
-                if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
+            loginSymbolName.apply {
+                setOnEditorActionListener { _, id, _ ->
+                    if (id == IME_ACTION_DONE || id == IME_NULL) loginSymbolSignIn.callOnClick() else false
+                }
+                setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
             }
-            setAdapter(ArrayAdapter(context, android.R.layout.simple_list_item_1, resources.getStringArray(R.array.symbols_values)))
         }
     }
 
@@ -68,25 +68,25 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override fun setErrorSymbolIncorrect() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_incorrect_symbol)
         }
     }
 
     override fun setErrorSymbolRequire() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             requestFocus()
             error = getString(R.string.login_field_required)
         }
     }
 
     override fun clearSymbolError() {
-        loginSymbolNameLayout.error = null
+        binding.loginSymbolNameLayout.error = null
     }
 
     override fun clearAndFocusSymbol() {
-        loginSymbolNameLayout.apply {
+        binding.loginSymbolNameLayout.apply {
             editText?.text = null
             requestFocus()
         }
@@ -101,15 +101,15 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override fun showProgress(show: Boolean) {
-        loginSymbolProgress.visibility = if (show) VISIBLE else GONE
+        binding.loginSymbolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        loginSymbolContainer.visibility = if (show) VISIBLE else GONE
+        binding.loginSymbolContainer.visibility = if (show) VISIBLE else GONE
     }
 
-    override fun notifyParentAccountLogged(students: List<Student>) {
-        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(students)
+    override fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>) {
+        (activity as? LoginActivity)?.onSymbolFragmentAccountLogged(studentsWithSemesters)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -118,24 +118,30 @@ class LoginSymbolFragment : BaseFragment(), LoginSymbolView {
     }
 
     override fun showContact(show: Boolean) {
-        loginSymbolContact.visibility = if (show) VISIBLE else GONE
+        binding.loginSymbolContact.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 
     override fun openFaqPage() {
         context?.openInternetBrowser("https://wulkanowy.github.io/czesto-zadawane-pytania/co-to-jest-symbol", ::showMessage)
     }
 
-    override fun openEmail() {
+    override fun openEmail(host: String, lastError: String) {
         context?.openEmailClient(
-            requireContext().getString(R.string.login_email_intent_title),
-            "wulkanowyinc@gmail.com",
-            requireContext().getString(R.string.login_email_subject),
-            requireContext().getString(R.string.login_email_text, appInfo.systemModel, appInfo.systemVersion.toString(), appInfo.versionName)
+            chooserTitle = requireContext().getString(R.string.login_email_intent_title),
+            email = "wulkanowyinc@gmail.com",
+            subject = requireContext().getString(R.string.login_email_subject),
+            body = requireContext().getString(R.string.login_email_text,
+                "${appInfo.systemManufacturer} ${appInfo.systemModel}",
+                appInfo.systemVersion.toString(),
+                appInfo.versionName,
+                "$host/${binding.loginSymbolName.text}",
+                lastError
+            )
         )
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
index ee6c30c3b..a2cda4fc1 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolPresenter.kt
@@ -1,22 +1,25 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.ifNullOrBlank
-import io.reactivex.Single
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.io.Serializable
 import javax.inject.Inject
 
 class LoginSymbolPresenter @Inject constructor(
     studentRepository: StudentRepository,
-    schedulers: SchedulersProvider,
     private val loginErrorHandler: LoginErrorHandler,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository, schedulers) {
+) : BasePresenter<LoginSymbolView>(loginErrorHandler, studentRepository) {
+
+    private var lastError: Throwable? = null
 
     var loginData: Triple<String, String, String>? = null
 
@@ -37,48 +40,62 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun attemptLogin(symbol: String) {
+        if (loginData == null) throw IllegalArgumentException("Login data is null")
+
         if (symbol.isBlank()) {
             view?.setErrorSymbolRequire()
             return
         }
 
-        disposable.add(
-            Single.fromCallable { if (loginData == null) throw IllegalArgumentException("Login data is null") else loginData }
-                .flatMap { studentRepository.getStudentsScrapper(it.first, it.second, it.third, symbol) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doOnSubscribe {
-                    view?.apply {
-                        hideSoftKeyboard()
-                        showProgress(true)
-                        showContent(false)
-                    }
+        flowWithResource { studentRepository.getStudentsScrapper(loginData!!.first, loginData!!.second, loginData!!.third, symbol) }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
                     Timber.i("Login with symbol started")
+                    hideSoftKeyboard()
+                    showProgress(true)
+                    showContent(false)
                 }
-                .doFinally {
-                    view?.apply {
-                        showProgress(false)
-                        showContent(true)
-                    }
-                }
-                .subscribe({
-                    analytics.logEvent("registration_symbol", "success" to true, "students" to it.size, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to "No error")
-                    view?.apply {
-                        if (it.isEmpty()) {
+                Status.SUCCESS -> {
+                    view?.run {
+                        if (it.data!!.isEmpty()) {
                             Timber.i("Login with symbol result: Empty student list")
                             setErrorSymbolIncorrect()
                             view?.showContact(true)
                         } else {
                             Timber.i("Login with symbol result: Success")
-                            notifyParentAccountLogged(it)
+                            notifyParentAccountLogged(it.data)
                         }
                     }
-                }, {
+                    analytics.logEvent(
+                        "registration_symbol",
+                        "success" to true,
+                        "students" to it.data!!.size,
+                        "scrapperBaseUrl" to loginData?.third,
+                        "symbol" to symbol,
+                        "error" to "No error"
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Login with symbol result: An exception occurred")
-                    analytics.logEvent("registration_symbol", "success" to false, "students" to -1, "scrapperBaseUrl" to loginData?.third, "symbol" to symbol, "error" to it.message.ifNullOrBlank { "No message" })
-                    loginErrorHandler.dispatch(it)
+                    analytics.logEvent(
+                        "registration_symbol",
+                        "success" to false,
+                        "students" to -1,
+                        "scrapperBaseUrl" to loginData?.third,
+                        "symbol" to symbol,
+                        "error" to it.error!!.message.ifNullOrBlank { "No message" }
+                    )
+                    loginErrorHandler.dispatch(it.error)
+                    lastError = it.error
                     view?.showContact(true)
-                }))
+                }
+            }
+        }.afterLoading {
+            view?.apply {
+                showProgress(false)
+                showContent(true)
+            }
+        }.launch("login")
     }
 
     fun onParentInitSymbolView(loginData: Triple<String, String, String>) {
@@ -94,6 +111,6 @@ class LoginSymbolPresenter @Inject constructor(
     }
 
     fun onEmailClick() {
-        view?.openEmail()
+        view?.openEmail(loginData?.third.orEmpty(), lastError?.message.ifNullOrBlank { "empty" })
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
index 1afc15327..830c77d17 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/login/symbol/LoginSymbolView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.login.symbol
 
-import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LoginSymbolView : BaseView {
@@ -25,11 +25,11 @@ interface LoginSymbolView : BaseView {
 
     fun showContent(show: Boolean)
 
-    fun notifyParentAccountLogged(students: List<Student>)
+    fun notifyParentAccountLogged(studentsWithSemesters: List<StudentWithSemesters>)
 
     fun showContact(show: Boolean)
 
     fun openFaqPage()
 
-    fun openEmail()
+    fun openEmail(host: String, lastError: String)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
index 12bf1a132..0f1d836d0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberFragment.kt
@@ -1,19 +1,21 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.LuckyNumber
+import io.github.wulkanowy.databinding.FragmentLuckyNumberBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
-import kotlinx.android.synthetic.main.fragment_lucky_number.*
 import javax.inject.Inject
 
-class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView {
+@AndroidEntryPoint
+class LuckyNumberFragment :
+    BaseFragment<FragmentLuckyNumberBinding>(R.layout.fragment_lucky_number), LuckyNumberView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: LuckyNumberPresenter
@@ -25,58 +27,57 @@ class LuckyNumberFragment : BaseFragment(), LuckyNumberView, MainView.TitledView
     override val titleStringId: Int
         get() = R.string.lucky_number_title
 
-    override val isViewEmpty get() = luckyNumberText.text.isBlank()
+    override val isViewEmpty get() = binding.luckyNumberText.text.isBlank()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_lucky_number, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = luckyNumberSwipe
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentLuckyNumberBinding.bind(view)
+        messageContainer = binding.luckyNumberSwipe
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
-        luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            luckyNumberSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            luckyNumberErrorRetry.setOnClickListener { presenter.onRetry() }
+            luckyNumberErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        }
     }
 
     override fun updateData(data: LuckyNumber) {
-        luckyNumberText.text = data.luckyNumber.toString()
+        binding.luckyNumberText.text = data.luckyNumber.toString()
     }
 
     override fun hideRefresh() {
-        luckyNumberSwipe.isRefreshing = false
+        binding.luckyNumberSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
+        binding.luckyNumberEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        luckyNumberError.visibility = if (show) VISIBLE else GONE
+        binding.luckyNumberError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        luckyNumberErrorMessage.text = message
+        binding.luckyNumberErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        luckyNumberProgress.visibility = if (show) VISIBLE else GONE
+        binding.luckyNumberProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        luckyNumberSwipe.isEnabled = enable
+        binding.luckyNumberSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        luckyNumberContent.visibility = if (show) VISIBLE else GONE
+        binding.luckyNumberContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun onDestroyView() {
-        super.onDestroyView()
         presenter.onDetachView()
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
index c86aab976..90aea441e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumber/LuckyNumberPresenter.kt
@@ -1,23 +1,23 @@
 package io.github.wulkanowy.ui.modules.luckynumber
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class LuckyNumberPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val luckyNumberRepository: LuckyNumberRepository,
-    private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<LuckyNumberView>(errorHandler, studentRepository) {
 
     private lateinit var lastError: Throwable
 
@@ -34,43 +34,47 @@ class LuckyNumberPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading lucky number started")
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .flatMapMaybe { luckyNumberRepository.getLuckyNumber(it, forceRefresh) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            luckyNumberRepository.getLuckyNumber(student, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading lucky number started")
+                Status.SUCCESS -> {
+                    if (it.data != null) {
+                        Timber.i("Loading lucky number result: Success")
+                        view?.apply {
+                            updateData(it.data)
+                            showContent(true)
+                            showEmpty(false)
+                            showErrorView(false)
+                        }
+                        analytics.logEvent(
+                            "load_item",
+                            "type" to "lucky_number",
+                            "number" to it.data.luckyNumber
+                        )
+                    } else {
+                        Timber.i("Loading lucky number result: No lucky number found")
+                        view?.run {
+                            showContent(false)
+                            showEmpty(true)
+                            showErrorView(false)
+                        }
                     }
                 }
-                .subscribe({
-                    Timber.i("Loading lucky number result: Success")
-                    view?.apply {
-                        updateData(it)
-                        showContent(true)
-                        showEmpty(false)
-                        showErrorView(false)
-                    }
-                    analytics.logEvent("load_lucky_number", "lucky_number" to it.luckyNumber, "force_refresh" to forceRefresh)
-                }, {
+                Status.ERROR -> {
                     Timber.i("Loading lucky number result: An exception occurred")
-                    errorHandler.dispatch(it)
-                }, {
-                    Timber.i("Loading lucky number result: No lucky number found")
-                    view?.run {
-                        showContent(false)
-                        showEmpty(true)
-                        showErrorView(false)
-                    }
-                })
-            )
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
index e8ce3bcfb..692615d98 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureActivity.kt
@@ -4,34 +4,41 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.activity_widget_configure.*
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigurePresenter>(),
+@AndroidEntryPoint
+class LuckyNumberWidgetConfigureActivity :
+    BaseActivity<LuckyNumberWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     LuckyNumberWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var configureAdapter: WidgetConfigureAdapter
 
     @Inject
     override lateinit var presenter: LuckyNumberWidgetConfigurePresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     private var dialog: AlertDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(R.layout.activity_widget_configure)
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID))
@@ -39,31 +46,35 @@ class LuckyNumberWidgetConfigureActivity : BaseActivity<LuckyNumberWidgetConfigu
     }
 
     override fun initView() {
-        with(widgetConfigureRecycler) {
+        with(binding.widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+            layoutManager = LinearLayoutManager(context)
         }
 
-        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
+        configureAdapter.onClickListener = presenter::onItemSelect
     }
 
     override fun showThemeDialog() {
-        val items = arrayOf(
+        var items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
+        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += (getString(R.string.widget_timetable_theme_system))
 
-       dialog =  AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
+        dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
-           .setOnDismissListener { presenter.onDismissThemeView() }
+            .setOnDismissListener { presenter.onDismissThemeView() }
             .setSingleChoiceItems(items, -1) { _, which ->
                 presenter.onThemeSelect(which)
             }
             .show()
     }
 
-    override fun updateData(data: List<LuckyNumberWidgetConfigureItem>) {
-        configureAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
+        with(configureAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateLuckyNumberWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
deleted file mode 100644
index e260b7fcb..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureItem.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.ui.modules.luckynumberwidget
-
-import android.annotation.SuppressLint
-import android.view.View
-import androidx.core.graphics.ColorUtils
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetConfigureItem
-import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
-
-class LuckyNumberWidgetConfigureItem(var student: Student, val isCurrent: Boolean) :
-    AbstractFlexibleItem<LuckyNumberWidgetConfigureItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        val context = holder.contentView.context
-
-        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
-
-        with(holder) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setColorFilter(colorImage)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableWidgetConfigureItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
index 6e4716bfa..574120b36 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigurePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,15 +8,16 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.luckynumberwidget.LuckyNumberWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
 import javax.inject.Inject
 
 class LuckyNumberWidgetConfigurePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<LuckyNumberWidgetConfigureView>(errorHandler, studentRepository) {
 
     private var appWidgetId: Int? = null
 
@@ -29,11 +30,9 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(item: AbstractFlexibleItem<*>) {
-        if (item is LuckyNumberWidgetConfigureItem) {
-            selectedStudent = item.student
-            view?.showThemeDialog()
-        }
+    fun onItemSelect(student: Student) {
+        selectedStudent = student
+        view?.showThemeDialog()
     }
 
     fun onThemeSelect(index: Int) {
@@ -43,28 +42,30 @@ class LuckyNumberWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView(){
+    fun onDismissThemeView() {
         view?.finishView()
     }
 
     private fun loadData() {
-        disposable.add(studentRepository.getSavedStudents(false)
-            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
-            .map { (students, currentStudentId) ->
-                students.map { student -> LuckyNumberWidgetConfigureItem(student, student.id == currentStudentId) }
-            }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                when {
-                    it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 -> {
-                        selectedStudent = it.single().student
-                        view?.showThemeDialog()
+        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Lucky number widget configure students data load")
+                Status.SUCCESS -> {
+                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
+                    when {
+                        it.data!!.isEmpty() -> view?.openLoginView()
+                        it.data.size == 1 -> {
+                            selectedStudent = it.data.single().student
+                            view?.showThemeDialog()
+                        }
+                        else -> view?.updateData(it.data.map { entity ->
+                            entity.student to (entity.student.id == widgetId)
+                        })
                     }
-                    else -> view?.updateData(it)
                 }
-            }, { errorHandler.dispatch(it) }))
+                Status.ERROR -> errorHandler.dispatch(it.error!!)
+            }
+        }.launch()
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
index fa4c0cc61..c8c348ed3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetConfigureView.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface LuckyNumberWidgetConfigureView : BaseView {
@@ -8,7 +9,7 @@ interface LuckyNumberWidgetConfigureView : BaseView {
 
     fun showThemeDialog()
 
-    fun updateData(data: List<LuckyNumberWidgetConfigureItem>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     fun updateLuckyNumberWidget(widgetId: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
index 12753b35d..b7f4b740e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/luckynumberwidget/LuckyNumberWidgetProvider.kt
@@ -1,56 +1,39 @@
 package io.github.wulkanowy.ui.modules.luckynumberwidget
 
-import android.annotation.TargetApi
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_OPTIONS_CHANGED
-import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
-import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_OPTIONS
 import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT
-import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH
-import android.content.BroadcastReceiver
+import android.appwidget.AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH
+import android.appwidget.AppWidgetProvider
 import android.content.Context
-import android.content.Intent
-import android.os.Build
+import android.content.res.Configuration
+import android.os.Bundle
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.RemoteViews
-import dagger.android.AndroidInjection
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
-import io.github.wulkanowy.data.db.entities.LuckyNumber
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.luckynumber.LuckyNumberRepository
-import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Maybe
+import io.github.wulkanowy.utils.toFirstResult
+import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import javax.inject.Inject
 
-class LuckyNumberWidgetProvider : BroadcastReceiver() {
+@AndroidEntryPoint
+class LuckyNumberWidgetProvider : AppWidgetProvider() {
 
     @Inject
     lateinit var studentRepository: StudentRepository
 
-    @Inject
-    lateinit var semesterRepository: SemesterRepository
-
     @Inject
     lateinit var luckyNumberRepository: LuckyNumberRepository
 
-    @Inject
-    lateinit var schedulers: SchedulersProvider
-
-    @Inject
-    lateinit var appWidgetManager: AppWidgetManager
-
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
@@ -59,64 +42,106 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
         fun getStudentWidgetKey(appWidgetId: Int) = "lucky_number_widget_student_$appWidgetId"
 
         fun getThemeWidgetKey(appWidgetId: Int) = "lucky_number_widget_theme_$appWidgetId"
+
+        fun getHeightWidgetKey(appWidgetId: Int) = "lucky_number_widget_height_$appWidgetId"
+
+        fun getWidthWidgetKey(appWidgetId: Int) = "lucky_number_widget_width_$appWidgetId"
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-        when (intent.action) {
-            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-            ACTION_APPWIDGET_DELETED -> onDelete(intent)
-            ACTION_APPWIDGET_OPTIONS_CHANGED -> onOptionsChange(context, intent)
-        }
-    }
-
-    private fun onUpdate(context: Context, intent: Intent) {
-        intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
-            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray?) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds)
+        appWidgetIds?.forEach { appWidgetId ->
 
             val luckyNumber = getLuckyNumber(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
             val appIntent = PendingIntent.getActivity(context, MainView.Section.LUCKY_NUMBER.id,
                 MainActivity.getStartIntent(context, MainView.Section.LUCKY_NUMBER, true), FLAG_UPDATE_CURRENT)
 
-            val remoteView = RemoteViews(context.packageName, layoutId).apply {
+            val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context)).apply {
                 setTextViewText(R.id.luckyNumberWidgetNumber, luckyNumber?.luckyNumber?.toString() ?: "#")
                 setOnClickPendingIntent(R.id.luckyNumberWidgetContainer, appIntent)
             }
 
-            setStyles(remoteView, intent)
+            setStyles(remoteView, appWidgetId)
             appWidgetManager.updateAppWidget(appWidgetId, remoteView)
         }
     }
 
-    private fun onDelete(intent: Intent) {
-        val appWidgetId = intent.getIntExtra(EXTRA_APPWIDGET_ID, 0)
-        if (appWidgetId != 0) sharedPref.delete(getStudentWidgetKey(appWidgetId))
+    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
+        super.onDeleted(context, appWidgetIds)
+        appWidgetIds?.forEach { appWidgetId ->
+            with(sharedPref) {
+                delete(getHeightWidgetKey(appWidgetId))
+                delete(getStudentWidgetKey(appWidgetId))
+                delete(getThemeWidgetKey(appWidgetId))
+                delete(getWidthWidgetKey(appWidgetId))
+            }
+        }
     }
 
-    private fun getLuckyNumber(studentId: Long, appWidgetId: Int): LuckyNumber? {
-        return try {
-            studentRepository.isStudentSaved()
-                .filter { true }
-                .flatMap { studentRepository.getSavedStudents().toMaybe() }
-                .flatMap { students ->
-                    val student = students.singleOrNull { student -> student.id == studentId }
-                    when {
-                        student != null -> Maybe.just(student)
-                        studentId != 0L -> {
-                            studentRepository.isCurrentStudentSet()
-                                .filter { true }
-                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
-                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
-                        }
-                        else -> Maybe.empty()
+    override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
+
+        val remoteView = RemoteViews(context.packageName, getCorrectLayoutId(appWidgetId, context))
+
+        setStyles(remoteView, appWidgetId, newOptions)
+        appWidgetManager.updateAppWidget(appWidgetId, remoteView)
+    }
+
+    private fun setStyles(views: RemoteViews, appWidgetId: Int, options: Bundle? = null) {
+        val width = options?.getInt(OPTION_APPWIDGET_MIN_WIDTH) ?: sharedPref.getLong(getWidthWidgetKey(appWidgetId), 74).toInt()
+        val height = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: sharedPref.getLong(getHeightWidgetKey(appWidgetId), 74).toInt()
+
+        with(sharedPref) {
+            putLong(getWidthWidgetKey(appWidgetId), width.toLong())
+            putLong(getHeightWidgetKey(appWidgetId), height.toLong())
+        }
+
+        val rows = getCellsForSize(height)
+        val cols = getCellsForSize(width)
+
+        Timber.d("New lucky number widget measurement: %dx%d", width, height)
+        Timber.d("Widget size: $cols x $rows")
+
+        when {
+            1 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = false)
+            1 == cols && 1 < rows -> views.setVisibility(imageTop = true, imageLeft = false)
+            1 < cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
+            1 == cols && 1 == rows -> views.setVisibility(imageTop = true, imageLeft = false)
+            2 == cols && 1 == rows -> views.setVisibility(imageTop = false, imageLeft = true)
+            else -> views.setVisibility(imageTop = false, imageLeft = false, title = true)
+        }
+    }
+
+    private fun RemoteViews.setVisibility(imageTop: Boolean, imageLeft: Boolean, title: Boolean = false) {
+        setViewVisibility(R.id.luckyNumberWidgetImageTop, if (imageTop) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetImageLeft, if (imageLeft) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetTitle, if (title) VISIBLE else GONE)
+        setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
+    }
+
+    private fun getCellsForSize(size: Int): Int {
+        var n = 2
+        while (74 * n - 30 < size) ++n
+        return n - 1
+    }
+
+    private fun getLuckyNumber(studentId: Long, appWidgetId: Int) = runBlocking {
+        try {
+            val students = studentRepository.getSavedStudents()
+            val student = students.singleOrNull { it.student.id == studentId }?.student
+            val currentStudent = when {
+                student != null -> student
+                studentId != 0L && studentRepository.isCurrentStudentSet() -> {
+                    studentRepository.getCurrentStudent(false).also {
+                        sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
                     }
                 }
-                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
-                .flatMap { luckyNumberRepository.getLuckyNumber(it) }
-                .subscribeOn(schedulers.backgroundThread)
-                .blockingGet()
+                else -> null
+            }
+
+            currentStudent?.let {
+                luckyNumberRepository.getLuckyNumber(it, false).toFirstResult().data
+            }
         } catch (e: Exception) {
             if (e.cause !is NoCurrentStudentException) {
                 Timber.e(e, "An error has occurred in lucky number provider")
@@ -125,68 +150,14 @@ class LuckyNumberWidgetProvider : BroadcastReceiver() {
         }
     }
 
-    private fun onOptionsChange(context: Context, intent: Intent) {
-        intent.extras?.getInt(EXTRA_APPWIDGET_ID)?.let { appWidgetId ->
-            val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-            val layoutId = if (savedTheme == 0L) R.layout.widget_luckynumber else R.layout.widget_luckynumber_dark
+    private fun getCorrectLayoutId(appWidgetId: Int, context: Context): Int {
+        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
 
-            val remoteView = RemoteViews(context.packageName, layoutId)
-
-            setStyles(remoteView, intent)
-            appWidgetManager.updateAppWidget(appWidgetId, remoteView)
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    private fun setStyles(views: RemoteViews, intent: Intent) {
-        val options = intent.extras?.getBundle(EXTRA_APPWIDGET_OPTIONS)
-
-        val maxWidth = options?.getInt(OPTION_APPWIDGET_MAX_WIDTH) ?: 150
-        val maxHeight = options?.getInt(OPTION_APPWIDGET_MAX_HEIGHT) ?: 40
-
-        Timber.d("New lucky number widget measurement: %dx%d", maxWidth, maxHeight)
-
-        when {
-            // 1x1
-            maxWidth < 150 && maxHeight < 110 -> {
-                Timber.d("Lucky number widget size: 1x1")
-                with(views) {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 1x2
-            maxWidth < 150 && maxHeight > 110 -> {
-                Timber.d("Lucky number widget size: 1x2")
-                with(views) {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 2x1
-            maxWidth >= 150 && maxHeight <= 110 -> {
-                Timber.d("Lucky number widget size: 2x1")
-                with(views) {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
-            // 2x2 and bigger
-            else -> {
-                Timber.d("Lucky number widget size: 2x2 and bigger")
-                with(views) {
-                    setViewVisibility(R.id.luckyNumberWidgetImageTop, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetImageLeft, GONE)
-                    setViewVisibility(R.id.luckyNumberWidgetTitle, VISIBLE)
-                    setViewVisibility(R.id.luckyNumberWidgetNumber, VISIBLE)
-                }
-            }
+        return if (savedTheme == 1L || (savedTheme == 2L && isSystemDarkMode)) {
+            R.layout.widget_luckynumber_dark
+        } else {
+            R.layout.widget_luckynumber
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 991c1d106..abc002de2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -1,15 +1,21 @@
 package io.github.wulkanowy.ui.modules.main
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.pm.ShortcutInfo
+import android.content.pm.ShortcutManager
+import android.graphics.drawable.Icon
+import android.os.Build
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.LOLLIPOP
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.core.graphics.ColorUtils
+import androidx.annotation.RequiresApi
+import androidx.core.content.getSystemService
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
@@ -18,8 +24,9 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavController.Companion.HIDE
-import dagger.Lazy
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.ActivityMainBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.account.AccountDialog
 import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
@@ -31,23 +38,34 @@ import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.more.MoreFragment
 import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.github.wulkanowy.utils.UpdateHelper
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getThemeAttrColor
 import io.github.wulkanowy.utils.safelyPopFragments
 import io.github.wulkanowy.utils.setOnViewChangeListener
-import kotlinx.android.synthetic.main.activity_main.*
+import timber.log.Timber
 import javax.inject.Inject
 
-class MainActivity : BaseActivity<MainPresenter>(), MainView {
+@AndroidEntryPoint
+class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainView {
 
     @Inject
     override lateinit var presenter: MainPresenter
 
     @Inject
-    lateinit var navController: FragNavController
+    lateinit var analytics: FirebaseAnalyticsHelper
 
     @Inject
-    lateinit var overlayProvider: Lazy<ElevationOverlayProvider>
+    lateinit var updateHelper: UpdateHelper
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
+    private val overlayProvider by lazy { ElevationOverlayProvider(this) }
+
+    private val navController = FragNavController(supportFragmentManager, R.id.mainFragmentContainer)
 
     companion object {
         const val EXTRA_START_MENU = "extraStartMenu"
@@ -56,7 +74,7 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
             return Intent(context, MainActivity::class.java)
                 .apply {
                     if (clear) flags = FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK
-                    startMenu?.let { putExtra(EXTRA_START_MENU, it) }
+                    startMenu?.let { putExtra(EXTRA_START_MENU, it.id) }
                 }
         }
     }
@@ -67,6 +85,8 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
 
     override val currentViewTitle get() = (navController.currentFrag as? MainView.TitledView)?.titleStringId?.let { getString(it) }
 
+    override val currentViewSubtitle get() = (navController.currentFrag as? MainView.TitledView)?.subtitleString
+
     override var startMenuIndex = 0
 
     override var startMenuMoreIndex = -1
@@ -78,18 +98,58 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         MainView.Section.LUCKY_NUMBER.id to LuckyNumberFragment.newInstance()
     )
 
+    @SuppressLint("NewApi")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(mainToolbar)
-        messageContainer = mainFragmentContainer
+        setContentView(ActivityMainBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.mainToolbar)
+        messageContainer = binding.mainFragmentContainer
+        updateHelper.messageContainer = binding.mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_START_MENU) as? MainView.Section)
+        presenter.onAttachView(this, MainView.Section.values().singleOrNull { it.id == intent.getIntExtra(EXTRA_START_MENU, -1) })
 
         with(navController) {
             initialize(startMenuIndex, savedInstanceState)
             pushFragment(moreMenuFragments[startMenuMoreIndex])
         }
+        updateHelper.checkAndInstallUpdates(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        updateHelper.onResume(this)
+    }
+
+    @SuppressLint("NewApi")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        updateHelper.onActivityResult(requestCode, resultCode)
+        if (appInfo.systemVersion >= Build.VERSION_CODES.N_MR1) initShortcuts()
+    }
+
+    @RequiresApi(Build.VERSION_CODES.N_MR1)
+    fun initShortcuts() {
+        val shortcutsList = mutableListOf<ShortcutInfo>()
+
+        listOf(
+            Triple(getString(R.string.grade_title), R.drawable.ic_shortcut_grade, MainView.Section.GRADE),
+            Triple(getString(R.string.attendance_title), R.drawable.ic_shortcut_attendance, MainView.Section.ATTENDANCE),
+            Triple(getString(R.string.exam_title), R.drawable.ic_shortcut_exam, MainView.Section.EXAM),
+            Triple(getString(R.string.timetable_title), R.drawable.ic_shortcut_timetable, MainView.Section.TIMETABLE),
+            Triple(getString(R.string.message_title), R.drawable.ic_shortcut_message, MainView.Section.MESSAGE)
+        ).forEach { (title, icon, enum) ->
+            shortcutsList.add(ShortcutInfo.Builder(applicationContext, title)
+                .setShortLabel(title)
+                .setLongLabel(title)
+                .setIcon(Icon.createWithResource(applicationContext, icon))
+                .setIntents(arrayOf(
+                    Intent(applicationContext, MainActivity::class.java).setAction(Intent.ACTION_VIEW),
+                    Intent(applicationContext, MainActivity::class.java).putExtra(EXTRA_START_MENU, enum.id)
+                        .setAction(Intent.ACTION_VIEW).addFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_CLEAR_TASK)))
+                .build())
+        }
+
+        getSystemService<ShortcutManager>()?.dynamicShortcuts = shortcutsList
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -98,12 +158,12 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     }
 
     override fun initView() {
-        with(mainToolbar) {
+        with(binding.mainToolbar) {
             if (SDK_INT >= LOLLIPOP) stateListAnimator = null
-            setBackgroundColor(overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
+            setBackgroundColor(overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(4f)))
         }
 
-        with(mainBottomNav) {
+        with(binding.mainBottomNav) {
             addItems(listOf(
                 AHBottomNavigationItem(R.string.grade_title, R.drawable.ic_main_grade, 0),
                 AHBottomNavigationItem(R.string.attendance_title, R.drawable.ic_main_attendance, 0),
@@ -112,8 +172,8 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
                 AHBottomNavigationItem(R.string.more_title, R.drawable.ic_main_more, 0)
             ))
             accentColor = getThemeAttrColor(R.attr.colorPrimary)
-            inactiveColor = ColorUtils.setAlphaComponent(getThemeAttrColor(R.attr.colorOnSurface), 153)
-            defaultBackgroundColor = overlayProvider.get().compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
+            inactiveColor = getThemeAttrColor(R.attr.colorOnSurface, 153)
+            defaultBackgroundColor = overlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(dpToPx(8f))
             titleState = ALWAYS_SHOW
             currentItem = startMenuIndex
             isBehaviorTranslationEnabled = false
@@ -134,8 +194,12 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
+    override fun setCurrentScreen(name: String?) {
+        analytics.setCurrentScreen(this, name)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.mainMenuAccount) presenter.onAccountManagerSelected()
         else false
     }
 
@@ -151,6 +215,10 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
         supportActionBar?.title = title
     }
 
+    override fun setViewSubTitle(subtitle: String?) {
+        supportActionBar?.subtitle = subtitle
+    }
+
     override fun showHomeArrow(show: Boolean) {
         supportActionBar?.setDisplayHomeAsUpEnabled(show)
     }
@@ -160,13 +228,18 @@ class MainActivity : BaseActivity<MainPresenter>(), MainView {
     }
 
     override fun showActionBarElevation(show: Boolean) {
-        ViewCompat.setElevation(mainToolbar, if (show) dpToPx(4f) else 0f)
+        ViewCompat.setElevation(binding.mainToolbar, if (show) dpToPx(4f) else 0f)
     }
 
     override fun notifyMenuViewReselected() {
         (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentReselected()
     }
 
+    override fun notifyMenuViewChanged() {
+        Timber.d("Menu view changed")
+        (navController.currentStack?.getOrNull(0) as? MainView.MainChildView)?.onFragmentChanged()
+    }
+
     fun showDialogFragment(dialog: DialogFragment) {
         navController.showDialogFragment(dialog)
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
deleted file mode 100644
index bbaea51ce..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainModule.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-package io.github.wulkanowy.ui.modules.main
-
-import com.google.android.material.elevation.ElevationOverlayProvider
-import com.ncapdevi.fragnav.FragNavController
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.R
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.modules.about.AboutFragment
-import io.github.wulkanowy.ui.modules.about.license.LicenseFragment
-import io.github.wulkanowy.ui.modules.about.license.LicenseModule
-import io.github.wulkanowy.ui.modules.account.AccountDialog
-import io.github.wulkanowy.ui.modules.attendance.AttendanceFragment
-import io.github.wulkanowy.ui.modules.attendance.summary.AttendanceSummaryFragment
-import io.github.wulkanowy.ui.modules.exam.ExamFragment
-import io.github.wulkanowy.ui.modules.grade.GradeFragment
-import io.github.wulkanowy.ui.modules.grade.GradeModule
-import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
-import io.github.wulkanowy.ui.modules.luckynumber.LuckyNumberFragment
-import io.github.wulkanowy.ui.modules.message.MessageFragment
-import io.github.wulkanowy.ui.modules.message.MessageModule
-import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceFragment
-import io.github.wulkanowy.ui.modules.mobiledevice.MobileDeviceModule
-import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
-import io.github.wulkanowy.ui.modules.more.MoreFragment
-import io.github.wulkanowy.ui.modules.note.NoteFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersModule
-import io.github.wulkanowy.ui.modules.settings.SettingsFragment
-import io.github.wulkanowy.ui.modules.timetable.TimetableFragment
-import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
-
-@Suppress("unused")
-@Module(includes = [MainModule.Static::class])
-abstract class MainModule {
-
-    @Module
-    object Static {
-
-        @Provides
-        fun provideFragNavController(activity: MainActivity): FragNavController {
-            return FragNavController(activity.supportFragmentManager, R.id.mainFragmentContainer)
-        }
-
-        //In activities must be injected as Lazy
-        @Provides
-        fun provideElevationOverlayProvider(activity: MainActivity) = ElevationOverlayProvider(activity)
-    }
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindAttendanceFragment(): AttendanceFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindAttendanceSummaryFragment(): AttendanceSummaryFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindExamFragment(): ExamFragment
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [GradeModule::class])
-    abstract fun bindGradeFragment(): GradeFragment
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [MessageModule::class])
-    abstract fun bindMessagesFragment(): MessageFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindMessagePreviewFragment(): MessagePreviewFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindMoreFragment(): MoreFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindTimetableFragment(): TimetableFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindAboutFragment(): AboutFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindSettingsFragment(): SettingsFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindNoteFragment(): NoteFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindHomeworkFragment(): HomeworkFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindLuckyNumberFragment(): LuckyNumberFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindCompletedLessonsFragment(): CompletedLessonsFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindAccountDialog(): AccountDialog
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [MobileDeviceModule::class])
-    abstract fun bindMobileDevices(): MobileDeviceFragment
-
-    @PerFragment
-    @ContributesAndroidInjector
-    abstract fun bindMobileDeviceDialog(): MobileDeviceTokenDialog
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [LicenseModule::class])
-    abstract fun bindLicenseFragment(): LicenseFragment
-
-    @PerFragment
-    @ContributesAndroidInjector(modules = [SchoolAndTeachersModule::class])
-    abstract fun bindSchoolAndTeachersFragment(): SchoolAndTeachersFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index 1c0fd39f3..8d5c9d67f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -9,18 +9,16 @@ import io.github.wulkanowy.ui.modules.main.MainView.Section.GRADE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.MESSAGE
 import io.github.wulkanowy.ui.modules.main.MainView.Section.SCHOOL
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val prefRepository: PreferencesRepository,
     private val syncManager: SyncManager,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MainView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MainView>(errorHandler, studentRepository) {
 
     fun onAttachView(view: MainView, initMenu: MainView.Section?) {
         super.onAttachView(view)
@@ -33,14 +31,16 @@ class MainPresenter @Inject constructor(
             Timber.i("Main view was initialized with $startMenuIndex menu index and $startMenuMoreIndex more index")
         }
 
-        syncManager.startSyncWorker()
+        syncManager.startPeriodicSyncWorker()
         analytics.logEvent("app_open", "destination" to initMenu?.name)
     }
 
-    fun onViewChange(section: MainView.Section?) {
+    fun onViewChange(section: MainView.Section?, name: String?) {
         view?.apply {
+            setCurrentScreen(name)
             showActionBarElevation(section != GRADE && section != MESSAGE && section != SCHOOL)
             currentViewTitle?.let { setViewTitle(it) }
+            currentViewSubtitle?.let { setViewSubTitle(it.ifBlank { null }) }
             currentStackSize?.let {
                 if (it > 1) showHomeArrow(true)
                 else showHomeArrow(false)
@@ -75,6 +75,7 @@ class MainPresenter @Inject constructor(
                 notifyMenuViewReselected()
                 false
             } else {
+                notifyMenuViewChanged()
                 switchMenuView(index)
                 true
             }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
index 033b6a1f6..7e5831471 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainView.kt
@@ -12,6 +12,8 @@ interface MainView : BaseView {
 
     val currentViewTitle: String?
 
+    val currentViewSubtitle: String?
+
     val currentStackSize: Int?
 
     fun initView()
@@ -22,22 +24,34 @@ interface MainView : BaseView {
 
     fun showAccountPicker()
 
+    fun setCurrentScreen(name: String?)
+
     fun showActionBarElevation(show: Boolean)
 
     fun notifyMenuViewReselected()
 
+    fun notifyMenuViewChanged()
+
     fun setViewTitle(title: String)
 
+    fun setViewSubTitle(subtitle: String?)
+
     fun popView(depth: Int = 1)
 
     interface MainChildView {
 
         fun onFragmentReselected()
+
+        fun onFragmentChanged() {}
     }
 
     interface TitledView {
 
         val titleStringId: Int
+
+        var subtitleString: String
+            get() = ""
+            set(_) {}
     }
 
     enum class Section(val id: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
index 7a3e135dd..16e0184a0 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageFragment.kt
@@ -1,16 +1,15 @@
 package io.github.wulkanowy.ui.modules.message
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder.RECEIVED
 import io.github.wulkanowy.data.repositories.message.MessageFolder.SENT
 import io.github.wulkanowy.data.repositories.message.MessageFolder.TRASHED
+import io.github.wulkanowy.databinding.FragmentMessageBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -18,16 +17,16 @@ import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
 import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_message.*
 import javax.inject.Inject
 
-class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
+@AndroidEntryPoint
+class MessageFragment : BaseFragment<FragmentMessageBinding>(R.layout.fragment_message),
+    MessageView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePresenter
 
-    @Inject
-    lateinit var pagerAdapter: BaseFragmentPagerAdapter
+    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
 
     companion object {
         fun newInstance() = MessageFragment()
@@ -35,20 +34,17 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
 
     override val titleStringId get() = R.string.message_title
 
-    override val currentPageIndex get() = messageViewPager.currentItem
+    override val currentPageIndex get() = binding.messageViewPager.currentItem
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessageBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = messageViewPager.id
+            containerId = binding.messageViewPager.id
             addFragmentsWithTitle(mapOf(
                 MessageTabFragment.newInstance(RECEIVED) to getString(R.string.message_inbox),
                 MessageTabFragment.newInstance(SENT) to getString(R.string.message_sent),
@@ -56,31 +52,29 @@ class MessageFragment : BaseFragment(), MessageView, MainView.TitledView {
             ))
         }
 
-        with(messageViewPager) {
+        with(binding.messageViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(messageTabLayout) {
-            setupWithViewPager(messageViewPager)
+        with(binding.messageTabLayout) {
+            setupWithViewPager(binding.messageViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
 
-        openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
+        binding.openSendMessageButton.setOnClickListener { presenter.onSendMessageButtonClicked() }
     }
 
     override fun showContent(show: Boolean) {
-        messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        with(binding) {
+            messageViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            messageTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        messageProgress.visibility = if (show) VISIBLE else INVISIBLE
-    }
-
-    fun onDeleteMessage(message: Message) {
-        presenter.onDeleteMessage(message)
+        binding.messageProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onChildFragmentLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
deleted file mode 100644
index 19d6ad1de..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageItem.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package io.github.wulkanowy.ui.modules.message
-
-import android.graphics.Typeface.BOLD
-import android.graphics.Typeface.NORMAL
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Message
-import io.github.wulkanowy.data.repositories.message.MessageFolder
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_message.*
-
-class MessageItem(val message: Message, private val noSubjectString: String) :
-    AbstractFlexibleItem<MessageItem.ViewHolder>() {
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun getLayoutRes() = R.layout.item_message
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            val style = if (message.unread) BOLD else NORMAL
-
-            messageItemAuthor.run {
-                text = if (message.folderId == MessageFolder.SENT.id) message.recipient else message.sender
-                setTypeface(null, style)
-            }
-            messageItemSubject.run {
-                text = if (message.subject.isNotBlank()) message.subject else noSubjectString
-                setTypeface(null, style)
-            }
-            messageItemDate.run {
-                text = message.date.toFormattedString()
-                setTypeface(null, style)
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MessageItem
-
-        if (message != other.message) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return message.hashCode()
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
deleted file mode 100644
index b25219025..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessageModule.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package io.github.wulkanowy.ui.modules.message
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerChildFragment
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.message.tab.MessageTabFragment
-
-@Suppress("unused")
-@Module(includes = [MessageModule.Static::class])
-abstract class MessageModule {
-
-    @Module
-    object Static {
-
-        @PerFragment
-        @Provides
-        fun provideMessageAdapter(fragment: MessageFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
-    }
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun bindMessageTabFragment(): MessageTabFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
index 0f5598b23..0fb454b31 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/MessagePresenter.kt
@@ -1,29 +1,26 @@
 package io.github.wulkanowy.ui.modules.message
 
-import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Completable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import javax.inject.Inject
 
 class MessagePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MessageView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MessageView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: MessageView) {
         super.onAttachView(view)
-        disposable.add(Completable.timer(150, MILLISECONDS, schedulers.mainThread)
-            .subscribe {
-                view.initView()
-                Timber.i("Message view was initialized")
-                loadData()
-            })
+        launch {
+            delay(150)
+            view.initView()
+            Timber.i("Message view was initialized")
+            loadData()
+        }
     }
 
     fun onPageSelected(index: Int) {
@@ -46,15 +43,6 @@ class MessagePresenter @Inject constructor(
         }
     }
 
-    fun onDeleteMessage(message: Message) {
-        view?.notifyChildMessageDeleted(
-            when (message.removed) {
-                true -> 2
-                else -> message.folderId - 1
-            }
-        )
-    }
-
     fun onSendMessageButtonClicked() {
         view?.openSendMessage()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
new file mode 100644
index 000000000..206a74602
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewAdapter.kt
@@ -0,0 +1,91 @@
+package io.github.wulkanowy.ui.modules.message.preview
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.databinding.ItemMessageAttachmentBinding
+import io.github.wulkanowy.databinding.ItemMessageDividerBinding
+import io.github.wulkanowy.databinding.ItemMessagePreviewBinding
+import io.github.wulkanowy.utils.openInternetBrowser
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class MessagePreviewAdapter @Inject constructor() :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    enum class ViewType(val id: Int) {
+        MESSAGE(1),
+        DIVIDER(2),
+        ATTACHMENT(3)
+    }
+
+    var messageWithAttachment: MessageWithAttachment? = null
+        set(value) {
+            field = value
+            attachments = value?.attachments.orEmpty()
+        }
+
+    private var attachments: List<MessageAttachment> = emptyList()
+
+    override fun getItemCount() = if (messageWithAttachment == null) 0 else attachments.size + 1 + if (attachments.isNotEmpty()) 1 else 0
+
+    override fun getItemViewType(position: Int) = when (position) {
+        0 -> ViewType.MESSAGE.id
+        1 -> ViewType.DIVIDER.id
+        else -> ViewType.ATTACHMENT.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.MESSAGE.id -> MessageViewHolder(ItemMessagePreviewBinding.inflate(inflater, parent, false))
+            ViewType.DIVIDER.id -> DividerViewHolder(ItemMessageDividerBinding.inflate(inflater, parent, false))
+            ViewType.ATTACHMENT.id -> AttachmentViewHolder(ItemMessageAttachmentBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is MessageViewHolder -> bindMessage(holder, requireNotNull(messageWithAttachment).message)
+            is AttachmentViewHolder -> bindAttachment(holder, requireNotNull(messageWithAttachment).attachments[position - 2])
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun bindMessage(holder: MessageViewHolder, message: Message) {
+        with(holder.binding) {
+            messagePreviewSubject.text = message.subject.ifBlank { root.context.getString(R.string.message_no_subject) }
+            messagePreviewDate.text = root.context.getString(R.string.message_date, message.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
+            messagePreviewContent.text = message.content
+            messagePreviewFromSender.text = message.sender
+            messagePreviewToRecipient.text = message.recipient
+        }
+    }
+
+    private fun bindAttachment(holder: AttachmentViewHolder, attachment: MessageAttachment) {
+        with(holder.binding) {
+            messagePreviewAttachment.visibility = View.VISIBLE
+            messagePreviewAttachment.text = attachment.filename
+            root.setOnClickListener {
+                root.context.openInternetBrowser(attachment.url) { }
+            }
+        }
+    }
+
+    class MessageViewHolder(val binding: ItemMessagePreviewBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class DividerViewHolder(val binding: ItemMessageDividerBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    class AttachmentViewHolder(val binding: ItemMessageAttachmentBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
index 22231e429..b35731cae 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewFragment.kt
@@ -1,51 +1,76 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
-import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.print.PrintAttributes
+import android.print.PrintManager
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.annotation.RequiresApi
+import androidx.core.content.getSystemService
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.databinding.FragmentMessagePreviewBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.ui.modules.message.MessageFragment
 import io.github.wulkanowy.ui.modules.message.send.SendMessageActivity
-import kotlinx.android.synthetic.main.fragment_message_preview.*
+import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.shareText
 import javax.inject.Inject
 
-class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.TitledView {
+@AndroidEntryPoint
+class MessagePreviewFragment :
+    BaseFragment<FragmentMessagePreviewBinding>(R.layout.fragment_message_preview),
+    MessagePreviewView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: MessagePreviewPresenter
 
+    @Inject
+    lateinit var previewAdapter: MessagePreviewAdapter
+
+    @Inject
+    lateinit var appInfo: AppInfo
+
     private var menuReplyButton: MenuItem? = null
 
     private var menuForwardButton: MenuItem? = null
 
     private var menuDeleteButton: MenuItem? = null
 
+    private var menuShareButton: MenuItem? = null
+
+    private var menuPrintButton: MenuItem? = null
+
     override val titleStringId: Int
         get() = R.string.message_title
 
-    override val noSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
     override val deleteMessageSuccessString: String
         get() = getString(R.string.message_delete_success)
 
+    override val messageNoSubjectString: String
+        get() = getString(R.string.message_no_subject)
+
+    override val printHTML: String
+        get() = requireContext().assets.open("message-print-page.html").bufferedReader().use { it.readText() }
+
     companion object {
         const val MESSAGE_ID_KEY = "message_id"
 
-        fun newInstance(messageId: Long): MessagePreviewFragment {
+        fun newInstance(message: Message): MessagePreviewFragment {
             return MessagePreviewFragment().apply {
-                arguments = Bundle().apply { putLong(MESSAGE_ID_KEY, messageId) }
+                arguments = Bundle().apply { putSerializable(MESSAGE_ID_KEY, message) }
             }
         }
     }
@@ -55,18 +80,20 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message_preview, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = messagePreviewContainer
-        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getLong(MESSAGE_ID_KEY) ?: 0L)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessagePreviewBinding.bind(view)
+        messageContainer = binding.messagePreviewContainer
+        presenter.onAttachView(this, (savedInstanceState ?: arguments)?.getSerializable(MESSAGE_ID_KEY) as? Message)
     }
 
     override fun initView() {
-        messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        binding.messagePreviewErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+
+        with(binding.messagePreviewRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = previewAdapter
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -74,6 +101,8 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         menuReplyButton = menu.findItem(R.id.messagePreviewMenuReply)
         menuForwardButton = menu.findItem(R.id.messagePreviewMenuForward)
         menuDeleteButton = menu.findItem(R.id.messagePreviewMenuDelete)
+        menuShareButton = menu.findItem(R.id.messagePreviewMenuShare)
+        menuPrintButton = menu.findItem(R.id.messagePreviewMenuPrint)
         presenter.onCreateOptionsMenu()
     }
 
@@ -82,44 +111,33 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
             R.id.messagePreviewMenuReply -> presenter.onReply()
             R.id.messagePreviewMenuForward -> presenter.onForward()
             R.id.messagePreviewMenuDelete -> presenter.onMessageDelete()
+            R.id.messagePreviewMenuShare -> presenter.onShare()
+            R.id.messagePreviewMenuPrint -> presenter.onPrint()
             else -> false
         }
     }
 
-    override fun setSubject(subject: String) {
-        messagePreviewSubject.text = subject
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun setRecipient(recipient: String) {
-        messagePreviewAuthor.text = "${getString(R.string.message_to)} $recipient"
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun setSender(sender: String) {
-        messagePreviewAuthor.text = "${getString(R.string.message_from)} $sender"
-    }
-
-    override fun setDate(date: String) {
-        messagePreviewDate.text = getString(R.string.message_date, date)
-    }
-
-    override fun setContent(content: String) {
-        messagePreviewContent.text = content
+    override fun setMessageWithAttachment(item: MessageWithAttachment) {
+        with(previewAdapter) {
+            messageWithAttachment = item
+            notifyDataSetChanged()
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        messagePreviewProgress.visibility = if (show) VISIBLE else GONE
+        binding.messagePreviewProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        messagePreviewContentContainer.visibility = if (show) VISIBLE else GONE
+        binding.messagePreviewRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showOptions(show: Boolean) {
         menuReplyButton?.isVisible = show
         menuForwardButton?.isVisible = show
         menuDeleteButton?.isVisible = show
+        menuShareButton?.isVisible = show
+        menuPrintButton?.isVisible = show && appInfo.systemVersion >= Build.VERSION_CODES.LOLLIPOP
     }
 
     override fun setDeletedOptionsLabels() {
@@ -131,15 +149,15 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
     }
 
     override fun showErrorView(show: Boolean) {
-        messagePreviewError.visibility = if (show) VISIBLE else GONE
+        binding.messagePreviewError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        messagePreviewErrorMessage.text = message
+        binding.messagePreviewErrorMessage.text = message
     }
 
     override fun setErrorRetryCallback(callback: () -> Unit) {
-        messagePreviewErrorRetry.setOnClickListener { callback() }
+        binding.messagePreviewErrorRetry.setOnClickListener { callback() }
     }
 
     override fun openMessageReply(message: Message?) {
@@ -150,17 +168,45 @@ class MessagePreviewFragment : BaseFragment(), MessagePreviewView, MainView.Titl
         context?.let { it.startActivity(SendMessageActivity.getStartIntent(it, message)) }
     }
 
+    override fun shareText(text: String, subject: String) {
+        context?.shareText(text, subject)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    override fun printDocument(html: String, jobName: String) {
+        val webView = WebView(requireContext())
+        webView.webViewClient = object : WebViewClient() {
+
+            override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest) = false
+
+            override fun onPageFinished(view: WebView, url: String) {
+                createWebPrintJob(view, jobName)
+            }
+        }
+
+        webView.loadDataWithBaseURL("file:///android_asset/", html, "text/HTML", "UTF-8", null)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private fun createWebPrintJob(webView: WebView, jobName: String) {
+        activity?.getSystemService<PrintManager>()?.let { printManager ->
+            val printAdapter = webView.createPrintDocumentAdapter(jobName)
+
+            printManager.print(
+                jobName,
+                printAdapter,
+                PrintAttributes.Builder().build()
+            )
+        }
+    }
+
     override fun popView() {
         (activity as MainActivity).popView()
     }
 
-    override fun notifyParentMessageDeleted(message: Message) {
-        parentFragmentManager.fragments.forEach { if (it is MessageFragment) it.onDeleteMessage(message) }
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
+        outState.putSerializable(MESSAGE_ID_KEY, presenter.message)
         super.onSaveInstanceState(outState)
-        outState.putLong(MESSAGE_ID_KEY, presenter.messageId)
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
index 7b7404b86..7a633a2df 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewPresenter.kt
@@ -1,83 +1,92 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import android.annotation.SuppressLint
+import android.os.Build
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageAttachment
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
+import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class MessagePreviewPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
-    private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository, schedulers) {
+    private val analytics: FirebaseAnalyticsHelper,
+    private var appInfo: AppInfo
+) : BasePresenter<MessagePreviewView>(errorHandler, studentRepository) {
 
-    var messageId = 0L
+    var message: Message? = null
 
-    private var message: Message? = null
+    var attachments: List<MessageAttachment>? = null
 
     private lateinit var lastError: Throwable
 
     private var retryCallback: () -> Unit = {}
 
-    fun onAttachView(view: MessagePreviewView, id: Long) {
+    fun onAttachView(view: MessagePreviewView, message: Message?) {
         super.onAttachView(view)
         view.initView()
         errorHandler.showErrorMessage = ::showErrorViewOnError
-        loadData(id)
+        this.message = message
+        loadData(requireNotNull(message))
     }
 
-    private fun onMessageLoadRetry() {
+    private fun onMessageLoadRetry(message: Message) {
         view?.run {
             showErrorView(false)
             showProgress(true)
         }
-        loadData(messageId)
+        loadData(message)
     }
 
     fun onDetailsClick() {
         view?.showErrorDetailsDialog(lastError)
     }
 
-    private fun loadData(id: Long) {
-        Timber.i("Loading message $id preview started")
-        messageId = id
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { messageRepository.getMessage(it, messageId, true) }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally { view?.showProgress(false) }
-                .subscribe({ message ->
-                    Timber.i("Loading message $id preview result: Success ")
-                    this@MessagePreviewPresenter.message = message
-                    view?.run {
-                        message.let {
-                            setSubject(if (it.subject.isNotBlank()) it.subject else noSubjectString)
-                            setDate(it.date.toFormattedString("yyyy-MM-dd HH:mm:ss"))
-                            setContent(it.content)
-                            initOptions()
-
-                            if (it.folderId == MessageFolder.SENT.id) setRecipient(it.recipient)
-                            else setSender(it.sender)
-                        }
+    private fun loadData(message: Message) {
+        flowWithResourceIn {
+            val student = studentRepository.getStudentById(message.studentId)
+            messageRepository.getMessage(student, message, true)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading message ${message.messageId} preview started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading message ${message.messageId} preview result: Success ")
+                    checkNotNull(it.data, { "Can't find message in local db! Probably no longer exist in this folder" })
+                    this@MessagePreviewPresenter.message = it.data.message
+                    this@MessagePreviewPresenter.attachments = it.data.attachments
+                    view?.apply {
+                        setMessageWithAttachment(it.data)
+                        initOptions()
                     }
-                    analytics.logEvent("load_message_preview", "length" to message.content.length)
-                }) {
-                    Timber.i("Loading message $id preview result: An exception occurred ")
-                    retryCallback = { onMessageLoadRetry() }
-                    errorHandler.dispatch(it)
-                })
-        }
+                    analytics.logEvent(
+                        "load_item",
+                        "type" to "message_preview",
+                        "length" to it.data.message.content.length
+                    )
+                }
+                Status.ERROR -> {
+                    Timber.i("Loading message ${message.messageId} preview result: An exception occurred ")
+                    retryCallback = { onMessageLoadRetry(message) }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.showProgress(false)
+        }.launch()
     }
 
     fun onReply(): Boolean {
@@ -94,42 +103,99 @@ class MessagePreviewPresenter @Inject constructor(
         } else false
     }
 
-    private fun deleteMessage() {
-        message?.let { message ->
-            disposable.add(messageRepository.deleteMessage(message)
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doOnSubscribe {
-                    view?.run {
-                        showContent(false)
-                        showProgress(true)
-                        showOptions(false)
-                        showErrorView(false)
+    fun onShare(): Boolean {
+        message?.let {
+            var text = "Temat: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}\n" + when (it.sender.isNotEmpty()) {
+                true -> "Od: ${it.sender}\n"
+                false -> "Do: ${it.recipient}\n"
+            } + "Data: ${it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")}\n\n${it.content}"
+
+            attachments?.let { attachments ->
+                if (attachments.isNotEmpty()) {
+                    text += "\n\nZałączniki:"
+
+                    attachments.forEach { attachment ->
+                        text += "\n${attachment.filename}: ${attachment.url}"
                     }
                 }
-                .doFinally {
-                    view?.showProgress(false)
-                }
-                .subscribe({
+            }
+
+            view?.shareText(text, "FW: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }}")
+            return true
+        }
+        return false
+    }
+
+    @SuppressLint("NewApi")
+    fun onPrint(): Boolean {
+        if (appInfo.systemVersion < Build.VERSION_CODES.LOLLIPOP) return false
+        message?.let {
+            val dateString = it.date.toFormattedString("yyyy-MM-dd HH:mm:ss")
+            val infoContent = "<div><h4>Data wysłania</h4>$dateString</div>" + when {
+                it.sender.isNotEmpty() -> "<div><h4>Od</h4>${it.sender}</div>"
+                else -> "<div><h4>Do</h4>${it.recipient}</div>"
+            }
+
+            val messageContent = "<p>${it.content}</p>"
+                .replace(Regex("[\\n\\r]{2,}"), "</p><p>")
+                .replace(Regex("[\\n\\r]"), "<br>")
+
+            val jobName = "Wiadomość " + when {
+                it.sender.isNotEmpty() -> "od ${it.sender}"
+                else -> "do ${it.recipient}"
+            } + " $dateString: ${it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() }} | Wulkanowy"
+
+            view?.apply {
+                val html = printHTML
+                    .replace("%SUBJECT%", it.subject.ifBlank { view?.messageNoSubjectString.orEmpty() })
+                    .replace("%CONTENT%", messageContent)
+                    .replace("%INFO%", infoContent)
+                printDocument(html, jobName)
+            }
+            return true
+        }
+        return false
+    }
+
+    private fun deleteMessage() {
+        message ?: return
+
+        view?.run {
+            showContent(false)
+            showProgress(true)
+            showOptions(false)
+            showErrorView(false)
+        }
+
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            messageRepository.deleteMessage(student, message!!)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Message ${message?.id} delete started")
+                Status.SUCCESS -> {
+                    Timber.d("Message ${message?.id} delete success")
                     view?.run {
-                        notifyParentMessageDeleted(message)
                         showMessage(deleteMessageSuccessString)
                         popView()
                     }
-                }, { error ->
+                }
+                Status.ERROR -> {
+                    Timber.d("Message ${message?.id} delete failed")
                     retryCallback = { onMessageDelete() }
-                    errorHandler.dispatch(error)
-                }, {
-                    view?.showErrorView(true)
-                })
-            )
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.showProgress(false)
+        }.launch("delete")
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
         view?.run {
             lastError = error
             setErrorDetails(message)
+            showContent(false)
             showErrorView(true)
             setErrorRetryCallback { retryCallback() }
         }
@@ -144,7 +210,7 @@ class MessagePreviewPresenter @Inject constructor(
         view?.apply {
             showOptions(message != null)
             message?.let {
-                when (it.removed) {
+                when (it.folderId == MessageFolder.TRASHED.id) {
                     true -> setDeletedOptionsLabels()
                     false -> setNotDeletedOptionsLabels()
                 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
index d57766273..fa6d735ed 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/preview/MessagePreviewView.kt
@@ -1,32 +1,27 @@
 package io.github.wulkanowy.ui.modules.message.preview
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
 import io.github.wulkanowy.ui.base.BaseView
 
 interface MessagePreviewView : BaseView {
 
-    val noSubjectString: String
-
     val deleteMessageSuccessString: String
 
+    val messageNoSubjectString: String
+
+    val printHTML: String
+
     fun initView()
 
-    fun setSubject(subject: String)
-
-    fun setRecipient(recipient: String)
-
-    fun setSender(sender: String)
-
-    fun setDate(date: String)
-
-    fun setContent(content: String)
+    fun setMessageWithAttachment(item: MessageWithAttachment)
 
     fun showProgress(show: Boolean)
 
     fun showContent(show: Boolean)
 
-    fun notifyParentMessageDeleted(message: Message)
-
     fun showErrorView(show: Boolean)
 
     fun setErrorDetails(message: String)
@@ -43,5 +38,10 @@ interface MessagePreviewView : BaseView {
 
     fun openMessageForward(message: Message?)
 
+    fun shareText(text: String, subject: String)
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    fun printDocument(html: String, jobName: String)
+
     fun popView()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
index 7b15da713..59944d41d 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessageActivity.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.send
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.graphics.Rect
@@ -11,17 +12,19 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.ReportingUnit
+import io.github.wulkanowy.databinding.ActivitySendMessageBinding
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.hideSoftInput
 import io.github.wulkanowy.utils.showSoftInput
-import kotlinx.android.synthetic.main.activity_send_message.*
 import javax.inject.Inject
 
-class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageView {
+@AndroidEntryPoint
+class SendMessageActivity : BaseActivity<SendMessagePresenter, ActivitySendMessageBinding>(), SendMessageView {
 
     @Inject
     override lateinit var presenter: SendMessagePresenter
@@ -41,17 +44,17 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override val isDropdownListVisible: Boolean
-        get() = sendMessageTo.isDropdownListVisible
+        get() = binding.sendMessageTo.isDropdownListVisible
 
     @Suppress("UNCHECKED_CAST")
     override val formRecipientsData: List<RecipientChipItem>
-        get() = sendMessageTo.addedChipItems as List<RecipientChipItem>
+        get() = binding.sendMessageTo.addedChipItems as List<RecipientChipItem>
 
     override val formSubjectValue: String
-        get() = sendMessageSubject.text.toString()
+        get() = binding.sendMessageSubject.text.toString()
 
     override val formContentValue: String
-        get() = sendMessageMessageContent.text.toString()
+        get() = binding.sendMessageMessageContent.text.toString()
 
     override val messageRequiredRecipients: String
         get() = getString(R.string.message_required_recipients)
@@ -62,20 +65,23 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     override val messageSuccess: String
         get() = getString(R.string.message_send_successful)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_send_message)
-        setSupportActionBar(sendMessageToolbar)
+        setContentView(ActivitySendMessageBinding.inflate(layoutInflater).apply { binding = this }.root)
+        setSupportActionBar(binding.sendMessageToolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        messageContainer = sendMessageContainer
+        messageContainer = binding.sendMessageContainer
 
         presenter.onAttachView(this, intent.getSerializableExtra(EXTRA_MESSAGE) as? Message, intent.getSerializableExtra(EXTRA_REPLY) as? Boolean)
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun initView() {
         setUpExtendedHitArea()
-        sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
-        sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+        with(binding) {
+            sendMessageScroll.setOnTouchListener { _, _ -> presenter.onTouchScroll() }
+            sendMessageTo.onTextChangeListener = presenter::onRecipientsTextChange
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -83,8 +89,8 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
         return true
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
-        return if (item?.itemId == R.id.sendMessageMenuSend) presenter.onSend()
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return if (item.itemId == R.id.sendMessageMenuSend) presenter.onSend()
         else false
     }
 
@@ -93,27 +99,27 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setReportingUnit(unit: ReportingUnit) {
-        sendMessageFrom.text = unit.senderName
+        binding.sendMessageFrom.text = unit.senderName
     }
 
     override fun setRecipients(recipients: List<RecipientChipItem>) {
-        sendMessageTo.filterableChipItems = recipients
+        binding.sendMessageTo.filterableChipItems = recipients
     }
 
     override fun setSelectedRecipients(recipients: List<RecipientChipItem>) {
-        sendMessageTo.addChips(recipients)
+        binding.sendMessageTo.addChips(recipients)
     }
 
     override fun showProgress(show: Boolean) {
-        sendMessageProgress.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showContent(show: Boolean) {
-        sendMessageContent.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        sendMessageEmpty.visibility = if (show) VISIBLE else GONE
+        binding.sendMessageEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showActionBar(show: Boolean) {
@@ -121,11 +127,11 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun setSubject(subject: String) {
-        sendMessageSubject.setText(subject)
+        binding.sendMessageSubject.setText(subject)
     }
 
     override fun setContent(content: String) {
-        sendMessageMessageContent.setText(content)
+        binding.sendMessageMessageContent.setText(content)
     }
 
     override fun showMessage(text: String) {
@@ -137,40 +143,42 @@ class SendMessageActivity : BaseActivity<SendMessagePresenter>(), SendMessageVie
     }
 
     override fun hideDropdownList() {
-        sendMessageTo.hideDropdownList()
+        binding.sendMessageTo.hideDropdownList()
     }
 
     override fun scrollToRecipients() {
-        sendMessageScroll.post {
-            sendMessageScroll.scrollTo(0, sendMessageTo.bottom - dpToPx(53f).toInt())
+        with(binding.sendMessageScroll) {
+            post {
+                scrollTo(0, binding.sendMessageTo.bottom - dpToPx(53f).toInt())
+            }
         }
     }
 
     override fun popView() {
-        onBackPressed()
+        finish()
     }
 
     private fun setUpExtendedHitArea() {
         fun extendHitArea() {
             val containerHitRect = Rect().apply {
-                sendMessageContent.getHitRect(this)
+                binding.sendMessageContent.getHitRect(this)
             }
 
             val contentHitRect = Rect().apply {
-                sendMessageMessageContent.getHitRect(this)
+                binding.sendMessageMessageContent.getHitRect(this)
             }
 
             contentHitRect.top = contentHitRect.bottom
             contentHitRect.bottom = containerHitRect.bottom
 
-            sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, sendMessageMessageContent)
+            binding.sendMessageContent.touchDelegate = TouchDelegate(contentHitRect, binding.sendMessageMessageContent)
         }
 
-        sendMessageMessageContent.post {
-            sendMessageMessageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+        with(binding.sendMessageMessageContent) {
+            post {
+                addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ -> extendHitArea() }
                 extendHitArea()
             }
-            extendHitArea()
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
index 3b89b5cae..f877c8096 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/send/SendMessagePresenter.kt
@@ -1,8 +1,8 @@
 package io.github.wulkanowy.ui.modules.message.send
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.db.entities.Recipient
-import io.github.wulkanowy.data.db.entities.ReportingUnit
 import io.github.wulkanowy.data.repositories.message.MessageRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.recipient.RecipientRepository
@@ -12,14 +12,14 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.Completable
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class SendMessagePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
@@ -28,14 +28,14 @@ class SendMessagePresenter @Inject constructor(
     private val recipientRepository: RecipientRepository,
     private val preferencesRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SendMessageView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<SendMessageView>(errorHandler, studentRepository) {
 
     fun onAttachView(view: SendMessageView, message: Message?, reply: Boolean?) {
         super.onAttachView(view)
         view.initView()
         Timber.i("Send message view was initialized")
         loadData(message, reply)
-        view.apply {
+        with(view) {
             message?.let {
                 setSubject(when (reply) {
                     true -> "RE: "
@@ -93,89 +93,89 @@ class SendMessagePresenter @Inject constructor(
     }
 
     private fun loadData(message: Message?, reply: Boolean?) {
-        var reportingUnit: ReportingUnit? = null
-        var recipientChips: List<RecipientChipItem> = emptyList()
-        var selectedRecipientChips: List<RecipientChipItem> = emptyList()
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            val unit = reportingUnitRepository.getReportingUnit(student, semester.unitId)
 
-        Timber.i("Loading recipients started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> it to semester } }
-            .flatMapCompletable { (student, semester) ->
-                reportingUnitRepository.getReportingUnit(student, semester.unitId)
-                    .doOnSuccess { reportingUnit = it }
-                    .flatMap { recipientRepository.getRecipients(student, 2, it).toMaybe() }
-                    .doOnSuccess {
-                        Timber.i("Loading recipients result: Success, fetched %d recipients", it.size)
-                        recipientChips = createChips(it)
-                    }
-                    .flatMapCompletable {
-                        if (message == null || reply != true) Completable.complete()
-                        else recipientRepository.getMessageRecipients(student, message)
-                            .doOnSuccess {
-                                Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", it.size)
-                                selectedRecipientChips = createChips(it)
-                            }
-                            .ignoreElement()
-                    }
-            }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.run {
+            Timber.i("Loading recipients started")
+            val recipients = when {
+                unit != null -> recipientRepository.getRecipients(student, 2, unit)
+                else -> listOf()
+            }.let { createChips(it) }
+            Timber.i("Loading recipients result: Success, fetched %d recipients", recipients.size)
+
+            Timber.i("Loading message recipients started")
+            val messageRecipients = when {
+                message != null && reply == true -> recipientRepository.getMessageRecipients(student, message)
+                else -> emptyList()
+            }.let { createChips(it) }
+            Timber.i("Loaded message recipients to reply result: Success, fetched %d recipients", messageRecipients.size)
+
+            Triple(unit, recipients, messageRecipients)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Loading recipients started")
                     showProgress(true)
                     showContent(false)
                 }
-            }
-            .doFinally { view?.run { showProgress(false) } }
-            .subscribe({
-                view?.run {
-                    if (reportingUnit !== null) {
-                        reportingUnit?.let { setReportingUnit(it) }
-                        setRecipients(recipientChips)
-                        if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
-                        showContent(true)
-                    } else {
-                        Timber.e("Loading recipients result: Can't find the reporting unit")
-                        view?.showEmpty(true)
+                Status.SUCCESS -> it.data!!.let { (reportingUnit, recipientChips, selectedRecipientChips) ->
+                    view?.run {
+                        if (reportingUnit != null) {
+                            setReportingUnit(reportingUnit)
+                            setRecipients(recipientChips)
+                            if (selectedRecipientChips.isNotEmpty()) setSelectedRecipients(selectedRecipientChips)
+                            showContent(true)
+                        } else {
+                            Timber.i("Loading recipients result: Can't find the reporting unit")
+                            view?.showEmpty(true)
+                        }
                     }
                 }
-            }, {
-                Timber.e("Loading recipients result: An exception occurred")
-                view?.showContent(true)
-                errorHandler.dispatch(it)
-            }))
+                Status.ERROR -> {
+                    Timber.i("Loading recipients result: An exception occurred")
+                    view?.showContent(true)
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run { showProgress(false) }
+        }.launch()
     }
 
     private fun sendMessage(subject: String, content: String, recipients: List<Recipient>) {
-        Timber.i("Sending message started")
-        disposable.add(messageRepository.sendMessage(subject, content, recipients)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doOnSubscribe {
-                view?.run {
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            messageRepository.sendMessage(student, subject, content, recipients)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> view?.run {
+                    Timber.i("Sending message started")
                     showSoftInput(false)
                     showContent(false)
                     showProgress(true)
                     showActionBar(false)
                 }
+                Status.SUCCESS -> {
+                    Timber.i("Sending message result: Success")
+                    view?.run {
+                        showMessage(messageSuccess)
+                        popView()
+                    }
+                    analytics.logEvent("send_message", "recipients" to recipients.size)
+                }
+                Status.ERROR -> {
+                    Timber.i("Sending message result: An exception occurred")
+                    view?.run {
+                        showContent(true)
+                        showProgress(false)
+                        showActionBar(true)
+                    }
+                    errorHandler.dispatch(it.error!!)
+                }
             }
-            .subscribe({
-                Timber.i("Sending message result: Success")
-                analytics.logEvent("send_message", "recipients" to recipients.size)
-                view?.run {
-                    showMessage(messageSuccess)
-                    popView()
-                }
-            }, {
-                Timber.i("Sending message result: An exception occurred")
-                view?.run {
-                    showContent(true)
-                    showProgress(false)
-                    showActionBar(true)
-                }
-                errorHandler.dispatch(it)
-            })
-        )
+        }.launch("send")
     }
 
     private fun createChips(recipients: List<Recipient>): List<RecipientChipItem> {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
new file mode 100644
index 000000000..e9b34da33
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabAdapter.kt
@@ -0,0 +1,81 @@
+package io.github.wulkanowy.ui.modules.message.tab
+
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.NO_POSITION
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.databinding.ItemMessageBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class MessageTabAdapter @Inject constructor() :
+    RecyclerView.Adapter<MessageTabAdapter.ItemViewHolder>() {
+
+    var onClickListener: (Message, position: Int) -> Unit = { _, _ -> }
+
+    var onChangesDetectedListener = {}
+
+    private var items = mutableListOf<Message>()
+
+    fun setDataItems(data: List<Message>) {
+        if (items.size != data.size) onChangesDetectedListener()
+        val diffResult = DiffUtil.calculateDiff(MessageTabDiffUtil(items, data))
+        items = data.toMutableList()
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMessageBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            val style = if (item.unread) Typeface.BOLD else Typeface.NORMAL
+
+            messageItemAuthor.run {
+                text = if (item.folderId == MessageFolder.SENT.id) item.recipient else item.sender
+                setTypeface(null, style)
+            }
+            messageItemSubject.run {
+                text = if (item.subject.isNotBlank()) item.subject else context.getString(R.string.message_no_subject)
+                setTypeface(null, style)
+            }
+            messageItemDate.run {
+                text = item.date.toFormattedString()
+                setTypeface(null, style)
+            }
+            messageItemAttachmentIcon.visibility = if (item.hasAttachments) View.VISIBLE else View.GONE
+
+            root.setOnClickListener {
+                holder.adapterPosition.let { if (it != NO_POSITION) onClickListener(item, it) }
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMessageBinding) : RecyclerView.ViewHolder(binding.root)
+
+    private class MessageTabDiffUtil(private val old: List<Message>, private val new: List<Message>) :
+        DiffUtil.Callback() {
+        override fun getOldListSize(): Int = old.size
+
+        override fun getNewListSize(): Int = new.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition].id == new[newItemPosition].id
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return old[oldItemPosition] == new[newItemPosition]
+        }
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
index d6065983d..44ad4bf18 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabFragment.kt
@@ -1,34 +1,36 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.appcompat.widget.SearchView
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
+import io.github.wulkanowy.databinding.FragmentMessageTabBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.message.MessageFragment
-import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.ui.modules.message.preview.MessagePreviewFragment
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_message_tab.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
+import kotlinx.coroutines.FlowPreview
 import javax.inject.Inject
 
-class MessageTabFragment : BaseFragment(), MessageTabView {
+@AndroidEntryPoint
+class MessageTabFragment : BaseFragment<FragmentMessageTabBinding>(R.layout.fragment_message_tab),
+    MessageTabView {
 
     @Inject
     lateinit var presenter: MessageTabPresenter
 
     @Inject
-    lateinit var tabAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var tabAdapter: MessageTabAdapter
 
     companion object {
         const val MESSAGE_TAB_FOLDER_ID = "message_tab_folder_id"
@@ -42,82 +44,96 @@ class MessageTabFragment : BaseFragment(), MessageTabView {
         }
     }
 
-    override val noSubjectString: String
-        get() = getString(R.string.message_no_subject)
-
     override val isViewEmpty
-        get() = tabAdapter.isEmpty
+        get() = tabAdapter.itemCount == 0
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_message_tab, container, false)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = messageTabRecycler
+    @FlowPreview
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMessageTabBinding.bind(view)
+        messageContainer = binding.messageTabRecycler
         presenter.onAttachView(this, MessageFolder.valueOf(
             (savedInstanceState ?: arguments)?.getString(MESSAGE_TAB_FOLDER_ID).orEmpty()
         ))
     }
 
     override fun initView() {
-        tabAdapter.setOnItemClickListener { presenter.onMessageItemSelected(it) }
-
-        messageTabRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
-            adapter = tabAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+        with(tabAdapter) {
+            onClickListener = presenter::onMessageItemSelected
+            onChangesDetectedListener = ::resetListPosition
+        }
+
+        with(binding.messageTabRecycler) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = tabAdapter
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
+            messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        messageTabSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        messageTabErrorRetry.setOnClickListener { presenter.onRetry() }
-        messageTabErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<MessageItem>) {
-        tabAdapter.updateDataSet(data)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.action_menu_message_tab, menu)
+
+        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
+        searchView.queryHint = getString(R.string.all_search_hint)
+        searchView.maxWidth = Int.MAX_VALUE
+        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String) = false
+            override fun onQueryTextChange(query: String): Boolean {
+                presenter.onSearchQueryTextChange(query)
+                return true
+            }
+        })
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        tabAdapter.updateItem(item)
-    }
-
-    override fun clearView() {
-        tabAdapter.clear()
+    override fun updateData(data: List<Message>) {
+        tabAdapter.setDataItems(data)
     }
 
     override fun showProgress(show: Boolean) {
-        messageTabProgress.visibility = if (show) VISIBLE else GONE
+        binding.messageTabProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        messageTabSwipe.isEnabled = enable
+        binding.messageTabSwipe.isEnabled = enable
+    }
+
+    override fun resetListPosition() {
+        binding.messageTabRecycler.scrollToPosition(0)
     }
 
     override fun showContent(show: Boolean) {
-        messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
+        binding.messageTabRecycler.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showEmpty(show: Boolean) {
-        messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
+        binding.messageTabEmpty.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showErrorView(show: Boolean) {
-        messageTabError.visibility = if (show) VISIBLE else GONE
+        binding.messageTabError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        messageTabErrorMessage.text = message
+        binding.messageTabErrorMessage.text = message
     }
 
     override fun showRefresh(show: Boolean) {
-        messageTabSwipe.isRefreshing = show
+        binding.messageTabSwipe.isRefreshing = show
     }
 
-    override fun openMessage(messageId: Long) {
-        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(messageId))
+    override fun openMessage(message: Message) {
+        (activity as? MainActivity)?.pushView(MessagePreviewFragment.newInstance(message))
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
index dc199207a..79062dcfc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabPresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.data.repositories.message.MessageFolder
 import io.github.wulkanowy.data.repositories.message.MessageRepository
@@ -8,28 +8,48 @@ import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.ui.modules.message.MessageItem
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import io.github.wulkanowy.utils.toFormattedString
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+import me.xdrop.fuzzywuzzy.FuzzySearch
 import timber.log.Timber
+import java.util.Locale
 import javax.inject.Inject
+import kotlin.math.pow
 
 class MessageTabPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val messageRepository: MessageRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MessageTabView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MessageTabView>(errorHandler, studentRepository) {
 
     lateinit var folder: MessageFolder
 
     private lateinit var lastError: Throwable
 
+    private var lastSearchQuery = ""
+
+    private var messages = emptyList<Message>()
+
+    private val searchChannel = Channel<String>()
+
+    @FlowPreview
     fun onAttachView(view: MessageTabView, folder: MessageFolder) {
         super.onAttachView(view)
         view.initView()
+        initializeSearchStream()
         errorHandler.showErrorMessage = ::showErrorViewOnError
         this.folder = folder
     }
@@ -52,61 +72,50 @@ class MessageTabPresenter @Inject constructor(
     }
 
     fun onDeleteMessage() {
-        loadData(false)
+        loadData(true)
     }
 
     fun onParentViewLoadData(forceRefresh: Boolean) {
         loadData(forceRefresh)
     }
 
-    fun onMessageItemSelected(item: AbstractFlexibleItem<*>) {
-        if (item is MessageItem) {
-            Timber.i("Select message ${item.message.id} item")
-            view?.run {
-                openMessage(item.message.id)
-                if (item.message.unread) {
-                    item.message.unread = false
-                    updateItem(item)
-                    updateMessage(item.message)
-                }
-            }
-        }
+    fun onMessageItemSelected(message: Message, position: Int) {
+        Timber.i("Select message ${message.id} item (position: $position)")
+        view?.openMessage(message)
     }
 
     private fun loadData(forceRefresh: Boolean) {
-        Timber.i("Loading $folder message data started")
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { student ->
-                    semesterRepository.getCurrentSemester(student)
-                        .flatMap { messageRepository.getMessages(student, it, folder, forceRefresh) }
-                        .map { items -> items.map { MessageItem(it, view?.noSubjectString.orEmpty()) } }
-                }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        showRefresh(false)
-                        showProgress(false)
-                        enableSwipe(true)
-                        notifyParentDataLoaded()
-                    }
-                }
-                .subscribe({
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            messageRepository.getMessages(student, semester, folder, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading $folder message data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading $folder message result: Success")
-                    view?.run {
-                        showEmpty(it.isEmpty())
-                        showContent(it.isNotEmpty())
-                        showErrorView(false)
-                        updateData(it)
-                    }
-                    analytics.logEvent("load_messages", "items" to it.size, "folder" to folder.name)
-                }) {
+                    messages = it.data!!
+                    updateData(getFilteredData(lastSearchQuery))
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "messages",
+                        "items" to it.data.size,
+                        "folder" to folder.name
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Loading $folder message result: An exception occurred")
-                    errorHandler.dispatch(it)
-                })
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                showRefresh(false)
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded()
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -120,15 +129,86 @@ class MessageTabPresenter @Inject constructor(
         }
     }
 
-    private fun updateMessage(message: Message) {
-        Timber.i("Attempt to update message ${message.id}")
-        disposable.add(messageRepository.updateMessage(message)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({ Timber.d("Update message ${message.id} result: Success") })
-            { error ->
-                Timber.i("Update message ${message.id} result: An exception occurred")
-                errorHandler.dispatch(error)
-            })
+    fun onSearchQueryTextChange(query: String) {
+        launch {
+            searchChannel.send(query)
+        }
+    }
+
+    @FlowPreview
+    private fun initializeSearchStream() {
+        launch {
+            searchChannel.consumeAsFlow()
+                .debounce(250)
+                .map { query ->
+                    lastSearchQuery = query
+                    getFilteredData(query)
+                }
+                .catch { Timber.e(it) }
+                .collect {
+                    Timber.d("Applying filter. Full list: ${messages.size}, filtered: ${it.size}")
+                    updateData(it)
+                    view?.resetListPosition()
+                }
+        }
+    }
+
+    private fun getFilteredData(query: String): List<Message> {
+        return if (query.trim().isEmpty()) {
+            messages.sortedByDescending { it.date }
+        } else {
+            messages
+                .map { it to calculateMatchRatio(it, query) }
+                .sortedByDescending { it.second }
+                .filter { it.second > 5000 }
+                .map { it.first }
+        }
+    }
+
+    private fun updateData(data: List<Message>) {
+        view?.run {
+            showEmpty(data.isEmpty())
+            showContent(data.isNotEmpty())
+            showErrorView(false)
+            updateData(data)
+        }
+    }
+
+    private fun calculateMatchRatio(message: Message, query: String): Int {
+        val subjectRatio = FuzzySearch.tokenSortPartialRatio(
+            query.toLowerCase(Locale.getDefault()),
+            message.subject
+        )
+
+        val senderOrRecipientRatio = FuzzySearch.tokenSortPartialRatio(
+            query.toLowerCase(Locale.getDefault()),
+            if (message.sender.isNotEmpty()) message.sender.toLowerCase(Locale.getDefault())
+            else message.recipient.toLowerCase(Locale.getDefault())
+        )
+
+        val dateRatio = listOf(
+            FuzzySearch.ratio(
+                query.toLowerCase(Locale.getDefault()),
+                message.date.toFormattedString("dd.MM").toLowerCase(Locale.getDefault())
+            ),
+            FuzzySearch.ratio(
+                query.toLowerCase(Locale.getDefault()),
+                message.date.toFormattedString("dd.MM.yyyy").toLowerCase(Locale.getDefault())
+            ),
+            FuzzySearch.ratio(
+                query.toLowerCase(Locale.getDefault()),
+                message.date.toFormattedString("d MMMM").toLowerCase(Locale.getDefault())
+            ),
+            FuzzySearch.ratio(
+                query.toLowerCase(Locale.getDefault()),
+                message.date.toFormattedString("d MMMM yyyy").toLowerCase(Locale.getDefault())
+            )
+        ).maxOrNull() ?: 0
+
+
+        return (subjectRatio.toDouble().pow(2)
+            + senderOrRecipientRatio.toDouble().pow(2)
+            + dateRatio.toDouble().pow(2) * 2
+            ).toInt()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
index e5705c739..fe9b60077 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/message/tab/MessageTabView.kt
@@ -1,22 +1,17 @@
 package io.github.wulkanowy.ui.modules.message.tab
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.entities.Message
 import io.github.wulkanowy.ui.base.BaseView
-import io.github.wulkanowy.ui.modules.message.MessageItem
 
 interface MessageTabView : BaseView {
 
-    val noSubjectString: String
-
     val isViewEmpty: Boolean
 
     fun initView()
 
-    fun updateData(data: List<MessageItem>)
+    fun resetListPosition()
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
-
-    fun clearView()
+    fun updateData(data: List<Message>)
 
     fun showProgress(show: Boolean)
 
@@ -32,7 +27,7 @@ interface MessageTabView : BaseView {
 
     fun showRefresh(show: Boolean)
 
-    fun openMessage(messageId: Long)
+    fun openMessage(message: Message)
 
     fun notifyParentDataLoaded()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
index 27c72ce69..4bc3097d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceAdapter.kt
@@ -1,10 +1,38 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.databinding.ItemMobileDeviceBinding
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
 
-class MobileDeviceAdapter<T : IFlexible<*>> : FlexibleAdapter<T>(null, null, true) {
+class MobileDeviceAdapter @Inject constructor() :
+    RecyclerView.Adapter<MobileDeviceAdapter.ItemViewHolder>() {
+
+    var items = mutableListOf<MobileDevice>()
 
     var onDeviceUnregisterListener: (device: MobileDevice, position: Int) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMobileDeviceBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val device = items[position]
+
+        with(holder.binding) {
+            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
+            mobileDeviceItemName.text = device.name
+            mobileDeviceItemUnregister.setOnClickListener {
+                onDeviceUnregisterListener(device, position)
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMobileDeviceBinding) :
+        RecyclerView.ViewHolder(binding.root)
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
index d47574f60..8065e9b60 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceFragment.kt
@@ -1,31 +1,33 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.helpers.UndoHelper
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.core.view.postDelayed
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.MobileDevice
+import io.github.wulkanowy.databinding.FragmentMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.mobiledevice.token.MobileDeviceTokenDialog
-import kotlinx.android.synthetic.main.fragment_mobile_device.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledView {
+@AndroidEntryPoint
+class MobileDeviceFragment :
+    BaseFragment<FragmentMobileDeviceBinding>(R.layout.fragment_mobile_device), MobileDeviceView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: MobileDevicePresenter
 
     @Inject
-    lateinit var devicesAdapter: MobileDeviceAdapter<AbstractFlexibleItem<*>>
+    lateinit var devicesAdapter: MobileDeviceAdapter
 
     companion object {
         fun newInstance() = MobileDeviceFragment()
@@ -35,92 +37,95 @@ class MobileDeviceFragment : BaseFragment(), MobileDeviceView, MainView.TitledVi
         get() = R.string.mobile_devices_title
 
     override val isViewEmpty: Boolean
-        get() = devicesAdapter.isEmpty
+        get() = devicesAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_mobile_device, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = mobileDevicesRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMobileDeviceBinding.bind(view)
+        messageContainer = binding.mobileDevicesRecycler
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        with(mobileDevicesRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        devicesAdapter.onDeviceUnregisterListener = presenter::onUnregisterDevice
+
+        with(binding.mobileDevicesRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = devicesAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
         }
+
+        with(binding) {
+            mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
+            mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+            mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
+        }
+    }
+
+    override fun updateData(data: List<MobileDevice>) {
         with(devicesAdapter) {
-            isPermanentDelete = false
-            onDeviceUnregisterListener = presenter::onUnregisterDevice
+            items = data.toMutableList()
+            notifyDataSetChanged()
         }
-        mobileDevicesSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        mobileDevicesErrorRetry.setOnClickListener { presenter.onRetry() }
-        mobileDevicesErrorDetails.setOnClickListener { presenter.onDetailsClick() }
-        mobileDeviceAddButton.setOnClickListener { presenter.onRegisterDevice() }
     }
 
-    override fun updateData(data: List<MobileDeviceItem>) {
-        devicesAdapter.updateDataSet(data)
-    }
-
-    override fun restoreDeleteItem() {
-        devicesAdapter.restoreDeletedItems()
-    }
-
-    override fun clearData() {
-        devicesAdapter.clear()
-    }
-
-    override fun showUndo(position: Int, device: MobileDevice) {
-        val onActionListener = object : UndoHelper.OnActionListener {
-            override fun onActionConfirmed(action: Int, event: Int) {
-                presenter.onUnregisterConfirmed(device)
-            }
-
-            override fun onActionCanceled(action: Int, positions: MutableList<Int>?) {
-                presenter.onUnregisterCancelled()
-            }
+    override fun deleteItem(device: MobileDevice, position: Int) {
+        with(devicesAdapter) {
+            items.removeAt(position)
+            notifyItemRemoved(position)
+            notifyItemRangeChanged(position, itemCount)
         }
+    }
 
-        UndoHelper(devicesAdapter, onActionListener)
-            .withConsecutive(false)
-            .withAction(UndoHelper.Action.REMOVE)
-            .start(listOf(position), mobileDevicesRecycler, R.string.mobile_device_removed, R.string.all_undo, 3000)
+    override fun restoreDeleteItem(device: MobileDevice, position: Int) {
+        with(devicesAdapter) {
+            items.add(position, device)
+            notifyItemInserted(position)
+            notifyItemRangeChanged(position, itemCount)
+        }
+    }
+
+    override fun showUndo(device: MobileDevice, position: Int) {
+        var confirmed = true
+
+        Snackbar.make(binding.mobileDevicesRecycler, getString(R.string.mobile_device_removed), 3000)
+            .setAction(R.string.all_undo) {
+                confirmed = false
+                presenter.onUnregisterCancelled(device, position)
+            }.show()
+
+        view?.postDelayed(3000) {
+            if (confirmed) presenter.onUnregisterConfirmed(device)
+        }
     }
 
     override fun hideRefresh() {
-        mobileDevicesSwipe.isRefreshing = false
+        binding.mobileDevicesSwipe.isRefreshing = false
     }
 
     override fun showProgress(show: Boolean) {
-        mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showEmpty(show: Boolean) {
-        mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        mobileDevicesError.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        mobileDevicesErrorMessage.text = message
+        binding.mobileDevicesErrorMessage.text = message
     }
 
     override fun enableSwipe(enable: Boolean) {
-        mobileDevicesSwipe.isEnabled = enable
+        binding.mobileDevicesSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
+        binding.mobileDevicesRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showTokenDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
deleted file mode 100644
index 436c2d0e2..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.wulkanowy.ui.modules.mobiledevice
-
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.MobileDevice
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_mobile_device.*
-
-class MobileDeviceItem(val device: MobileDevice) : AbstractFlexibleItem<MobileDeviceItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_mobile_device
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            mobileDeviceItemDate.text = device.date.toFormattedString("dd.MM.yyyy HH:mm:ss")
-            mobileDeviceItemName.text = device.name
-            mobileDeviceItemUnregister.setOnClickListener {
-                (adapter as MobileDeviceAdapter).onDeviceUnregisterListener(device, holder.flexibleAdapterPosition)
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MobileDeviceItem
-
-        if (device.id != other.device.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = device.hashCode()
-        result = 31 * result + device.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
deleted file mode 100644
index 59bbaa9f8..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceModule.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.github.wulkanowy.ui.modules.mobiledevice
-
-import dagger.Module
-import dagger.Provides
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-
-@Module
-class MobileDeviceModule {
-
-    @Provides
-    fun provideMobileDeviceFlexibleAdapter() = MobileDeviceAdapter<AbstractFlexibleItem<*>>()
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
index e95d2ce0e..6314c2c31 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDevicePresenter.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.ui.modules.mobiledevice
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -7,18 +8,21 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDevicePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MobileDeviceView>(errorHandler, studentRepository) {
 
     private lateinit var lastError: Throwable
 
@@ -47,32 +51,39 @@ class MobileDevicePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading mobile devices data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { mobileDeviceRepository.getDevices(it, forceRefresh) }
-            .map { items -> items.map { MobileDeviceItem(it) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            mobileDeviceRepository.getDevices(student, semester, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading mobile devices data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading mobile devices result: Success")
+                    view?.run {
+                        updateData(it.data!!)
+                        showContent(it.data.isNotEmpty())
+                        showEmpty(it.data.isEmpty())
+                        showErrorView(false)
+                    }
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "devices",
+                        "items" to it.data!!.size
+                    )
                 }
-            }.subscribe({
-                Timber.i("Loading mobile devices result: Success")
-                view?.run {
-                    updateData(it)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                    showErrorView(false)
+                Status.ERROR -> {
+                    Timber.i("Loading mobile devices result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
-                analytics.logEvent("load_devices", "items" to it.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.i("Loading mobile devices result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -92,46 +103,39 @@ class MobileDevicePresenter @Inject constructor(
 
     fun onUnregisterDevice(device: MobileDevice, position: Int) {
         view?.run {
-            showUndo(position, device)
+            deleteItem(device, position)
+            showUndo(device, position)
             showEmpty(isViewEmpty)
         }
     }
 
-    fun onUnregisterCancelled() {
+    fun onUnregisterCancelled(device: MobileDevice, position: Int) {
         view?.run {
-            restoreDeleteItem()
+            restoreDeleteItem(device, position)
             showEmpty(isViewEmpty)
         }
     }
 
     fun onUnregisterConfirmed(device: MobileDevice) {
-        Timber.i("Unregister device started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { semester ->
-                mobileDeviceRepository.unregisterDevice(semester, device)
-                    .flatMap { mobileDeviceRepository.getDevices(semester, it) }
-            }
-            .map { items -> items.map { MobileDeviceItem(it) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    showProgress(false)
-                    enableSwipe(true)
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            mobileDeviceRepository.unregisterDevice(student, semester, device)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Unregister device started")
+                Status.SUCCESS -> {
+                    Timber.i("Unregister device result: Success")
+                    view?.run {
+                        showProgress(false)
+                        enableSwipe(true)
+                    }
+                }
+                Status.ERROR -> {
+                    Timber.i("Unregister device result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
             }
-            .subscribe({
-                Timber.i("Unregister device result: Success")
-                view?.run {
-                    updateData(it)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                }
-            }) {
-                Timber.i("Unregister device result: An exception occurred")
-                errorHandler.dispatch(it)
-            }
-        )
+        }.launchIn(this)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
index 869b59bb1..ec2d3f87f 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/MobileDeviceView.kt
@@ -9,14 +9,16 @@ interface MobileDeviceView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<MobileDeviceItem>)
+    fun updateData(data: List<MobileDevice>)
 
-    fun restoreDeleteItem()
+    fun deleteItem(device: MobileDevice, position: Int)
+
+    fun restoreDeleteItem(device: MobileDevice, position: Int)
+
+    fun showUndo(device: MobileDevice, position: Int)
 
     fun hideRefresh()
 
-    fun clearData()
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
@@ -29,7 +31,5 @@ interface MobileDeviceView : BaseView {
 
     fun setErrorDetails(message: String)
 
-    fun showUndo(position: Int, device: MobileDevice)
-
     fun showTokenDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
index 8b81156b1..48150d8de 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenDialog.kt
@@ -12,13 +12,15 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.content.getSystemService
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.pojos.MobileDeviceToken
+import io.github.wulkanowy.databinding.DialogMobileDeviceBinding
 import io.github.wulkanowy.ui.base.BaseDialogFragment
-import kotlinx.android.synthetic.main.dialog_mobile_device.*
 import javax.inject.Inject
 
-class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
+@AndroidEntryPoint
+class MobileDeviceTokenDialog : BaseDialogFragment<DialogMobileDeviceBinding>(), MobileDeviceTokenVIew {
 
     @Inject
     lateinit var presenter: MobileDeviceTokenPresenter
@@ -33,7 +35,7 @@ class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_mobile_device, container, false)
+        return DialogMobileDeviceBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -42,24 +44,24 @@ class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun initView() {
-        mobileDeviceDialogClose.setOnClickListener { dismiss() }
+        binding.mobileDeviceDialogClose.setOnClickListener { dismiss() }
     }
 
     override fun updateData(token: MobileDeviceToken) {
-        with(mobileDeviceDialogToken) {
+        with(binding.mobileDeviceDialogToken) {
             text = token.token
             setOnClickListener { clickCopy(token.token) }
         }
-        with(mobileDeviceDialogSymbol) {
+        with(binding.mobileDeviceDialogSymbol) {
             text = token.symbol
             setOnClickListener { clickCopy(token.symbol) }
         }
-        with(mobileDeviceDialogPin) {
+        with(binding.mobileDeviceDialogPin) {
             text = token.pin
             setOnClickListener { clickCopy(token.pin) }
         }
 
-        mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
+        binding.mobileDeviceQr.setImageBitmap(Base64.decode(token.qr, Base64.DEFAULT).let {
             BitmapFactory.decodeByteArray(it, 0, it.size)
         })
     }
@@ -71,11 +73,11 @@ class MobileDeviceTokenDialog : BaseDialogFragment(), MobileDeviceTokenVIew {
     }
 
     override fun hideLoading() {
-        mobileDeviceDialogProgress.visibility = GONE
+        binding.mobileDeviceDialogProgress.visibility = GONE
     }
 
     override fun showContent() {
-        mobileDeviceDialogContent.visibility = VISIBLE
+        binding.mobileDeviceDialogContent.visibility = VISIBLE
     }
 
     override fun closeDialog() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
index a778cbeda..f6d0de992 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/mobiledevice/token/MobileDeviceTokenPresenter.kt
@@ -1,23 +1,25 @@
 package io.github.wulkanowy.ui.modules.mobiledevice.token
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.mobiledevice.MobileDeviceRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class MobileDeviceTokenPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val mobileDeviceRepository: MobileDeviceRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MobileDeviceTokenVIew>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: MobileDeviceTokenVIew) {
         super.onAttachView(view)
@@ -27,25 +29,29 @@ class MobileDeviceTokenPresenter @Inject constructor(
     }
 
     private fun loadData() {
-        Timber.i("Mobile device registration data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { mobileDeviceRepository.getToken(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally { view?.hideLoading() }
-            .subscribe({
-                Timber.i("Mobile device registration result: Success")
-                view?.run {
-                    updateData(it)
-                    showContent()
+        flowWithResource {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            mobileDeviceRepository.getToken(student, semester)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Mobile device registration data started")
+                Status.SUCCESS -> {
+                    Timber.i("Mobile device registration result: Success")
+                    view?.run {
+                        updateData(it.data!!)
+                        showContent()
+                    }
+                    analytics.logEvent("device_register", "symbol" to it.data!!.token.substring(0, 3))
+                }
+                Status.ERROR -> {
+                    Timber.i("Mobile device registration result: An exception occurred")
+                    view?.closeDialog()
+                    errorHandler.dispatch(it.error!!)
                 }
-                analytics.logEvent("device_register", "symbol" to it.token.substring(0, 3))
-            }) {
-                Timber.i("Mobile device registration result: An exception occurred")
-                view?.closeDialog()
-                errorHandler.dispatch(it)
             }
-        )
+        }.afterLoading {
+            view?.hideLoading()
+        }.launch()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
new file mode 100644
index 000000000..70587b0cf
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreAdapter.kt
@@ -0,0 +1,34 @@
+package io.github.wulkanowy.ui.modules.more
+
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.databinding.ItemMoreBinding
+import javax.inject.Inject
+
+class MoreAdapter @Inject constructor() : RecyclerView.Adapter<MoreAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Pair<String, Drawable?>>()
+
+    var onClickListener: (name: String) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemMoreBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val (title, drawable) = items[position]
+
+        with(holder.binding) {
+            moreItemTitle.text = title
+            moreItemImage.setImageDrawable(drawable)
+
+            root.setOnClickListener { onClickListener(title) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemMoreBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index ef9c36fab..1bdcc26fa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -2,13 +2,11 @@ package io.github.wulkanowy.ui.modules.more
 
 import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentMoreBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.about.AboutFragment
 import io.github.wulkanowy.ui.modules.homework.HomeworkFragment
@@ -21,17 +19,17 @@ import io.github.wulkanowy.ui.modules.note.NoteFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.ui.modules.settings.SettingsFragment
 import io.github.wulkanowy.utils.getCompatDrawable
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_more.*
 import javax.inject.Inject
 
-class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.MainChildView {
+@AndroidEntryPoint
+class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more), MoreView,
+    MainView.TitledView, MainView.MainChildView {
 
     @Inject
     lateinit var presenter: MorePresenter
 
     @Inject
-    lateinit var moreAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var moreAdapter: MoreAdapter
 
     companion object {
         fun newInstance() = MoreFragment()
@@ -64,20 +62,17 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
     override val aboutRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.about_title) to getCompatDrawable(R.drawable.ic_all_about) }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_more, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentMoreBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        moreAdapter.setOnItemClickListener { presenter.onItemSelected(it) }
+        moreAdapter.onClickListener = presenter::onItemSelected
 
-        moreRecycler.apply {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.moreRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = moreAdapter
         }
     }
@@ -86,8 +81,11 @@ class MoreFragment : BaseFragment(), MoreView, MainView.TitledView, MainView.Mai
         if (::presenter.isInitialized) presenter.onViewReselected()
     }
 
-    override fun updateData(data: List<MoreItem>) {
-        moreAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<String, Drawable?>>) {
+        with(moreAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun openMessagesView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
deleted file mode 100644
index 85b604e77..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreItem.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package io.github.wulkanowy.ui.modules.more
-
-import android.graphics.drawable.Drawable
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_more.*
-
-class MoreItem(val title: String, private val drawable: Drawable?) : AbstractFlexibleItem<MoreItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_more
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            moreItemTitle.text = title
-            moreItemImage.setImageDrawable(drawable)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as MoreItem
-
-        if (title != other.title) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return title.hashCode()
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index 096f89e9b..6d80f4181 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -1,18 +1,15 @@
 package io.github.wulkanowy.ui.modules.more
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
 import timber.log.Timber
 import javax.inject.Inject
 
 class MorePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<MoreView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<MoreView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: MoreView) {
         super.onAttachView(view)
@@ -21,11 +18,10 @@ class MorePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item !is MoreItem) return
-        Timber.i("Select more item \"${item.title}\"")
+    fun onItemSelected(title: String) {
+        Timber.i("Select more item \"${title}\"")
         view?.run {
-            when (item.title) {
+            when (title) {
                 messagesRes?.first -> openMessagesView()
                 homeworkRes?.first -> openHomeworkView()
                 noteRes?.first -> openNoteView()
@@ -47,15 +43,15 @@ class MorePresenter @Inject constructor(
         Timber.i("Load items for more view")
         view?.run {
             updateData(listOfNotNull(
-                messagesRes?.let { MoreItem(it.first, it.second) },
-                homeworkRes?.let { MoreItem(it.first, it.second) },
-                noteRes?.let { MoreItem(it.first, it.second) },
-                luckyNumberRes?.let { MoreItem(it.first, it.second) },
-                mobileDevicesRes?.let { MoreItem(it.first, it.second) },
-                schoolAndTeachersRes?.let { MoreItem(it.first, it.second) },
-                settingsRes?.let { MoreItem(it.first, it.second) },
-                aboutRes?.let { MoreItem(it.first, it.second) })
-            )
+                messagesRes,
+                homeworkRes,
+                noteRes,
+                luckyNumberRes,
+                mobileDevicesRes,
+                schoolAndTeachersRes,
+                settingsRes,
+                aboutRes
+            ))
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index 41008176d..922afdfd5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -23,7 +23,7 @@ interface MoreView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<MoreItem>)
+    fun updateData(data: List<Pair<String, Drawable?>>)
 
     fun openSettingsView()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
new file mode 100644
index 000000000..48482cb75
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteAdapter.kt
@@ -0,0 +1,60 @@
+package io.github.wulkanowy.ui.modules.note
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.ItemNoteBinding
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.toFormattedString
+import javax.inject.Inject
+
+class NoteAdapter @Inject constructor() : RecyclerView.Adapter<NoteAdapter.ItemViewHolder>() {
+
+    var items = mutableListOf<Note>()
+
+    var onClickListener: (Note, position: Int) -> Unit = { _, _ -> }
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemNoteBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            with(noteItemDate) {
+                text = item.date.toFormattedString()
+                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
+            }
+            with(noteItemType) {
+                text = item.category
+                setTypeface(null, if (item.isRead) Typeface.NORMAL else Typeface.BOLD)
+            }
+            with(noteItemPoints) {
+                text = "${if (item.points > 0) "+" else ""}${item.points}"
+                visibility = if (item.isPointsShow) View.VISIBLE else View.GONE
+                setTextColor(when (NoteCategory.getByValue(item.categoryType)) {
+                    NoteCategory.POSITIVE -> ContextCompat.getColor(context, R.color.note_positive)
+                    NoteCategory.NEGATIVE -> ContextCompat.getColor(context, R.color.note_negative)
+                    else -> context.getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
+            }
+            noteItemTeacher.text = item.teacher
+            noteItemContent.text = item.content
+
+            root.setOnClickListener { onClickListener(item, position) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemNoteBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
index 492aeab26..e016fe0b9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteDialog.kt
@@ -1,17 +1,24 @@
 package io.github.wulkanowy.ui.modules.note
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.DialogNoteBinding
+import io.github.wulkanowy.sdk.scrapper.notes.NoteCategory
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_note.*
 
 class NoteDialog : DialogFragment() {
 
+    private var binding: DialogNoteBinding by lifecycleAwareVariable()
+
     private lateinit var note: Note
 
     companion object {
@@ -33,16 +40,31 @@ class NoteDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_note, container, false)
+        return DialogNoteBinding.inflate(inflater).apply { binding = this }.root
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        noteDialogDate.text = note.date.toFormattedString()
-        noteDialogCategory.text = note.category
-        noteDialogTeacher.text = note.teacher
-        noteDialogContent.text = note.content
-        noteDialogClose.setOnClickListener { dismiss() }
+        with(binding) {
+            noteDialogDate.text = note.date.toFormattedString()
+            noteDialogCategory.text = note.category
+            noteDialogTeacher.text = note.teacher
+            noteDialogContent.text = note.content
+        }
+
+        if (note.isPointsShow) {
+            with(binding.noteDialogPoints) {
+                text = "${if (note.points > 0) "+" else ""}${note.points}"
+                setTextColor(when (NoteCategory.getByValue(note.categoryType)) {
+                    NoteCategory.POSITIVE -> ContextCompat.getColor(requireContext(), R.color.note_positive)
+                    NoteCategory.NEGATIVE -> ContextCompat.getColor(requireContext(), R.color.note_negative)
+                    else -> requireContext().getThemeAttrColor(android.R.attr.textColorPrimary)
+                })
+            }
+        }
+
+        binding.noteDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
index e5335e459..079285a80 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteFragment.kt
@@ -1,31 +1,29 @@
 package io.github.wulkanowy.ui.modules.note
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Note
+import io.github.wulkanowy.databinding.FragmentNoteBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_note.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
+@AndroidEntryPoint
+class NoteFragment : BaseFragment<FragmentNoteBinding>(R.layout.fragment_note), NoteView,
+    MainView.TitledView {
 
     @Inject
     lateinit var presenter: NotePresenter
 
     @Inject
-    lateinit var noteAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var noteAdapter: NoteAdapter
 
     companion object {
         fun newInstance() = NoteFragment()
@@ -35,77 +33,80 @@ class NoteFragment : BaseFragment(), NoteView, MainView.TitledView {
         get() = R.string.note_title
 
     override val isViewEmpty: Boolean
-        get() = noteAdapter.isEmpty
+        get() = noteAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_note, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentNoteBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        noteAdapter.run {
-            setOnItemClickListener { presenter.onNoteItemSelected(it) }
-        }
+        noteAdapter.onClickListener = presenter::onNoteItemSelected
 
-        noteRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.noteRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = noteAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            noteErrorRetry.setOnClickListener { presenter.onRetry() }
+            noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        noteSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        noteErrorRetry.setOnClickListener { presenter.onRetry() }
-        noteErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
     override fun showNoteDialog(note: Note) {
         (activity as? MainActivity)?.showDialogFragment(NoteDialog.newInstance(note))
     }
 
-    override fun updateData(data: List<NoteItem>) {
-        noteAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Note>) {
+        with(noteAdapter) {
+            items = data.toMutableList()
+            notifyDataSetChanged()
+        }
     }
 
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        noteAdapter.updateItem(item)
+    override fun updateItem(item: Note, position: Int) {
+        with(noteAdapter) {
+            items[position] = item
+            notifyItemChanged(position)
+        }
     }
 
     override fun clearData() {
-        noteAdapter.clear()
+        with(noteAdapter) {
+            items = mutableListOf()
+            notifyDataSetChanged()
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        noteEmpty.visibility = if (show) VISIBLE else GONE
+        binding.noteEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        noteError.visibility = if (show) VISIBLE else GONE
+        binding.noteError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        noteErrorMessage.text = message
+        binding.noteErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        noteProgress.visibility = if (show) VISIBLE else GONE
+        binding.noteProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        noteSwipe.isEnabled = enable
+        binding.noteSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        noteRecycler.visibility = if (show) VISIBLE else GONE
+        binding.noteRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        noteSwipe.isRefreshing = false
+        binding.noteSwipe.isRefreshing = false
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
deleted file mode 100644
index dabeef74a..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteItem.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.wulkanowy.ui.modules.note
-
-import android.graphics.Typeface.BOLD
-import android.graphics.Typeface.NORMAL
-import android.view.View
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Note
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_note.*
-
-class NoteItem(val note: Note) : AbstractFlexibleItem<NoteItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_note
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): NoteItem.ViewHolder {
-        return NoteItem.ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: NoteItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            noteItemDate.apply {
-                text = note.date.toFormattedString()
-                setTypeface(null, if (note.isRead) NORMAL else BOLD)
-            }
-            noteItemType.apply {
-                text = note.category
-                setTypeface(null, if (note.isRead) NORMAL else BOLD)
-            }
-            noteItemTeacher.text = note.teacher
-            noteItemContent.text = note.content
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as NoteItem
-
-        if (note != other.note) return false
-        if (note.id != other.note.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = note.hashCode()
-        result = 31 * result + note.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
index 7acf37a4c..db3b495a8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NotePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.note
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.data.repositories.note.NoteRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
@@ -8,18 +8,21 @@ import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResource
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class NotePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val noteRepository: NoteRepository,
     private val semesterRepository: SemesterRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<NoteView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<NoteView>(errorHandler, studentRepository) {
 
     private lateinit var lastError: Throwable
 
@@ -49,34 +52,39 @@ class NotePresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading note data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it).map { semester -> semester to it } }
-            .flatMap { noteRepository.getNotes(it.second, it.first, forceRefresh) }
-            .map { items -> items.map { NoteItem(it) } }
-            .map { items -> items.sortedByDescending { it.note.date } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            noteRepository.getNotes(student, semester, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading note data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading note result: Success")
+                    view?.apply {
+                        updateData(it.data!!.sortedByDescending { item -> item.date })
+                        showEmpty(it.data.isEmpty())
+                        showErrorView(false)
+                        showContent(it.data.isNotEmpty())
+                    }
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "note",
+                        "items" to it.data!!.size
+                    )
                 }
-            }.subscribe({
-                Timber.i("Loading note result: Success")
-                view?.apply {
-                    updateData(it)
-                    showEmpty(it.isEmpty())
-                    showErrorView(false)
-                    showContent(it.isNotEmpty())
+                Status.ERROR -> {
+                    Timber.i("Loading note result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
-                analytics.logEvent("load_note", "items" to it.size, "force_refresh" to forceRefresh)
-            }, {
-                Timber.i("Loading note result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
-        )
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
@@ -90,29 +98,28 @@ class NotePresenter @Inject constructor(
         }
     }
 
-    fun onNoteItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is NoteItem) {
-            Timber.i("Select note item ${item.note.id}")
-            view?.run {
-                showNoteDialog(item.note)
-                if (!item.note.isRead) {
-                    item.note.isRead = true
-                    updateItem(item)
-                    updateNote(item.note)
-                }
+    fun onNoteItemSelected(note: Note, position: Int) {
+        Timber.i("Select note item ${note.id}")
+        view?.run {
+            showNoteDialog(note)
+            if (!note.isRead) {
+                note.isRead = true
+                updateItem(note, position)
+                updateNote(note)
             }
         }
     }
 
     private fun updateNote(note: Note) {
-        Timber.i("Attempt to update note ${note.id}")
-        disposable.add(noteRepository.updateNote(note)
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({ Timber.i("Update note result: Success") })
-            { error ->
-                Timber.i("Update note result: An exception occurred")
-                errorHandler.dispatch(error)
-            })
+        flowWithResource { noteRepository.updateNote(note) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Attempt to update note ${note.id}")
+                Status.SUCCESS -> Timber.i("Update note result: Success")
+                Status.ERROR -> {
+                    Timber.i("Update note result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.launchIn(this)
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
index a9c9f4f2f..a7cbab8f4 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/note/NoteView.kt
@@ -1,6 +1,5 @@
 package io.github.wulkanowy.ui.modules.note
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
 import io.github.wulkanowy.data.db.entities.Note
 import io.github.wulkanowy.ui.base.BaseView
 
@@ -10,9 +9,9 @@ interface NoteView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<NoteItem>)
+    fun updateData(data: List<Note>)
 
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateItem(item: Note, position: Int)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
index 5f9c0b9a0..c1c569611 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersFragment.kt
@@ -1,12 +1,12 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.databinding.FragmentSchoolandteachersBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
 import io.github.wulkanowy.ui.modules.main.MainView
@@ -14,16 +14,17 @@ import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
 import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.setOnSelectPageListener
-import kotlinx.android.synthetic.main.fragment_schoolandteachers.*
 import javax.inject.Inject
 
-class SchoolAndTeachersFragment : BaseFragment(), SchoolAndTeachersView, MainView.TitledView {
+@AndroidEntryPoint
+class SchoolAndTeachersFragment :
+    BaseFragment<FragmentSchoolandteachersBinding>(R.layout.fragment_schoolandteachers),
+    SchoolAndTeachersView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: SchoolAndTeachersPresenter
 
-    @Inject
-    lateinit var pagerAdapter: BaseFragmentPagerAdapter
+    private val pagerAdapter by lazy { BaseFragmentPagerAdapter(childFragmentManager) }
 
     companion object {
         fun newInstance() = SchoolAndTeachersFragment()
@@ -31,45 +32,44 @@ class SchoolAndTeachersFragment : BaseFragment(), SchoolAndTeachersView, MainVie
 
     override val titleStringId: Int get() = R.string.schoolandteachers_title
 
-    override val currentPageIndex get() = schoolandteachersViewPager.currentItem
+    override val currentPageIndex get() = binding.schoolandteachersViewPager.currentItem
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_schoolandteachers, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentSchoolandteachersBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
         with(pagerAdapter) {
-            containerId = schoolandteachersViewPager.id
+            containerId = binding.schoolandteachersViewPager.id
             addFragmentsWithTitle(mapOf(
                 SchoolFragment.newInstance() to getString(R.string.school_title),
                 TeacherFragment.newInstance() to getString(R.string.teachers_title)
             ))
         }
 
-        with(schoolandteachersViewPager) {
+        with(binding.schoolandteachersViewPager) {
             adapter = pagerAdapter
             offscreenPageLimit = 2
             setOnSelectPageListener(presenter::onPageSelected)
         }
 
-        with(schoolandteachersTabLayout) {
-            setupWithViewPager(schoolandteachersViewPager)
+        with(binding.schoolandteachersTabLayout) {
+            setupWithViewPager(binding.schoolandteachersViewPager)
             setElevationCompat(context.dpToPx(4f))
         }
     }
 
     override fun showContent(show: Boolean) {
-        schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
-        schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        with(binding) {
+            schoolandteachersViewPager.visibility = if (show) VISIBLE else INVISIBLE
+            schoolandteachersTabLayout.visibility = if (show) VISIBLE else INVISIBLE
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
+        binding.schoolandteachersProgress.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     fun onChildFragmentLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
deleted file mode 100644
index 62803a28c..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersModule.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers
-
-import dagger.Module
-import dagger.Provides
-import dagger.android.ContributesAndroidInjector
-import io.github.wulkanowy.di.scopes.PerChildFragment
-import io.github.wulkanowy.di.scopes.PerFragment
-import io.github.wulkanowy.ui.base.BaseFragmentPagerAdapter
-import io.github.wulkanowy.ui.modules.schoolandteachers.school.SchoolFragment
-import io.github.wulkanowy.ui.modules.schoolandteachers.teacher.TeacherFragment
-
-@Suppress("unused")
-@Module(includes = [SchoolAndTeachersModule.Static::class])
-abstract class SchoolAndTeachersModule {
-
-    @Module
-    object Static {
-
-        @PerFragment
-        @Provides
-        fun provideSchoolAndTeachersAdapter(fragment: SchoolAndTeachersFragment) = BaseFragmentPagerAdapter(fragment.childFragmentManager)
-    }
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun provideSchoolFragment(): SchoolFragment
-
-    @PerChildFragment
-    @ContributesAndroidInjector
-    abstract fun provideTeacherFragment(): TeacherFragment
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
index 1856803c6..305f4e7d5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/SchoolAndTeachersPresenter.kt
@@ -3,26 +3,24 @@ package io.github.wulkanowy.ui.modules.schoolandteachers
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Completable
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class SchoolAndTeachersPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<SchoolAndTeachersView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: SchoolAndTeachersView) {
         super.onAttachView(view)
-        disposable.add(Completable.timer(150, TimeUnit.MILLISECONDS, schedulers.mainThread)
-            .subscribe {
-                view.initView()
-                Timber.i("Message view was initialized")
-                loadData()
-            })
+        launch {
+            delay(150)
+            view.initView()
+            Timber.i("Message view was initialized")
+            loadData()
+        }
     }
 
     fun onPageSelected(index: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
index 5a7c4cade..d3f110073 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolFragment.kt
@@ -1,89 +1,91 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.School
+import io.github.wulkanowy.databinding.FragmentSchoolBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
 import io.github.wulkanowy.utils.openDialer
 import io.github.wulkanowy.utils.openNavigation
-import kotlinx.android.synthetic.main.fragment_school.*
 import javax.inject.Inject
 
-class SchoolFragment : BaseFragment(), SchoolView, MainView.TitledView, SchoolAndTeachersChildView {
+@AndroidEntryPoint
+class SchoolFragment : BaseFragment<FragmentSchoolBinding>(R.layout.fragment_school), SchoolView,
+    MainView.TitledView, SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: SchoolPresenter
 
     override val titleStringId get() = R.string.school_title
 
-    override val isViewEmpty get() = schoolName.text.isBlank()
+    override val isViewEmpty get() = binding.schoolName.text.isBlank()
 
     companion object {
         fun newInstance() = SchoolFragment()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_school, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentSchoolBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        schoolErrorRetry.setOnClickListener { presenter.onRetry() }
-        schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            schoolSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            schoolErrorRetry.setOnClickListener { presenter.onRetry() }
+            schoolErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
-        schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
+            schoolAddressButton.setOnClickListener { presenter.onAddressSelected() }
+            schoolTelephoneButton.setOnClickListener { presenter.onTelephoneSelected() }
+        }
     }
 
     override fun updateData(data: School) {
-        schoolName.text = data.name
-        schoolAddress.text = data.address.ifBlank { "-" }
-        schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
-        schoolTelephone.text = data.contact.ifBlank { "-" }
-        schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
-        schoolHeadmaster.text = data.headmaster
-        schoolPedagogue.text = data.pedagogue
+        with(binding) {
+            schoolName.text = data.name
+            schoolAddress.text = data.address.ifBlank { "-" }
+            schoolAddressButton.visibility = if (data.address.isNotBlank()) VISIBLE else GONE
+            schoolTelephone.text = data.contact.ifBlank { "-" }
+            schoolTelephoneButton.visibility = if (data.contact.isNotBlank()) VISIBLE else GONE
+            schoolHeadmaster.text = data.headmaster
+            schoolPedagogue.text = data.pedagogue
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        schoolEmpty.visibility = if (show) VISIBLE else GONE
+        binding.schoolEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        schoolError.visibility = if (show) VISIBLE else GONE
+        binding.schoolError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        schoolErrorMessage.text = message
+        binding.schoolErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        schoolProgress.visibility = if (show) VISIBLE else GONE
+        binding.schoolProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        schoolSwipe.isEnabled = enable
+        binding.schoolSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        schoolContent.visibility = if (show) VISIBLE else GONE
+        binding.schoolContent.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        schoolSwipe.isRefreshing = false
+        binding.schoolSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
index d3299d90d..4cda5d33c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/school/SchoolPresenter.kt
@@ -1,23 +1,25 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.school
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.school.SchoolRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class SchoolPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val schoolRepository: SchoolRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<SchoolView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<SchoolView>(errorHandler, studentRepository) {
 
     private var address: String? = null
 
@@ -62,41 +64,46 @@ class SchoolPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading school info started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMapMaybe { schoolRepository.getSchoolInfo(it, forceRefresh) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded()
-                }
-            }.subscribe({
-                Timber.i("Loading teachers result: Success")
-                view?.run {
-                    address = it.address.ifBlank { null }
-                    contact = it.contact.ifBlank { null }
-                    updateData(it)
-                    showContent(true)
-                    showEmpty(false)
-                    showErrorView(false)
-                }
-                analytics.logEvent("load_school", "force_refresh" to forceRefresh)
-            }, {
-                Timber.i("Loading school result: An exception occurred")
-                errorHandler.dispatch(it)
-            }, {
-                Timber.i("Loading school result: No school info found")
-                view?.run {
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            schoolRepository.getSchoolInfo(student, semester, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading school info started")
+                Status.SUCCESS -> if (it.data != null) {
+                    Timber.i("Loading teachers result: Success")
+                    view?.run {
+                        address = it.data.address.ifBlank { null }
+                        contact = it.data.contact.ifBlank { null }
+                        updateData(it.data)
+                        showContent(true)
+                        showEmpty(false)
+                        showErrorView(false)
+                    }
+                    analytics.logEvent(
+                        "load_item",
+                        "type" to "school"
+                    )
+                } else view?.run {
+                    Timber.i("Loading school result: No school info found")
                     showContent(!isViewEmpty)
                     showEmpty(isViewEmpty)
                     showErrorView(false)
                 }
-            }))
+                Status.ERROR -> {
+                    Timber.i("Loading school result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded()
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
new file mode 100644
index 000000000..8deeae05b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherAdapter.kt
@@ -0,0 +1,40 @@
+package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.databinding.ItemTeacherBinding
+import javax.inject.Inject
+
+class TeacherAdapter @Inject constructor() : RecyclerView.Adapter<TeacherAdapter.ItemViewHolder>() {
+
+    var items = emptyList<Teacher>()
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemTeacherBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val teacher = items[position]
+
+        with(holder.binding) {
+            teacherItemName.text = teacher.name
+            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else root.context.getString(R.string.teacher_no_subject)
+            if (teacher.shortName.isNotBlank()) {
+                teacherItemShortName.visibility = View.VISIBLE
+                teacherItemShortName.text = "[${teacher.shortName}]"
+            } else {
+                teacherItemShortName.visibility = View.GONE
+            }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemTeacherBinding) : RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
index b6bb9c101..5914945b9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherFragment.kt
@@ -1,31 +1,30 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Teacher
+import io.github.wulkanowy.databinding.FragmentTeacherBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersFragment
-import kotlinx.android.synthetic.main.fragment_teacher.*
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import javax.inject.Inject
 
-class TeacherFragment : BaseFragment(), TeacherView, MainView.TitledView,
-    SchoolAndTeachersChildView {
+@AndroidEntryPoint
+class TeacherFragment : BaseFragment<FragmentTeacherBinding>(R.layout.fragment_teacher),
+    TeacherView, MainView.TitledView, SchoolAndTeachersChildView {
 
     @Inject
     lateinit var presenter: TeacherPresenter
 
     @Inject
-    lateinit var teacherAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var teacherAdapter: TeacherAdapter
 
     companion object {
         fun newInstance() = TeacherFragment()
@@ -37,69 +36,60 @@ class TeacherFragment : BaseFragment(), TeacherView, MainView.TitledView,
     override val noSubjectString get() = getString(R.string.teacher_no_subject)
 
     override val isViewEmpty: Boolean
-        get() = teacherAdapter.isEmpty
+        get() = teacherAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_teacher, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTeacherBinding.bind(view)
         presenter.onAttachView(this)
     }
 
     override fun initView() {
-        teacherRecycler.run {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.teacherRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = teacherAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
+        }
+        with(binding) {
+            teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
+            teacherErrorRetry.setOnClickListener { presenter.onRetry() }
+            teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
         }
-        teacherSwipe.setOnRefreshListener { presenter.onSwipeRefresh() }
-        teacherErrorRetry.setOnClickListener { presenter.onRetry() }
-        teacherErrorDetails.setOnClickListener { presenter.onDetailsClick() }
     }
 
-    override fun updateData(data: List<TeacherItem>) {
-        teacherAdapter.updateDataSet(data, true)
-    }
-
-    override fun updateItem(item: AbstractFlexibleItem<*>) {
-        teacherAdapter.updateItem(item)
-    }
-
-    override fun clearData() {
-        teacherAdapter.clear()
+    override fun updateData(data: List<Teacher>) {
+        with(teacherAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun showEmpty(show: Boolean) {
-        teacherEmpty.visibility = if (show) VISIBLE else GONE
+        binding.teacherEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        teacherError.visibility = if (show) VISIBLE else GONE
+        binding.teacherError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        teacherErrorMessage.text = message
+        binding.teacherErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        teacherProgress.visibility = if (show) VISIBLE else GONE
+        binding.teacherProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        teacherSwipe.isEnabled = enable
+        binding.teacherSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        teacherRecycler.visibility = if (show) VISIBLE else GONE
+        binding.teacherRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun hideRefresh() {
-        teacherSwipe.isRefreshing = false
+        binding.teacherSwipe.isRefreshing = false
     }
 
     override fun notifyParentDataLoaded() {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
deleted file mode 100644
index 368317744..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherItem.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
-
-import android.annotation.SuppressLint
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Teacher
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_teacher.*
-
-class TeacherItem(val teacher: Teacher, private val noSubjectText: String) : AbstractFlexibleItem<TeacherItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_teacher
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): TeacherItem.ViewHolder {
-        return TeacherItem.ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: TeacherItem.ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        holder.apply {
-            teacherItemName.text = teacher.name
-            teacherItemSubject.text = if (teacher.subject.isNotBlank()) teacher.subject else noSubjectText
-            if (teacher.shortName.isNotBlank()) {
-                teacherItemShortName.visibility = VISIBLE
-                teacherItemShortName.text = "[${teacher.shortName}]"
-            } else {
-                teacherItemShortName.visibility = GONE
-            }
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TeacherItem
-
-        if (teacher != other.teacher) return false
-        if (teacher.id != other.teacher.id) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = teacher.hashCode()
-        result = 31 * result + teacher.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
index 6aa4871d2..ff02116b9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherPresenter.kt
@@ -1,23 +1,25 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.teacher.TeacherRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import javax.inject.Inject
 
 class TeacherPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
     private val teacherRepository: TeacherRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TeacherView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<TeacherView>(errorHandler, studentRepository) {
 
     private lateinit var lastError: Throwable
 
@@ -38,7 +40,7 @@ class TeacherPresenter @Inject constructor(
             showErrorView(false)
             showProgress(true)
         }
-        loadData(true)
+        loadData()
     }
 
     fun onDetailsClick() {
@@ -50,34 +52,40 @@ class TeacherPresenter @Inject constructor(
     }
 
     private fun loadData(forceRefresh: Boolean = false) {
-        Timber.i("Loading teachers data started")
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .flatMap { teacherRepository.getTeachers(it, forceRefresh) }
-            .map { it.filter { teacher -> teacher.name.isNotBlank() } }
-            .map { items -> items.map { TeacherItem(it, view?.noSubjectString.orEmpty()) } }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .doFinally {
-                view?.run {
-                    hideRefresh()
-                    showProgress(false)
-                    enableSwipe(true)
-                    notifyParentDataLoaded()
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            teacherRepository.getTeachers(student, semester, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading teachers data started")
+                Status.SUCCESS -> {
+                    Timber.i("Loading teachers result: Success")
+                    view?.run {
+                        updateData(it.data!!.filter { item -> item.name.isNotBlank() })
+                        showContent(it.data.isNotEmpty())
+                        showEmpty(it.data.isEmpty())
+                        showErrorView(false)
+                    }
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "teachers",
+                        "items" to it.data!!.size
+                    )
                 }
-            }.subscribe({
-                Timber.i("Loading teachers result: Success")
-                view?.run {
-                    updateData(it)
-                    showContent(it.isNotEmpty())
-                    showEmpty(it.isEmpty())
-                    showErrorView(false)
+                Status.ERROR -> {
+                    Timber.i("Loading teachers result: An exception occurred")
+                    errorHandler.dispatch(it.error!!)
                 }
-                analytics.logEvent("load_teachers", "items" to it.size, "force_refresh" to forceRefresh)
-            }) {
-                Timber.i("Loading teachers result: An exception occurred")
-                errorHandler.dispatch(it)
-            })
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+                notifyParentDataLoaded()
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
index b16be8ff9..c655bfad8 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/schoolandteachers/teacher/TeacherView.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.schoolandteachers.teacher
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.db.entities.Teacher
 import io.github.wulkanowy.ui.base.BaseView
 import io.github.wulkanowy.ui.modules.schoolandteachers.SchoolAndTeachersChildView
 
@@ -12,14 +12,10 @@ interface TeacherView : BaseView, SchoolAndTeachersChildView {
 
     fun initView()
 
-    fun updateData(data: List<TeacherItem>)
-
-    fun updateItem(item: AbstractFlexibleItem<*>)
+    fun updateData(data: List<Teacher>)
 
     fun hideRefresh()
 
-    fun clearData()
-
     fun showProgress(show: Boolean)
 
     fun enableSwipe(enable: Boolean)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
index 03a89d274..6f4a695d6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsFragment.kt
@@ -3,17 +3,22 @@ package io.github.wulkanowy.ui.modules.settings
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.thelittlefireman.appkillermanager.AppKillerManager
+import com.thelittlefireman.appkillermanager.exceptions.NoActionFoundException
 import com.yariksoffice.lingver.Lingver
-import dagger.android.support.AndroidSupportInjection
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.base.ErrorDialog
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.AppInfo
+import io.github.wulkanowy.utils.openInternetBrowser
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class SettingsFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener,
     MainView.TitledView, SettingsView {
@@ -33,11 +38,30 @@ class SettingsFragment : PreferenceFragmentCompat(),
 
     override val titleStringId get() = R.string.settings_title
 
+    override val syncSuccessString get() = getString(R.string.pref_services_message_sync_success)
+
+    override val syncFailedString get() = getString(R.string.pref_services_message_sync_failed)
+
     override fun onAttach(context: Context) {
-        AndroidSupportInjection.inject(this)
         super.onAttach(context)
     }
 
+    override fun initView() {
+        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
+            onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                presenter.onSyncNowClicked()
+                true
+            }
+        }
+        findPreference<Preference>(getString(R.string.pref_key_notifications_fix_issues))?.run {
+            isVisible = AppKillerManager.isDeviceSupported() && AppKillerManager.isAnyActionAvailable(requireContext())
+            setOnPreferenceClickListener {
+                presenter.onFixSyncIssuesClicked()
+                true
+            }
+        }
+    }
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         presenter.onAttachView(this)
@@ -61,32 +85,58 @@ class SettingsFragment : PreferenceFragmentCompat(),
     }
 
     override fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean) {
-        findPreference<Preference>(serviceEnablesKey)?.apply {
+        findPreference<Preference>(serviceEnablesKey)?.run {
             summary = if (isHolidays) getString(R.string.pref_services_suspended) else ""
             isEnabled = !isHolidays
         }
     }
 
+    override fun setSyncInProgress(inProgress: Boolean) {
+        if (activity == null || !isAdded) return
+
+        findPreference<Preference>(getString(R.string.pref_key_services_force_sync))?.run {
+            isEnabled = !inProgress
+            summary = if (inProgress) getString(R.string.pref_services_sync_in_progress) else ""
+        }
+    }
+
     override fun showError(text: String, error: Throwable) {
-        (activity as? BaseActivity<*>)?.showError(text, error)
+        (activity as? BaseActivity<*, *>)?.showError(text, error)
     }
 
     override fun showMessage(text: String) {
-        (activity as? BaseActivity<*>)?.showMessage(text)
+        (activity as? BaseActivity<*, *>)?.showMessage(text)
     }
 
     override fun showExpiredDialog() {
-        (activity as? BaseActivity<*>)?.showExpiredDialog()
+        (activity as? BaseActivity<*, *>)?.showExpiredDialog()
     }
 
     override fun openClearLoginView() {
-        (activity as? BaseActivity<*>)?.openClearLoginView()
+        (activity as? BaseActivity<*, *>)?.openClearLoginView()
     }
 
     override fun showErrorDetailsDialog(error: Throwable) {
         ErrorDialog.newInstance(error).show(childFragmentManager, error.toString())
     }
 
+    override fun showFixSyncDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.pref_notify_fix_sync_issues)
+            .setMessage(R.string.pref_notify_fix_sync_issues_message)
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .setPositiveButton(R.string.pref_notify_fix_sync_issues_settings_button) { _, _ ->
+                try {
+                    AppKillerManager.doActionPowerSaving(requireContext())
+                    AppKillerManager.doActionAutoStart(requireContext())
+                    AppKillerManager.doActionNotification(requireContext())
+                } catch (e: NoActionFoundException) {
+                    requireContext().openInternetBrowser("https://dontkillmyapp.com/${AppKillerManager.getDevice()?.manufacturer}", ::showMessage)
+                }
+            }
+            .show()
+    }
+
     override fun onResume() {
         super.onResume()
         preferenceScreen.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
index 89ba0ee5e..3d1e063e2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsPresenter.kt
@@ -1,52 +1,86 @@
 package io.github.wulkanowy.ui.modules.settings
 
-import com.readystatesoftware.chuck.api.ChuckCollector
+import androidx.work.WorkInfo
+import com.chuckerteam.chucker.api.ChuckerCollector
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.alarm.TimetableNotificationSchedulerHelper
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.isHolidays
-import org.threeten.bp.LocalDate.now
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
+import java.time.LocalDate.now
 import javax.inject.Inject
 
 class SettingsPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val preferencesRepository: PreferencesRepository,
+    private val timetableNotificationHelper: TimetableNotificationSchedulerHelper,
     private val analytics: FirebaseAnalyticsHelper,
     private val syncManager: SyncManager,
-    private val chuckCollector: ChuckCollector,
+    private val chuckerCollector: ChuckerCollector,
     private val appInfo: AppInfo
-) : BasePresenter<SettingsView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<SettingsView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: SettingsView) {
         super.onAttachView(view)
         Timber.i("Settings view was initialized")
         view.setServicesSuspended(preferencesRepository.serviceEnableKey, now().isHolidays)
+        view.initView()
     }
 
     fun onSharedPreferenceChanged(key: String) {
         Timber.i("Change settings $key")
 
-        with(preferencesRepository) {
+        preferencesRepository.apply {
             when (key) {
-                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startSyncWorker() else stopSyncWorker() }
-                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startSyncWorker(true)
-                isDebugNotificationEnableKey -> chuckCollector.showNotification(isDebugNotificationEnable)
+                serviceEnableKey -> with(syncManager) { if (isServiceEnabled) startPeriodicSyncWorker() else stopSyncWorker() }
+                servicesIntervalKey, servicesOnlyWifiKey -> syncManager.startPeriodicSyncWorker(true)
+                isDebugNotificationEnableKey -> chuckerCollector.showNotification = isDebugNotificationEnable
                 appThemeKey -> view?.recreateView()
+                isUpcomingLessonsNotificationsEnableKey -> if (!isUpcomingLessonsNotificationsEnable) timetableNotificationHelper.cancelNotification()
                 appLanguageKey -> view?.run {
                     updateLanguage(if (appLanguage == "system") appInfo.systemLanguage else appLanguage)
                     recreateView()
                 }
-                else -> Unit
             }
         }
         analytics.logEvent("setting_changed", "name" to key)
     }
+
+    fun onSyncNowClicked() {
+        view?.run {
+            syncManager.startOneTimeSyncWorker().onEach { workInfo ->
+                when (workInfo.state) {
+                    WorkInfo.State.ENQUEUED -> {
+                        setSyncInProgress(true)
+                        Timber.i("Setting sync now started")
+                        analytics.logEvent("sync_now", "status" to "started")
+                    }
+                    WorkInfo.State.SUCCEEDED -> {
+                        showMessage(syncSuccessString)
+                        analytics.logEvent("sync_now", "status" to "success")
+                    }
+                    WorkInfo.State.FAILED -> {
+                        showError(syncFailedString, Throwable(workInfo.outputData.getString("error")))
+                        analytics.logEvent("sync_now", "status" to "failed")
+                    }
+                    else -> Timber.d("Sync now state: ${workInfo.state}")
+                }
+                if (workInfo.state.isFinished) setSyncInProgress(false)
+            }.catch {
+                Timber.e(it, "Sync now failed")
+            }.launch("sync")
+        }
+    }
+
+    fun onFixSyncIssuesClicked() {
+        view?.showFixSyncDialog()
+    }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
index e50eb47b3..b647c0b76 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/settings/SettingsView.kt
@@ -4,9 +4,19 @@ import io.github.wulkanowy.ui.base.BaseView
 
 interface SettingsView : BaseView {
 
+    val syncSuccessString: String
+
+    val syncFailedString: String
+
+    fun initView()
+
     fun recreateView()
 
     fun updateLanguage(langCode: String)
 
     fun setServicesSuspended(serviceEnablesKey: String, isHolidays: Boolean)
+
+    fun setSyncInProgress(inProgress: Boolean)
+
+    fun showFixSyncDialog()
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
index 3e0106d1a..7fc20d238 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashActivity.kt
@@ -3,12 +3,15 @@ package io.github.wulkanowy.ui.modules.splash
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
+import androidx.viewbinding.ViewBinding
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.ui.base.BaseActivity
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import javax.inject.Inject
 
-class SplashActivity : BaseActivity<SplashPresenter>(), SplashView {
+@AndroidEntryPoint
+class SplashActivity : BaseActivity<SplashPresenter, ViewBinding>(), SplashView {
 
     @Inject
     override lateinit var presenter: SplashPresenter
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
index 44b53c5f9..d16ca4a80 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/splash/SplashPresenter.kt
@@ -1,27 +1,30 @@
 package io.github.wulkanowy.ui.modules.splash
 
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
 import javax.inject.Inject
 
 class SplashPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository
-) : BasePresenter<SplashView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<SplashView>(errorHandler, studentRepository) {
 
     override fun onAttachView(view: SplashView) {
         super.onAttachView(view)
-        disposable.add(studentRepository.isCurrentStudentSet()
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                view.apply {
-                    if (it) openMainView()
+        flowWithResource { studentRepository.isCurrentStudentSet() }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Is current user set check started")
+                Status.SUCCESS -> with(view) {
+                    if (it.data!!) openMainView()
                     else openLoginView()
                 }
-            }, { errorHandler.dispatch(it) }))
+                Status.ERROR -> errorHandler.dispatch(it.error!!)
+            }
+        }.launch()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
new file mode 100644
index 000000000..f049f828e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableAdapter.kt
@@ -0,0 +1,304 @@
+package io.github.wulkanowy.ui.modules.timetable
+
+import android.graphics.Paint
+import android.view.LayoutInflater
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.databinding.ItemTimetableBinding
+import io.github.wulkanowy.databinding.ItemTimetableSmallBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.isJustFinished
+import io.github.wulkanowy.utils.isShowTimeUntil
+import io.github.wulkanowy.utils.left
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.until
+import timber.log.Timber
+import java.time.LocalDateTime
+import java.util.Timer
+import javax.inject.Inject
+import kotlin.concurrent.timer
+
+class TimetableAdapter @Inject constructor() : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    private enum class ViewType(val id: Int) {
+        ITEM_NORMAL(1),
+        ITEM_SMALL(2)
+    }
+
+    var items = mutableListOf<Timetable>()
+        set(value) {
+            field = value
+            resetTimers()
+        }
+
+    var onClickListener: (Timetable) -> Unit = {}
+
+    var showWholeClassPlan: String = "no"
+
+    var showGroupsInPlan: Boolean = false
+
+    var showTimers: Boolean = false
+
+    private val timers = mutableMapOf<Int, Timer>()
+
+    fun resetTimers() {
+        Timber.d("Timetable timers (${timers.size}) reset")
+        with(timers) {
+            forEach { (_, timer) -> timer.cancel() }
+            clear()
+        }
+    }
+
+    override fun getItemCount() = items.size
+
+    override fun getItemViewType(position: Int) = when {
+        !items[position].isStudentPlan && showWholeClassPlan == "small" -> ViewType.ITEM_SMALL.id
+        else -> ViewType.ITEM_NORMAL.id
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+
+        return when (viewType) {
+            ViewType.ITEM_NORMAL.id -> ItemViewHolder(ItemTimetableBinding.inflate(inflater, parent, false))
+            ViewType.ITEM_SMALL.id -> SmallItemViewHolder(ItemTimetableSmallBinding.inflate(inflater, parent, false))
+            else -> throw IllegalStateException()
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val lesson = items[position]
+
+        when (holder) {
+            is ItemViewHolder -> bindNormalView(holder.binding, lesson, position)
+            is SmallItemViewHolder -> bindSmallView(holder.binding, lesson)
+        }
+    }
+
+    private fun bindSmallView(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            timetableSmallItemNumber.text = lesson.number.toString()
+            timetableSmallItemSubject.text = lesson.subject
+            timetableSmallItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableSmallItemRoom.text = lesson.room
+            timetableSmallItemTeacher.text = lesson.teacher
+
+            bindSubjectStyle(timetableSmallItemSubject, lesson)
+            bindSmallDescription(binding, lesson)
+            bindSmallColors(binding, lesson)
+
+            root.setOnClickListener { onClickListener(lesson) }
+        }
+    }
+
+    private fun bindNormalView(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
+        with(binding) {
+            timetableItemNumber.text = lesson.number.toString()
+            timetableItemSubject.text = lesson.subject
+            timetableItemGroup.text = lesson.group
+            timetableItemRoom.text = lesson.room
+            timetableItemTeacher.text = lesson.teacher
+            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
+            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
+
+            bindSubjectStyle(timetableItemSubject, lesson)
+            bindNormalDescription(binding, lesson)
+            bindNormalColors(binding, lesson)
+
+            if (lesson.isStudentPlan && showTimers) {
+                timers[position] = timer(period = 1000) {
+                    if (ViewCompat.isAttachedToWindow(root)) {
+                        root.post { updateTimeLeft(binding, lesson, position) }
+                    }
+                }
+            } else {
+                // reset item on set changed
+                timetableItemTimeUntil.visibility = GONE
+                timetableItemTimeLeft.visibility = GONE
+            }
+
+            root.setOnClickListener { onClickListener(lesson) }
+        }
+    }
+
+    private fun getPreviousLesson(position: Int): LocalDateTime? {
+        return items.filter { it.isStudentPlan }.getOrNull(position - 1 - items.filterIndexed { i, item -> i < position && !item.isStudentPlan }.size)?.let {
+            if (!it.canceled && it.isStudentPlan) it.end
+            else null
+        }
+    }
+
+    private fun updateTimeLeft(binding: ItemTimetableBinding, lesson: Timetable, position: Int) {
+        val isShowTimeUntil = lesson.isShowTimeUntil(getPreviousLesson(position))
+        val until = lesson.until
+        val left = lesson.left
+        val isJustFinished = lesson.isJustFinished
+
+        with(binding) {
+            when {
+                // before lesson
+                isShowTimeUntil -> {
+                    Timber.d("Show time until lesson: $position")
+                    timetableItemTimeLeft.visibility = GONE
+                    with(timetableItemTimeUntil) {
+                        visibility = VISIBLE
+                        text = context.getString(R.string.timetable_time_until,
+                            if (until.seconds <= 60) {
+                                context.getString(R.string.timetable_seconds, until.seconds.toString(10))
+                            } else {
+                                context.getString(R.string.timetable_minutes, until.toMinutes().toString(10))
+                            }
+                        )
+                    }
+                }
+                // after lesson start
+                left != null -> {
+                    Timber.d("Show time left lesson: $position")
+                    timetableItemTimeUntil.visibility = GONE
+                    with(timetableItemTimeLeft) {
+                        visibility = VISIBLE
+                        text = context.getString(
+                            R.string.timetable_time_left,
+                            if (left.seconds < 60) {
+                                context.getString(R.string.timetable_seconds, left.seconds.toString(10))
+                            } else {
+                                context.getString(R.string.timetable_minutes, left.toMinutes().toString(10))
+                            }
+                        )
+                    }
+                }
+                // right after lesson finish
+                isJustFinished -> {
+                    Timber.d("Show just finished lesson: $position")
+                    timetableItemTimeUntil.visibility = GONE
+                    timetableItemTimeLeft.visibility = VISIBLE
+                    timetableItemTimeLeft.text = root.context.getString(R.string.timetable_finished)
+                }
+                else -> {
+                    timetableItemTimeUntil.visibility = GONE
+                    timetableItemTimeLeft.visibility = GONE
+                }
+            }
+        }
+    }
+
+    private fun bindSubjectStyle(subjectView: TextView, lesson: Timetable) {
+        subjectView.paintFlags = if (lesson.canceled) subjectView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+        else subjectView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+    }
+
+    private fun bindSmallDescription(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableSmallItemDescription.visibility = VISIBLE
+                timetableSmallItemDescription.text = lesson.info
+
+                timetableSmallItemRoom.visibility = GONE
+                timetableSmallItemTeacher.visibility = GONE
+
+                timetableSmallItemDescription.setTextColor(root.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableSmallItemDescription.visibility = GONE
+                timetableSmallItemRoom.visibility = VISIBLE
+                timetableSmallItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun bindNormalDescription(binding: ItemTimetableBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.info.isNotBlank() && !lesson.changes) {
+                timetableItemDescription.visibility = VISIBLE
+                timetableItemDescription.text = lesson.info
+
+                timetableItemRoom.visibility = GONE
+                timetableItemGroup.visibility = GONE
+                timetableItemTeacher.visibility = GONE
+
+                timetableItemDescription.setTextColor(root.context.getThemeAttrColor(
+                    if (lesson.canceled) R.attr.colorPrimary
+                    else R.attr.colorTimetableChange
+                ))
+            } else {
+                timetableItemDescription.visibility = GONE
+                timetableItemRoom.visibility = VISIBLE
+                timetableItemGroup.visibility = if (showGroupsInPlan && lesson.group.isNotBlank()) VISIBLE else GONE
+                timetableItemTeacher.visibility = VISIBLE
+            }
+        }
+    }
+
+    private fun bindSmallColors(binding: ItemTimetableSmallBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableSmallItemNumber, timetableSmallItemSubject)
+            } else {
+                updateNumberColor(timetableSmallItemNumber, lesson)
+                updateSubjectColor(timetableSmallItemSubject, lesson)
+                updateRoomColor(timetableSmallItemRoom, lesson)
+                updateTeacherColor(timetableSmallItemTeacher, lesson)
+            }
+        }
+    }
+
+    private fun bindNormalColors(binding: ItemTimetableBinding, lesson: Timetable) {
+        with(binding) {
+            if (lesson.canceled) {
+                updateNumberAndSubjectCanceledColor(timetableItemNumber, timetableItemSubject)
+            } else {
+                updateNumberColor(timetableItemNumber, lesson)
+                updateSubjectColor(timetableItemSubject, lesson)
+                updateRoomColor(timetableItemRoom, lesson)
+                updateTeacherColor(timetableItemTeacher, lesson)
+            }
+        }
+    }
+
+    private fun updateNumberAndSubjectCanceledColor(numberView: TextView, subjectView: TextView) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(R.attr.colorPrimary))
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(R.attr.colorPrimary))
+    }
+
+    private fun updateNumberColor(numberView: TextView, lesson: Timetable) {
+        numberView.setTextColor(numberView.context.getThemeAttrColor(
+            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateSubjectColor(subjectView: TextView, lesson: Timetable) {
+        subjectView.setTextColor(subjectView.context.getThemeAttrColor(
+            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
+            else android.R.attr.textColorPrimary
+        ))
+    }
+
+    private fun updateRoomColor(roomView: TextView, lesson: Timetable) {
+        roomView.setTextColor(roomView.context.getThemeAttrColor(
+            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    private fun updateTeacherColor(teacherTextView: TextView, lesson: Timetable) {
+        teacherTextView.setTextColor(teacherTextView.context.getThemeAttrColor(
+            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
+            else android.R.attr.textColorSecondary
+        ))
+    }
+
+    private class ItemViewHolder(val binding: ItemTimetableBinding) :
+        RecyclerView.ViewHolder(binding.root)
+
+    private class SmallItemViewHolder(val binding: ItemTimetableSmallBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
index 57ec5998d..f7d5b1ed9 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableDialog.kt
@@ -11,13 +11,16 @@ import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.databinding.DialogTimetableBinding
 import io.github.wulkanowy.utils.getThemeAttrColor
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.synthetic.main.dialog_timetable.*
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDateTime
 
 class TimetableDialog : DialogFragment() {
 
+    private var binding: DialogTimetableBinding by lifecycleAwareVariable()
+
     private lateinit var lesson: Timetable
 
     companion object {
@@ -39,13 +42,13 @@ class TimetableDialog : DialogFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_timetable, container, false)
+        return DialogTimetableBinding.inflate(inflater).apply { binding = this }.root
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        lesson.run {
+        with(lesson) {
             setInfo(info, teacher, canceled, changes)
             setSubject(subject, subjectOld)
             setTeacher(teacher, teacherOld)
@@ -54,74 +57,81 @@ class TimetableDialog : DialogFragment() {
             setTime(start, end)
         }
 
-        timetableDialogClose.setOnClickListener { dismiss() }
+        binding.timetableDialogClose.setOnClickListener { dismiss() }
     }
 
     private fun setSubject(subject: String, subjectOld: String) {
-        timetableDialogSubject.text = subject
-        if (subjectOld.isNotBlank() && subjectOld != subject) {
-            timetableDialogSubject.run {
-                paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                text = subjectOld
-            }
-            timetableDialogSubjectNew.run {
-                visibility = VISIBLE
-                text = subject
+        with(binding) {
+            timetableDialogSubject.text = subject
+            if (subjectOld.isNotBlank() && subjectOld != subject) {
+                timetableDialogSubject.run {
+                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                    text = subjectOld
+                }
+                timetableDialogSubjectNew.run {
+                    visibility = VISIBLE
+                    text = subject
+                }
             }
         }
     }
 
     private fun setInfo(info: String, teacher: String, canceled: Boolean, changes: Boolean) {
-        when {
-            info.isNotBlank() -> {
-                if (canceled) {
-                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
-                } else {
-                    timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                    timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
-                }
+        with(binding) {
+            when {
+                info.isNotBlank() -> {
+                    if (canceled) {
+                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorPrimary))
+                    } else {
+                        timetableDialogChangesTitle.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                        timetableDialogChanges.setTextColor(requireContext().getThemeAttrColor(R.attr.colorTimetableChange))
+                    }
 
-                timetableDialogChanges.text = when {
-                    canceled && !changes -> "Lekcja odwołana: $info"
-                    changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
-                    changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
-                    else -> info.capitalize()
+                    timetableDialogChanges.text = when {
+                        canceled && !changes -> "Lekcja odwołana: $info"
+                        changes && teacher.isNotBlank() -> "Zastępstwo: $teacher"
+                        changes && teacher.isBlank() -> "Zastępstwo, ${info.decapitalize()}"
+                        else -> info.capitalize()
+                    }
+                }
+                else -> {
+                    timetableDialogChangesTitle.visibility = GONE
+                    timetableDialogChanges.visibility = GONE
                 }
-            } else -> {
-                timetableDialogChangesTitle.visibility = GONE
-                timetableDialogChanges.visibility = GONE
             }
         }
     }
 
     private fun setTeacher(teacher: String, teacherOld: String) {
-        when {
-            teacherOld.isNotBlank() && teacherOld != teacher -> {
-                timetableDialogTeacher.run {
-                    visibility = VISIBLE
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = teacherOld
-                }
-                if (teacher.isNotBlank()) {
-                    timetableDialogTeacherNew.run {
+        with(binding) {
+            when {
+                teacherOld.isNotBlank() && teacherOld != teacher -> {
+                    timetableDialogTeacher.run {
                         visibility = VISIBLE
-                        text = teacher
+                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                        text = teacherOld
+                    }
+                    if (teacher.isNotBlank()) {
+                        timetableDialogTeacherNew.run {
+                            visibility = VISIBLE
+                            text = teacher
+                        }
                     }
                 }
-            }
-            teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
-            else -> {
-                timetableDialogTeacherTitle.visibility = GONE
-                timetableDialogTeacher.visibility = GONE
+                teacher.isNotBlank() -> timetableDialogTeacher.text = teacher
+                else -> {
+                    timetableDialogTeacherTitle.visibility = GONE
+                    timetableDialogTeacher.visibility = GONE
+                }
             }
         }
     }
 
     private fun setGroup(group: String) {
-        group.let {
+        with(binding) {
             when {
-                it.isNotBlank() -> timetableDialogGroup.text = it
+                group.isNotBlank() -> timetableDialogGroup.text = group
                 else -> {
                     timetableDialogGroupTitle.visibility = GONE
                     timetableDialogGroup.visibility = GONE
@@ -131,30 +141,32 @@ class TimetableDialog : DialogFragment() {
     }
 
     private fun setRoom(room: String, roomOld: String) {
-        when {
-            roomOld.isNotBlank() && roomOld != room -> {
-                timetableDialogRoom.run {
-                    visibility = VISIBLE
-                    paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
-                    text = roomOld
-                }
-                if (room.isNotBlank()) {
-                    timetableDialogRoomNew.run {
+        with(binding) {
+            when {
+                roomOld.isNotBlank() && roomOld != room -> {
+                    timetableDialogRoom.run {
                         visibility = VISIBLE
-                        text = room
+                        paintFlags = paintFlags or STRIKE_THRU_TEXT_FLAG
+                        text = roomOld
+                    }
+                    if (room.isNotBlank()) {
+                        timetableDialogRoomNew.run {
+                            visibility = VISIBLE
+                            text = room
+                        }
                     }
                 }
-            }
-            room.isNotBlank() -> timetableDialogRoom.text = room
-            else -> {
-                timetableDialogRoomTitle.visibility = GONE
-                timetableDialogRoom.visibility = GONE
+                room.isNotBlank() -> timetableDialogRoom.text = room
+                else -> {
+                    timetableDialogRoomTitle.visibility = GONE
+                    timetableDialogRoom.visibility = GONE
+                }
             }
         }
     }
 
     @SuppressLint("SetTextI18n")
     private fun setTime(start: LocalDateTime, end: LocalDateTime) {
-        timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
+        binding.timetableDialogTime.text = "${start.toFormattedString("HH:mm")} - ${end.toFormattedString("HH:mm")}"
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
index ef6057dfa..4aa375c21 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableFragment.kt
@@ -1,40 +1,37 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.FlexibleItemDecoration
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.databinding.FragmentTimetableBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.ui.modules.timetable.completed.CompletedLessonsFragment
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_timetable.*
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import javax.inject.Inject
 
-class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
-    MainView.TitledView {
+@AndroidEntryPoint
+class TimetableFragment : BaseFragment<FragmentTimetableBinding>(R.layout.fragment_timetable),
+    TimetableView, MainView.MainChildView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: TimetablePresenter
 
     @Inject
-    lateinit var timetableAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var timetableAdapter: TimetableAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -44,7 +41,7 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
 
     override val titleStringId get() = R.string.timetable_title
 
-    override val isViewEmpty get() = timetableAdapter.isEmpty
+    override val isViewEmpty get() = timetableAdapter.items.isEmpty()
 
     override val currentStackSize get() = (activity as? MainActivity)?.currentStackSize
 
@@ -53,37 +50,33 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_timetable, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = timetableRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTimetableBinding.bind(view)
+        messageContainer = binding.timetableRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        timetableAdapter.setOnItemClickListener(presenter::onTimetableItemSelected)
+        timetableAdapter.onClickListener = presenter::onTimetableItemSelected
 
-        with(timetableRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.timetableRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = timetableAdapter
-            addItemDecoration(FlexibleItemDecoration(context)
-                .withDefaultDivider()
-                .withDrawDividerOnLastItem(false)
-            )
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        timetableErrorRetry.setOnClickListener { presenter.onRetry() }
-        timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            timetableSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            timetableErrorRetry.setOnClickListener { presenter.onRetry() }
+            timetableErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        timetableNavDate.setOnClickListener { presenter.onPickDate() }
-        timetableNextButton.setOnClickListener { presenter.onNextDay() }
+            timetablePreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            timetableNavDate.setOnClickListener { presenter.onPickDate() }
+            timetableNextButton.setOnClickListener { presenter.onNextDay() }
 
-        timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+            timetableNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+        }
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -95,24 +88,33 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
         else false
     }
 
-    override fun updateData(data: List<TimetableItem>) {
-        timetableAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showGroupsInPlanType: Boolean, showTimetableTimers: Boolean) {
+        with(timetableAdapter) {
+            items = data.toMutableList()
+            showTimers = showTimetableTimers
+            showWholeClassPlan = showWholeClassPlanType
+            showGroupsInPlan = showGroupsInPlanType
+            notifyDataSetChanged()
+        }
     }
 
     override fun clearData() {
-        timetableAdapter.clear()
+        with(timetableAdapter) {
+            items = mutableListOf()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        timetableNavDate.text = date
+        binding.timetableNavDate.text = date
     }
 
     override fun hideRefresh() {
-        timetableSwipe.isRefreshing = false
+        binding.timetableSwipe.isRefreshing = false
     }
 
     override fun resetView() {
-        timetableRecycler.smoothScrollToPosition(0)
+        binding.timetableRecycler.smoothScrollToPosition(0)
     }
 
     override fun onFragmentReselected() {
@@ -124,35 +126,35 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun showEmpty(show: Boolean) {
-        timetableEmpty.visibility = if (show) VISIBLE else GONE
+        binding.timetableEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        timetableError.visibility = if (show) VISIBLE else GONE
+        binding.timetableError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        timetableErrorMessage.text = message
+        binding.timetableErrorMessage.text = message
     }
 
     override fun showProgress(show: Boolean) {
-        timetableProgress.visibility = if (show) VISIBLE else GONE
+        binding.timetableProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        timetableSwipe.isEnabled = enable
+        binding.timetableSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        timetableRecycler.visibility = if (show) VISIBLE else GONE
+        binding.timetableRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        binding.timetablePreviousButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
+        binding.timetableNextButton.visibility = if (show) VISIBLE else View.INVISIBLE
     }
 
     override fun showTimetableDialog(lesson: Timetable) {
@@ -184,6 +186,7 @@ class TimetableFragment : BaseFragment(), TimetableView, MainView.MainChildView,
     }
 
     override fun onDestroyView() {
+        timetableAdapter.resetTimers()
         presenter.onDetachView()
         super.onDestroyView()
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
deleted file mode 100644
index 0991981df..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableItem.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable
-
-import android.annotation.SuppressLint
-import android.graphics.Paint
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Timetable
-import io.github.wulkanowy.utils.getThemeAttrColor
-import io.github.wulkanowy.utils.toFormattedString
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_timetable.*
-
-class TimetableItem(val lesson: Timetable) :
-    AbstractFlexibleItem<TimetableItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_timetable
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ViewHolder {
-        return ViewHolder(view, adapter)
-    }
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>?) {
-        updateFields(holder)
-
-        with(holder) {
-            timetableItemSubject.paintFlags =
-                if (lesson.canceled) timetableItemSubject.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
-                else timetableItemSubject.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
-        }
-
-        updateDescription(holder)
-        updateColors(holder)
-    }
-
-    private fun updateFields(holder: ViewHolder) {
-        with(holder) {
-            timetableItemNumber.text = lesson.number.toString()
-            timetableItemSubject.text = lesson.subject
-            timetableItemRoom.text = lesson.room
-            timetableItemTeacher.text = lesson.teacher
-            timetableItemTimeStart.text = lesson.start.toFormattedString("HH:mm")
-            timetableItemTimeFinish.text = lesson.end.toFormattedString("HH:mm")
-        }
-    }
-
-    private fun updateDescription(holder: ViewHolder) {
-        with(holder) {
-            if (lesson.info.isNotBlank() && !lesson.changes) {
-                updateDescriptionNoChanges(this)
-            } else {
-                timetableItemDescription.visibility = GONE
-
-                timetableItemRoom.visibility = VISIBLE
-                timetableItemTeacher.visibility = VISIBLE
-            }
-        }
-    }
-
-    private fun updateDescriptionNoChanges(holder: ViewHolder) {
-        with(holder) {
-            timetableItemDescription.visibility = VISIBLE
-            timetableItemDescription.text = lesson.info
-
-            timetableItemRoom.visibility = GONE
-            timetableItemTeacher.visibility = GONE
-
-            timetableItemDescription.setTextColor(holder.view.context.getThemeAttrColor(
-                if (lesson.canceled) R.attr.colorPrimary
-                else R.attr.colorTimetableChange
-            ))
-        }
-    }
-
-    private fun updateColors(holder: ViewHolder) {
-        with(holder) {
-            if (lesson.canceled) {
-                timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
-                timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(R.attr.colorPrimary))
-            } else {
-                updateNumberColor(this)
-                updateSubjectColor(this)
-                updateRoomColor(this)
-                updateTeacherColor(this)
-            }
-        }
-    }
-
-    private fun updateNumberColor(holder: ViewHolder) {
-        holder.timetableItemNumber.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.changes || lesson.info.isNotBlank()) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateSubjectColor(holder: ViewHolder) {
-        holder.timetableItemSubject.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.subjectOld.isNotBlank() && lesson.subjectOld != lesson.subject) R.attr.colorTimetableChange
-            else android.R.attr.textColorPrimary
-        ))
-    }
-
-    private fun updateRoomColor(holder: ViewHolder) {
-        holder.timetableItemRoom.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.roomOld.isNotBlank() && lesson.roomOld != lesson.room) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
-    }
-
-    private fun updateTeacherColor(holder: ViewHolder) {
-        holder.timetableItemTeacher.setTextColor(holder.view.context.getThemeAttrColor(
-            if (lesson.teacherOld.isNotBlank() && lesson.teacherOld != lesson.teacher) R.attr.colorTimetableChange
-            else android.R.attr.textColorSecondary
-        ))
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableItem
-
-        if (lesson != other.lesson) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = lesson.hashCode()
-        result = 31 * result + lesson.id.toInt()
-        return result
-    }
-
-    class ViewHolder(val view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
-        override val containerView: View
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
index 4c30ecb7f..9aebfd04e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetablePresenter.kt
@@ -1,36 +1,41 @@
 package io.github.wulkanowy.ui.modules.timetable
 
 import android.annotation.SuppressLint
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.of
-import org.threeten.bp.LocalDate.ofEpochDay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.util.concurrent.TimeUnit.MILLISECONDS
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.of
+import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class TimetablePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val timetableRepository: TimetableRepository,
     private val semesterRepository: SemesterRepository,
+    private val prefRepository: PreferencesRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<TimetableView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<TimetableView>(errorHandler, studentRepository) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -99,11 +104,9 @@ class TimetablePresenter @Inject constructor(
         }
     }
 
-    fun onTimetableItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is TimetableItem) {
-            Timber.i("Select timetable item ${item.lesson.id}")
-            view?.showTimetableDialog(item.lesson)
-        }
+    fun onTimetableItemSelected(lesson: Timetable) {
+        Timber.i("Select timetable item ${lesson.id}")
+        view?.showTimetableDialog(lesson)
     }
 
     fun onCompletedLessonsSwitchSelected(): Boolean {
@@ -112,53 +115,61 @@ class TimetablePresenter @Inject constructor(
     }
 
     private fun setBaseDateOnHolidays() {
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-                currentDate = baseDate
-                reloadNavigation()
-            }) {
-                Timber.i("Loading semester result: An exception occurred")
-            })
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            currentDate = baseDate
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
-        Timber.i("Loading timetable data started")
         currentDate = date
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .delay(200, MILLISECONDS)
-                .flatMap { timetableRepository.getTimetable(it, currentDate, currentDate, forceRefresh) }
-                .map { items -> items.map { TimetableItem(it) } }
-                .map { items -> items.sortedBy { it.lesson.number } }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            timetableRepository.getTimetable(student, semester, date, date, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading timetable data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading timetable result: Success")
                     view?.apply {
-                        updateData(it)
-                        showEmpty(it.isEmpty())
+                        updateData(
+                            showWholeClassPlanType = prefRepository.showWholeClassPlan,
+                            showGroupsInPlanType = prefRepository.showGroupsInPlan,
+                            showTimetableTimers = prefRepository.showTimetableTimers,
+                            data = it.data!!
+                                .filter { item -> if (prefRepository.showWholeClassPlan == "no") item.isStudentPlan else true }
+                                .sortedWith(compareBy({ item -> item.number }, { item -> !item.isStudentPlan }))
+                        )
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(it.isNotEmpty())
+                        showContent(it.data.isNotEmpty())
                     }
-                    analytics.logEvent("load_timetable", "items" to it.size, "force_refresh" to forceRefresh)
-                }) {
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "timetable",
+                        "items" to it.data!!.size
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Loading timetable result: An exception occurred")
-                    errorHandler.dispatch(it)
-                })
-        }
+                    errorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
index f730a2712..244120176 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/TimetableView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable
 
 import io.github.wulkanowy.data.db.entities.Timetable
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 interface TimetableView : BaseView {
 
@@ -12,7 +12,7 @@ interface TimetableView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<TimetableItem>)
+    fun updateData(data: List<Timetable>, showWholeClassPlanType: String, showGroupsInPlanType: Boolean, showTimetableTimers: Boolean)
 
     fun updateNavigationDay(date: String)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
index 8f7b1ec5b..56ea16cfa 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonDialog.kt
@@ -6,12 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
-import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
-import kotlinx.android.synthetic.main.dialog_lesson_completed.*
+import io.github.wulkanowy.databinding.DialogLessonCompletedBinding
+import io.github.wulkanowy.utils.lifecycleAwareVariable
 
 class CompletedLessonDialog : DialogFragment() {
 
+    private var binding: DialogLessonCompletedBinding by lifecycleAwareVariable()
+
     private lateinit var completedLesson: CompletedLesson
 
     companion object {
@@ -28,46 +30,54 @@ class CompletedLessonDialog : DialogFragment() {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NO_TITLE, 0)
         arguments?.run {
-            completedLesson = getSerializable(CompletedLessonDialog.ARGUMENT_KEY) as CompletedLesson
+            completedLesson = getSerializable(ARGUMENT_KEY) as CompletedLesson
         }
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.dialog_lesson_completed, container, false)
+        return DialogLessonCompletedBinding.inflate(inflater).apply { binding = this }.root
     }
 
     @SuppressLint("SetTextI18n")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        completedLessonDialogSubject.text = completedLesson.subject
-        completedLessonDialogTopic.text = completedLesson.topic
-        completedLessonDialogTeacher.text = completedLesson.teacher
-        completedLessonDialogAbsence.text = completedLesson.absence
-        completedLessonDialogChanges.text = completedLesson.substitution
-        completedLessonDialogResources.text = completedLesson.resources
+        with(binding) {
+            completedLessonDialogSubject.text = completedLesson.subject
+            completedLessonDialogTopic.text = completedLesson.topic
+            completedLessonDialogTeacher.text = completedLesson.teacher
+            completedLessonDialogAbsence.text = completedLesson.absence
+            completedLessonDialogChanges.text = completedLesson.substitution
+            completedLessonDialogResources.text = completedLesson.resources
+        }
 
         completedLesson.substitution.let {
             if (it.isBlank()) {
-                completedLessonDialogChangesTitle.visibility = View.GONE
-                completedLessonDialogChanges.visibility = View.GONE
-            } else completedLessonDialogChanges.text = it
+                with(binding) {
+                    completedLessonDialogChangesTitle.visibility = View.GONE
+                    completedLessonDialogChanges.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogChanges.text = it
         }
 
         completedLesson.absence.let {
             if (it.isBlank()) {
-                completedLessonDialogAbsenceTitle.visibility = View.GONE
-                completedLessonDialogAbsence.visibility = View.GONE
-            } else completedLessonDialogAbsence.text = it
+                with(binding) {
+                    completedLessonDialogAbsenceTitle.visibility = View.GONE
+                    completedLessonDialogAbsence.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogAbsence.text = it
         }
 
         completedLesson.resources.let {
             if (it.isBlank()) {
-                completedLessonDialogResourcesTitle.visibility = View.GONE
-                completedLessonDialogResources.visibility = View.GONE
-            } else completedLessonDialogResources.text = it
+                with(binding) {
+                    completedLessonDialogResourcesTitle.visibility = View.GONE
+                    completedLessonDialogResources.visibility = View.GONE
+                }
+            } else binding.completedLessonDialogResources.text = it
         }
 
-        completedLessonDialogClose.setOnClickListener { dismiss() }
+        binding.completedLessonDialogClose.setOnClickListener { dismiss() }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
deleted file mode 100644
index fd6dc8a66..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonItem.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetable.completed
-
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.CompletedLesson
-import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_completed_lesson.*
-
-class CompletedLessonItem(val completedLesson: CompletedLesson) : AbstractFlexibleItem<CompletedLessonItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_completed_lesson
-
-    override fun createViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?): CompletedLessonItem.ViewHolder {
-        return CompletedLessonItem.ViewHolder(view, adapter)
-    }
-
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>?, holder: CompletedLessonItem.ViewHolder?, position: Int, payloads: MutableList<Any>?) {
-        holder?.apply {
-            completedLessonItemNumber.text = completedLesson.number.toString()
-            completedLessonItemNumber.setTextColor(holder.contentView.context.getThemeAttrColor(
-                if (completedLesson.substitution.isNotEmpty()) R.attr.colorTimetableChange
-                else android.R.attr.textColorPrimary
-            ))
-            completedLessonItemSubject.text = completedLesson.subject
-            completedLessonItemTopic.text = completedLesson.topic
-            completedLessonItemAlert.visibility = if (completedLesson.substitution.isNotEmpty()) VISIBLE else GONE
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as CompletedLessonItem
-
-        if (completedLesson != other.completedLesson) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        return completedLesson.hashCode()
-    }
-
-    class ViewHolder(view: View?, adapter: FlexibleAdapter<IFlexible<*>>?) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View?
-            get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
new file mode 100644
index 000000000..3399a8a23
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsAdapter.kt
@@ -0,0 +1,45 @@
+package io.github.wulkanowy.ui.modules.timetable.completed
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.databinding.ItemCompletedLessonBinding
+import io.github.wulkanowy.utils.getThemeAttrColor
+import javax.inject.Inject
+
+class CompletedLessonsAdapter @Inject constructor() :
+    RecyclerView.Adapter<CompletedLessonsAdapter.ItemViewHolder>() {
+
+    var items = emptyList<CompletedLesson>()
+
+    var onClickListener: (CompletedLesson) -> Unit = {}
+
+    override fun getItemCount() = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder(
+        ItemCompletedLessonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+    )
+
+    override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
+        val item = items[position]
+
+        with(holder.binding) {
+            completedLessonItemNumber.text = item.number.toString()
+            completedLessonItemNumber.setTextColor(root.context.getThemeAttrColor(
+                if (item.substitution.isNotEmpty()) R.attr.colorTimetableChange
+                else android.R.attr.textColorPrimary
+            ))
+            completedLessonItemSubject.text = item.subject
+            completedLessonItemTopic.text = item.topic
+            completedLessonItemAlert.visibility = if (item.substitution.isNotEmpty()) View.VISIBLE else View.GONE
+
+            root.setOnClickListener { onClickListener(item) }
+        }
+    }
+
+    class ItemViewHolder(val binding: ItemCompletedLessonBinding) :
+        RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
index 1d043af3a..767c2f313 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsErrorHandler.kt
@@ -1,15 +1,15 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.content.res.Resources
-import com.readystatesoftware.chuck.api.ChuckCollector
-import io.github.wulkanowy.sdk.exception.FeatureDisabledException
+import com.chuckerteam.chucker.api.ChuckerCollector
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
 import io.github.wulkanowy.ui.base.ErrorHandler
 import javax.inject.Inject
 
 class CompletedLessonsErrorHandler @Inject constructor(
     resources: Resources,
-    chuckCollector: ChuckCollector
-) : ErrorHandler(resources, chuckCollector) {
+    chuckerCollector: ChuckerCollector
+) : ErrorHandler(resources, chuckerCollector) {
 
     var onFeatureDisabled: () -> Unit = {}
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
index 60c16b2dc..5b77fc1f3 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsFragment.kt
@@ -1,36 +1,36 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
 import android.view.View.INVISIBLE
 import android.view.View.VISIBLE
-import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.CompletedLesson
+import io.github.wulkanowy.databinding.FragmentTimetableCompletedBinding
 import io.github.wulkanowy.ui.base.BaseFragment
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
+import io.github.wulkanowy.ui.widgets.DividerItemDecoration
 import io.github.wulkanowy.utils.SchooldaysRangeLimiter
 import io.github.wulkanowy.utils.dpToPx
 import io.github.wulkanowy.utils.getCompatDrawable
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.fragment_timetable_completed.*
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 import javax.inject.Inject
 
-class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.TitledView {
+@AndroidEntryPoint
+class CompletedLessonsFragment :
+    BaseFragment<FragmentTimetableCompletedBinding>(R.layout.fragment_timetable_completed),
+    CompletedLessonsView, MainView.TitledView {
 
     @Inject
     lateinit var presenter: CompletedLessonsPresenter
 
     @Inject
-    lateinit var completedLessonsAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var completedLessonsAdapter: CompletedLessonsAdapter
 
     companion object {
         private const val SAVED_DATE_KEY = "CURRENT_DATE"
@@ -40,88 +40,96 @@ class CompletedLessonsFragment : BaseFragment(), CompletedLessonsView, MainView.
 
     override val titleStringId get() = R.string.completed_lessons_title
 
-    override val isViewEmpty get() = completedLessonsAdapter.isEmpty
+    override val isViewEmpty get() = completedLessonsAdapter.items.isEmpty()
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_timetable_completed, container, false)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        messageContainer = completedLessonsRecycler
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = FragmentTimetableCompletedBinding.bind(view)
+        messageContainer = binding.completedLessonsRecycler
         presenter.onAttachView(this, savedInstanceState?.getLong(SAVED_DATE_KEY))
     }
 
     override fun initView() {
-        completedLessonsAdapter.setOnItemClickListener(presenter::onCompletedLessonsItemSelected)
+        completedLessonsAdapter.onClickListener = presenter::onCompletedLessonsItemSelected
 
-        with(completedLessonsRecycler) {
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+        with(binding.completedLessonsRecycler) {
+            layoutManager = LinearLayoutManager(context)
             adapter = completedLessonsAdapter
+            addItemDecoration(DividerItemDecoration(context))
         }
 
-        completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
-        completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
-        completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
+        with(binding) {
+            completedLessonsSwipe.setOnRefreshListener(presenter::onSwipeRefresh)
+            completedLessonErrorRetry.setOnClickListener { presenter.onRetry() }
+            completedLessonErrorDetails.setOnClickListener { presenter.onDetailsClick() }
 
-        completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
-        completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
-        completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
+            completedLessonsPreviousButton.setOnClickListener { presenter.onPreviousDay() }
+            completedLessonsNavDate.setOnClickListener { presenter.onPickDate() }
+            completedLessonsNextButton.setOnClickListener { presenter.onNextDay() }
 
-        completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+            completedLessonsNavContainer.setElevationCompat(requireContext().dpToPx(8f))
+        }
     }
 
-    override fun updateData(data: List<CompletedLessonItem>) {
-        completedLessonsAdapter.updateDataSet(data, true)
+    override fun updateData(data: List<CompletedLesson>) {
+        with(completedLessonsAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun clearData() {
-        completedLessonsAdapter.clear()
+        with(completedLessonsAdapter) {
+            items = emptyList()
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateNavigationDay(date: String) {
-        completedLessonsNavDate.text = date
+        binding.completedLessonsNavDate.text = date
     }
 
     override fun hideRefresh() {
-        completedLessonsSwipe.isRefreshing = false
+        binding.completedLessonsSwipe.isRefreshing = false
     }
 
     override fun showEmpty(show: Boolean) {
-        completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
+        binding.completedLessonsEmpty.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showErrorView(show: Boolean) {
-        completedLessonError.visibility = if (show) VISIBLE else GONE
+        binding.completedLessonError.visibility = if (show) VISIBLE else GONE
     }
 
     override fun setErrorDetails(message: String) {
-        completedLessonErrorMessage.text = message
+        binding.completedLessonErrorMessage.text = message
     }
 
     override fun showFeatureDisabled() {
-        completedLessonsInfo.text = getString(R.string.error_feature_disabled)
-        completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
+        with(binding) {
+            completedLessonsInfo.text = getString(R.string.error_feature_disabled)
+            completedLessonsInfoImage.setImageDrawable(requireContext().getCompatDrawable(R.drawable.ic_all_close_circle))
+        }
     }
 
     override fun showProgress(show: Boolean) {
-        completedLessonsProgress.visibility = if (show) VISIBLE else GONE
+        binding.completedLessonsProgress.visibility = if (show) VISIBLE else GONE
     }
 
     override fun enableSwipe(enable: Boolean) {
-        completedLessonsSwipe.isEnabled = enable
+        binding.completedLessonsSwipe.isEnabled = enable
     }
 
     override fun showContent(show: Boolean) {
-        completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
+        binding.completedLessonsRecycler.visibility = if (show) VISIBLE else GONE
     }
 
     override fun showPreButton(show: Boolean) {
-        completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.completedLessonsPreviousButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showNextButton(show: Boolean) {
-        completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
+        binding.completedLessonsNextButton.visibility = if (show) VISIBLE else INVISIBLE
     }
 
     override fun showCompletedLessonDialog(completedLesson: CompletedLesson) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
index e2b569508..f1c2cedc6 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsPresenter.kt
@@ -1,34 +1,37 @@
 package io.github.wulkanowy.ui.modules.timetable.completed
 
 import android.annotation.SuppressLint
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.data.repositories.completedlessons.CompletedLessonsRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.afterLoading
+import io.github.wulkanowy.utils.flowWithResourceIn
 import io.github.wulkanowy.utils.getLastSchoolDayIfHoliday
 import io.github.wulkanowy.utils.isHolidays
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDate.ofEpochDay
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
+import java.time.LocalDate
+import java.time.LocalDate.now
+import java.time.LocalDate.ofEpochDay
 import javax.inject.Inject
 
 class CompletedLessonsPresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     studentRepository: StudentRepository,
     private val completedLessonsErrorHandler: CompletedLessonsErrorHandler,
     private val semesterRepository: SemesterRepository,
     private val completedLessonsRepository: CompletedLessonsRepository,
     private val analytics: FirebaseAnalyticsHelper
-) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository, schedulers) {
+) : BasePresenter<CompletedLessonsView>(completedLessonsErrorHandler, studentRepository) {
 
     private var baseDate: LocalDate = now().nextOrSameSchoolDay
 
@@ -44,6 +47,7 @@ class CompletedLessonsPresenter @Inject constructor(
         completedLessonsErrorHandler.showErrorMessage = ::showErrorViewOnError
         completedLessonsErrorHandler.onFeatureDisabled = {
             this.view?.showFeatureDisabled()
+            this.view?.showEmpty(true)
             Timber.i("Completed lessons feature disabled by school")
         }
         loadData(ofEpochDay(date ?: baseDate.toEpochDay()))
@@ -87,61 +91,60 @@ class CompletedLessonsPresenter @Inject constructor(
         view?.showErrorDetailsDialog(lastError)
     }
 
-    fun onCompletedLessonsItemSelected(item: AbstractFlexibleItem<*>?) {
-        if (item is CompletedLessonItem) {
-            Timber.i("Select completed lessons item ${item.completedLesson.id}")
-            view?.showCompletedLessonDialog(item.completedLesson)
-        }
+    fun onCompletedLessonsItemSelected(completedLesson: CompletedLesson) {
+        Timber.i("Select completed lessons item ${completedLesson.id}")
+        view?.showCompletedLessonDialog(completedLesson)
     }
 
     private fun setBaseDateOnHolidays() {
-        disposable.add(studentRepository.getCurrentStudent()
-            .flatMap { semesterRepository.getCurrentSemester(it) }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
-                currentDate = baseDate
-                reloadNavigation()
-            }) {
-                Timber.i("Loading semester result: An exception occurred")
-            })
+        flow {
+            val student = studentRepository.getCurrentStudent()
+            emit(semesterRepository.getCurrentSemester(student))
+        }.catch {
+            Timber.i("Loading semester result: An exception occurred")
+        }.onEach {
+            baseDate = baseDate.getLastSchoolDayIfHoliday(it.schoolYear)
+            currentDate = baseDate
+            reloadNavigation()
+        }.launch("holidays")
     }
 
     private fun loadData(date: LocalDate, forceRefresh: Boolean = false) {
-        Timber.i("Loading completed lessons data started")
         currentDate = date
-        disposable.apply {
-            clear()
-            add(studentRepository.getCurrentStudent()
-                .flatMap { semesterRepository.getCurrentSemester(it) }
-                .delay(200, TimeUnit.MILLISECONDS)
-                .flatMap { completedLessonsRepository.getCompletedLessons(it, currentDate, currentDate, forceRefresh) }
-                .map { items -> items.map { CompletedLessonItem(it) } }
-                .map { items -> items.sortedBy { it.completedLesson.number } }
-                .subscribeOn(schedulers.backgroundThread)
-                .observeOn(schedulers.mainThread)
-                .doFinally {
-                    view?.run {
-                        hideRefresh()
-                        showProgress(false)
-                        enableSwipe(true)
-                    }
-                }
-                .subscribe({
+
+        flowWithResourceIn {
+            val student = studentRepository.getCurrentStudent()
+            val semester = semesterRepository.getCurrentSemester(student)
+            completedLessonsRepository.getCompletedLessons(student, semester, date, date, forceRefresh)
+        }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.i("Loading completed lessons data started")
+                Status.SUCCESS -> {
                     Timber.i("Loading completed lessons lessons result: Success")
                     view?.apply {
-                        updateData(it)
-                        showEmpty(it.isEmpty())
+                        updateData(it.data!!.sortedBy { item -> item.number })
+                        showEmpty(it.data.isEmpty())
                         showErrorView(false)
-                        showContent(it.isNotEmpty())
+                        showContent(it.data.isNotEmpty())
                     }
-                    analytics.logEvent("load_completed_lessons", "items" to it.size, "force_refresh" to forceRefresh)
-                }) {
+                    analytics.logEvent(
+                        "load_data",
+                        "type" to "completed_lessons",
+                        "items" to it.data!!.size
+                    )
+                }
+                Status.ERROR -> {
                     Timber.i("Loading completed lessons result: An exception occurred")
-                    completedLessonsErrorHandler.dispatch(it)
-                })
-        }
+                    completedLessonsErrorHandler.dispatch(it.error!!)
+                }
+            }
+        }.afterLoading {
+            view?.run {
+                hideRefresh()
+                showProgress(false)
+                enableSwipe(true)
+            }
+        }.launch()
     }
 
     private fun showErrorViewOnError(message: String, error: Throwable) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
index a6a327e2d..7e92cc63c 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetable/completed/CompletedLessonsView.kt
@@ -2,7 +2,7 @@ package io.github.wulkanowy.ui.modules.timetable.completed
 
 import io.github.wulkanowy.data.db.entities.CompletedLesson
 import io.github.wulkanowy.ui.base.BaseView
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 interface CompletedLessonsView : BaseView {
 
@@ -10,7 +10,7 @@ interface CompletedLessonsView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<CompletedLessonItem>)
+    fun updateData(data: List<CompletedLesson>)
 
     fun clearData()
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
index 7636637f4..23d1f27ab 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureActivity.kt
@@ -4,36 +4,43 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.appcompat.app.AlertDialog
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.databinding.ActivityWidgetConfigureBinding
 import io.github.wulkanowy.ui.base.BaseActivity
+import io.github.wulkanowy.ui.base.WidgetConfigureAdapter
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.EXTRA_FROM_PROVIDER
-import io.github.wulkanowy.utils.setOnItemClickListener
-import kotlinx.android.synthetic.main.activity_widget_configure.*
+import io.github.wulkanowy.utils.AppInfo
 import javax.inject.Inject
 
-class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePresenter>(),
+@AndroidEntryPoint
+class TimetableWidgetConfigureActivity :
+    BaseActivity<TimetableWidgetConfigurePresenter, ActivityWidgetConfigureBinding>(),
     TimetableWidgetConfigureView {
 
     @Inject
-    lateinit var configureAdapter: FlexibleAdapter<AbstractFlexibleItem<*>>
+    lateinit var configureAdapter: WidgetConfigureAdapter
 
     @Inject
     override lateinit var presenter: TimetableWidgetConfigurePresenter
 
+    @Inject
+    lateinit var appInfo: AppInfo
+
     private var dialog: AlertDialog? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override public fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setResult(RESULT_CANCELED)
-        setContentView(R.layout.activity_widget_configure)
+        setContentView(ActivityWidgetConfigureBinding.inflate(layoutInflater).apply { binding = this }.root)
 
         intent.extras.let {
             presenter.onAttachView(this, it?.getInt(EXTRA_APPWIDGET_ID), it?.getBoolean(EXTRA_FROM_PROVIDER))
@@ -41,19 +48,20 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
     }
 
     override fun initView() {
-        with(widgetConfigureRecycler) {
+        with(binding.widgetConfigureRecycler) {
             adapter = configureAdapter
-            layoutManager = SmoothScrollLinearLayoutManager(context)
+            layoutManager = LinearLayoutManager(context)
         }
 
-        configureAdapter.setOnItemClickListener(presenter::onItemSelect)
+        configureAdapter.onClickListener = presenter::onItemSelect
     }
 
     override fun showThemeDialog() {
-        val items = arrayOf(
+        var items = arrayOf(
             getString(R.string.widget_timetable_theme_light),
             getString(R.string.widget_timetable_theme_dark)
         )
+        if (appInfo.systemVersion >= Build.VERSION_CODES.Q) items += getString(R.string.widget_timetable_theme_system)
 
         dialog = AlertDialog.Builder(this, R.style.WulkanowyTheme_WidgetAccountSwitcher)
             .setTitle(R.string.widget_timetable_theme_title)
@@ -64,8 +72,11 @@ class TimetableWidgetConfigureActivity : BaseActivity<TimetableWidgetConfigurePr
             .show()
     }
 
-    override fun updateData(data: List<TimetableWidgetConfigureItem>) {
-        configureAdapter.updateDataSet(data)
+    override fun updateData(data: List<Pair<Student, Boolean>>) {
+        with(configureAdapter) {
+            items = data
+            notifyDataSetChanged()
+        }
     }
 
     override fun updateTimetableWidget(widgetId: Int) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
deleted file mode 100644
index a3338c684..000000000
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureItem.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.github.wulkanowy.ui.modules.timetablewidget
-
-import android.annotation.SuppressLint
-import android.view.View
-import androidx.core.graphics.ColorUtils
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.davidea.viewholders.FlexibleViewHolder
-import io.github.wulkanowy.R
-import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.utils.getThemeAttrColor
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.item_account.*
-
-class TimetableWidgetConfigureItem(val student: Student, private val isCurrent: Boolean) :
-    AbstractFlexibleItem<TimetableWidgetConfigureItem.ViewHolder>() {
-
-    override fun getLayoutRes() = R.layout.item_account
-
-    override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>) = ViewHolder(view, adapter)
-
-    @SuppressLint("SetTextI18n")
-    override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
-        val context = holder.contentView.context
-
-        val colorImage = if (isCurrent) context.getThemeAttrColor(R.attr.colorPrimary)
-        else ColorUtils.setAlphaComponent(context.getThemeAttrColor(R.attr.colorOnSurface), 153)
-
-        with(holder) {
-            accountItemName.text = "${student.studentName} ${student.className}"
-            accountItemSchool.text = student.schoolName
-            accountItemImage.setColorFilter(colorImage)
-        }
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TimetableWidgetConfigureItem
-
-        if (student != other.student) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = student.hashCode()
-        result = 31 * result + student.id.toInt()
-        return result
-    }
-
-    class ViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter),
-        LayoutContainer {
-
-        override val containerView: View? get() = contentView
-    }
-}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
index e16851083..2274ecb90 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigurePresenter.kt
@@ -1,6 +1,6 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
+import io.github.wulkanowy.data.Status
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.student.StudentRepository
@@ -8,15 +8,16 @@ import io.github.wulkanowy.ui.base.BasePresenter
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.SchedulersProvider
+import io.github.wulkanowy.utils.flowWithResource
+import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
 import javax.inject.Inject
 
 class TimetableWidgetConfigurePresenter @Inject constructor(
-    schedulers: SchedulersProvider,
     errorHandler: ErrorHandler,
     studentRepository: StudentRepository,
     private val sharedPref: SharedPrefProvider
-) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository, schedulers) {
+) : BasePresenter<TimetableWidgetConfigureView>(errorHandler, studentRepository) {
 
     private var appWidgetId: Int? = null
 
@@ -32,13 +33,11 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         loadData()
     }
 
-    fun onItemSelect(item: AbstractFlexibleItem<*>) {
-        if (item is TimetableWidgetConfigureItem) {
-            selectedStudent = item.student
+    fun onItemSelect(student: Student) {
+        selectedStudent = student
 
-            if (isFromProvider) registerStudent(selectedStudent)
-            else view?.showThemeDialog()
-        }
+        if (isFromProvider) registerStudent(selectedStudent)
+        else view?.showThemeDialog()
     }
 
     fun onThemeSelect(index: Int) {
@@ -48,28 +47,30 @@ class TimetableWidgetConfigurePresenter @Inject constructor(
         registerStudent(selectedStudent)
     }
 
-    fun onDismissThemeView(){
+    fun onDismissThemeView() {
         view?.finishView()
     }
 
     private fun loadData() {
-        disposable.add(studentRepository.getSavedStudents(false)
-            .map { it to appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) } }
-            .map { (students, currentStudentId) ->
-                students.map { student -> TimetableWidgetConfigureItem(student, student.id == currentStudentId) }
-            }
-            .subscribeOn(schedulers.backgroundThread)
-            .observeOn(schedulers.mainThread)
-            .subscribe({
-                when {
-                    it.isEmpty() -> view?.openLoginView()
-                    it.size == 1 && !isFromProvider -> {
-                        selectedStudent = it.single().student
-                        view?.showThemeDialog()
+        flowWithResource { studentRepository.getSavedStudents(false) }.onEach {
+            when (it.status) {
+                Status.LOADING -> Timber.d("Timetable widget configure students data load")
+                Status.SUCCESS -> {
+                    val widgetId = appWidgetId?.let { id -> sharedPref.getLong(getStudentWidgetKey(id), 0) }
+                    when {
+                        it.data!!.isEmpty() -> view?.openLoginView()
+                        it.data.size == 1 && !isFromProvider -> {
+                            selectedStudent = it.data.single().student
+                            view?.showThemeDialog()
+                        }
+                        else -> view?.updateData(it.data.map { entity ->
+                            entity.student to (entity.student.id == widgetId)
+                        })
                     }
-                    else -> view?.updateData(it)
                 }
-            }, { errorHandler.dispatch(it) }))
+                Status.ERROR -> errorHandler.dispatch(it.error!!)
+            }
+        }.launch()
     }
 
     private fun registerStudent(student: Student?) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
index 7cac892d9..056225ab5 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetConfigureView.kt
@@ -1,12 +1,13 @@
 package io.github.wulkanowy.ui.modules.timetablewidget
 
+import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.ui.base.BaseView
 
 interface TimetableWidgetConfigureView : BaseView {
 
     fun initView()
 
-    fun updateData(data: List<TimetableWidgetConfigureItem>)
+    fun updateData(data: List<Pair<Student, Boolean>>)
 
     fun updateTimetableWidget(widgetId: Int)
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
index fa989749a..c7b4d4a84 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetFactory.kt
@@ -14,32 +14,33 @@ import android.widget.RemoteViewsService
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.data.repositories.timetable.TimetableRepository
+import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getCurrentThemeWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getDateWidgetKey
 import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getStudentWidgetKey
-import io.github.wulkanowy.ui.modules.timetablewidget.TimetableWidgetProvider.Companion.getThemeWidgetKey
-import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.getCompatColor
+import io.github.wulkanowy.utils.toFirstResult
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
+import kotlinx.coroutines.runBlocking
 import timber.log.Timber
+import java.time.LocalDate
 
 class TimetableWidgetFactory(
     private val timetableRepository: TimetableRepository,
     private val studentRepository: StudentRepository,
     private val semesterRepository: SemesterRepository,
+    private val prefRepository: PreferencesRepository,
     private val sharedPref: SharedPrefProvider,
-    private val schedulers: SchedulersProvider,
     private val context: Context,
     private val intent: Intent?
 ) : RemoteViewsService.RemoteViewsFactory {
 
     private var lessons = emptyList<Timetable>()
 
-    private var layoutId: Int? = null
+    private var savedCurrentTheme: Long? = null
 
     private var primaryColor: Int? = null
 
@@ -53,7 +54,7 @@ class TimetableWidgetFactory(
 
     override fun getCount() = lessons.size
 
-    override fun getViewTypeCount() = 1
+    override fun getViewTypeCount() = 2
 
     override fun getItemId(position: Int) = position.toLong()
 
@@ -67,49 +68,60 @@ class TimetableWidgetFactory(
             val studentId = sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0)
 
             updateTheme(appWidgetId)
-
-            updateLessons(date, studentId)
+            lessons = getLessons(date, studentId)
         }
     }
 
     private fun updateTheme(appWidgetId: Int) {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        layoutId = if (savedTheme == 0L) R.layout.item_widget_timetable else R.layout.item_widget_timetable_dark
+        savedCurrentTheme = sharedPref.getLong(getCurrentThemeWidgetKey(appWidgetId), 0)
 
-        primaryColor = if (savedTheme == 0L) R.color.colorPrimary else R.color.colorPrimaryLight
-        textColor = if (savedTheme == 0L) android.R.color.black else android.R.color.white
-        timetableChangeColor = if (savedTheme == 0L) R.color.timetable_change_dark else R.color.timetable_change_light
+        if (savedCurrentTheme == 0L) {
+            primaryColor = R.color.colorPrimary
+            textColor = android.R.color.black
+            timetableChangeColor = R.color.timetable_change_dark
+        } else {
+            primaryColor = R.color.colorPrimaryLight
+            textColor = android.R.color.white
+            timetableChangeColor = R.color.timetable_change_light
+        }
     }
 
-    private fun updateLessons(date: LocalDate, studentId: Long) {
-        lessons = try {
-            studentRepository.isStudentSaved()
-                .filter { true }
-                .flatMap { studentRepository.getSavedStudents().toMaybe() }
-                .flatMap {
-                    val student = it.singleOrNull { student -> student.id == studentId }
-
-                    if (student != null) Maybe.just(student)
-                    else Maybe.empty()
-                }
-                .flatMap { semesterRepository.getCurrentSemester(it).toMaybe() }
-                .flatMap { timetableRepository.getTimetable(it, date, date).toMaybe() }
-                .map { item -> item.sortedBy { it.number } }
-                .subscribeOn(schedulers.backgroundThread)
-                .blockingGet(emptyList())
-        } catch (e: Exception) {
-            Timber.e(e, "An error has occurred in timetable widget factory")
-            emptyList()
+    private fun getItemLayout(lesson: Timetable): Int {
+        return when {
+            prefRepository.showWholeClassPlan == "small" && !lesson.isStudentPlan -> {
+                if (savedCurrentTheme == 0L) R.layout.item_widget_timetable_small
+                else R.layout.item_widget_timetable_small_dark
+            }
+            savedCurrentTheme == 1L -> R.layout.item_widget_timetable_dark
+            else -> R.layout.item_widget_timetable
         }
     }
 
+    private fun getLessons(date: LocalDate, studentId: Long) = try {
+        runBlocking {
+            if (!studentRepository.isStudentSaved()) return@runBlocking emptyList<Timetable>()
+
+            val students = studentRepository.getSavedStudents()
+            val student = students.singleOrNull { it.student.id == studentId }?.student
+                ?: return@runBlocking emptyList<Timetable>()
+
+            val semester = semesterRepository.getCurrentSemester(student)
+            timetableRepository.getTimetable(student, semester, date, date, false)
+                .toFirstResult().data.orEmpty()
+                .sortedWith(compareBy({ it.number }, { !it.isStudentPlan }))
+                .filter { if (prefRepository.showWholeClassPlan == "no") it.isStudentPlan else true }
+        }
+    } catch (e: Exception) {
+        Timber.e(e, "An error has occurred in timetable widget factory")
+        emptyList<Timetable>()
+    }
+
     @SuppressLint("DefaultLocale")
     override fun getViewAt(position: Int): RemoteViews? {
         if (position == INVALID_POSITION || lessons.getOrNull(position) == null) return null
 
-        return RemoteViews(context.packageName, layoutId!!).apply {
-            val lesson = lessons[position]
-
+        val lesson = lessons[position]
+        return RemoteViews(context.packageName, getItemLayout(lesson)).apply {
             setTextViewText(R.id.timetableWidgetItemSubject, lesson.subject)
             setTextViewText(R.id.timetableWidgetItemNumber, lesson.number.toString())
             setTextViewText(R.id.timetableWidgetItemTimeStart, lesson.start.toFormattedString("HH:mm"))
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
index 62192a1b0..60ad9d5cc 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/timetablewidget/TimetableWidgetProvider.kt
@@ -8,34 +8,36 @@ import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_DELETED
 import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
 import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
 import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.res.Configuration
 import android.widget.RemoteViews
-import dagger.android.AndroidInjection
+import dagger.hilt.android.AndroidEntryPoint
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.SharedPrefProvider
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.exceptions.NoCurrentStudentException
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.github.wulkanowy.services.HiltBroadcastReceiver
 import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainView
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.github.wulkanowy.utils.SchedulersProvider
 import io.github.wulkanowy.utils.nextOrSameSchoolDay
 import io.github.wulkanowy.utils.nextSchoolDay
 import io.github.wulkanowy.utils.previousSchoolDay
 import io.github.wulkanowy.utils.toFormattedString
-import io.reactivex.Maybe
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.now
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
+import java.time.LocalDate
+import java.time.LocalDate.now
 import javax.inject.Inject
 
-class TimetableWidgetProvider : BroadcastReceiver() {
+@AndroidEntryPoint
+class TimetableWidgetProvider : HiltBroadcastReceiver() {
 
     @Inject
     lateinit var appWidgetManager: AppWidgetManager
@@ -46,9 +48,6 @@ class TimetableWidgetProvider : BroadcastReceiver() {
     @Inject
     lateinit var sharedPref: SharedPrefProvider
 
-    @Inject
-    lateinit var schedulers: SchedulersProvider
-
     @Inject
     lateinit var analytics: FirebaseAnalyticsHelper
 
@@ -71,17 +70,21 @@ class TimetableWidgetProvider : BroadcastReceiver() {
         fun getStudentWidgetKey(appWidgetId: Int) = "timetable_widget_student_$appWidgetId"
 
         fun getThemeWidgetKey(appWidgetId: Int) = "timetable_widget_theme_$appWidgetId"
+
+        fun getCurrentThemeWidgetKey(appWidgetId: Int) = "timetable_widget_current_theme_$appWidgetId"
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-        AndroidInjection.inject(this, context)
-        when (intent.action) {
-            ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
-            ACTION_APPWIDGET_DELETED -> onDelete(intent)
+        super.onReceive(context, intent)
+        GlobalScope.launch {
+            when (intent.action) {
+                ACTION_APPWIDGET_UPDATE -> onUpdate(context, intent)
+                ACTION_APPWIDGET_DELETED -> onDelete(intent)
+            }
         }
     }
 
-    private fun onUpdate(context: Context, intent: Intent) {
+    private suspend fun onUpdate(context: Context, intent: Intent) {
         if (intent.getStringExtra(EXTRA_BUTTON_TYPE) === null) {
             intent.getIntArrayExtra(EXTRA_APPWIDGET_IDS)?.forEach { appWidgetId ->
                 val student = getStudent(sharedPref.getLong(getStudentWidgetKey(appWidgetId), 0), appWidgetId)
@@ -110,14 +113,23 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             with(sharedPref) {
                 delete(getStudentWidgetKey(appWidgetId))
                 delete(getDateWidgetKey(appWidgetId))
+                delete(getThemeWidgetKey(appWidgetId))
+                delete(getCurrentThemeWidgetKey(appWidgetId))
             }
         }
     }
 
     @SuppressLint("DefaultLocale")
     private fun updateWidget(context: Context, appWidgetId: Int, date: LocalDate, student: Student?) {
-        val savedTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
-        val layoutId = if (savedTheme == 0L) R.layout.widget_timetable else R.layout.widget_timetable_dark
+        val savedConfigureTheme = sharedPref.getLong(getThemeWidgetKey(appWidgetId), 0)
+        val isSystemDarkMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+        var currentTheme = 0L
+        var layoutId = R.layout.widget_timetable
+
+        if (savedConfigureTheme == 1L || (savedConfigureTheme == 2L && isSystemDarkMode)) {
+            currentTheme = 1L
+            layoutId = R.layout.widget_timetable_dark
+        }
 
         val nextNavIntent = createNavIntent(context, appWidgetId, appWidgetId, BUTTON_NEXT)
         val prevNavIntent = createNavIntent(context, -appWidgetId, appWidgetId, BUTTON_PREV)
@@ -150,10 +162,15 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             setPendingIntentTemplate(R.id.timetableWidgetList, appIntent)
         }
 
-        sharedPref.putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+        with(sharedPref) {
+            putLong(getCurrentThemeWidgetKey(appWidgetId), currentTheme)
+            putLong(getDateWidgetKey(appWidgetId), date.toEpochDay(), true)
+        }
+
         with(appWidgetManager) {
-            notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
             updateAppWidget(appWidgetId, remoteView)
+            notifyAppWidgetViewDataChanged(appWidgetId, R.id.timetableWidgetList)
+            Timber.d("TimetableWidgetProvider updated")
         }
     }
 
@@ -166,31 +183,22 @@ class TimetableWidgetProvider : BroadcastReceiver() {
             }, FLAG_UPDATE_CURRENT)
     }
 
-    private fun getStudent(studentId: Long, appWidgetId: Int): Student? {
-        return try {
-            studentRepository.isStudentSaved()
-                .filter { true }
-                .flatMap { studentRepository.getSavedStudents(false).toMaybe() }
-                .flatMap { students ->
-                    val student = students.singleOrNull { student -> student.id == studentId }
-                    when {
-                        student != null -> Maybe.just(student)
-                        studentId != 0L -> {
-                            studentRepository.isCurrentStudentSet()
-                                .filter { true }
-                                .flatMap { studentRepository.getCurrentStudent(false).toMaybe() }
-                                .doOnSuccess { sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id) }
-                        }
-                        else -> Maybe.empty()
-                    }
+    private suspend fun getStudent(studentId: Long, appWidgetId: Int) = try {
+        val students = studentRepository.getSavedStudents(false)
+        val student = students.singleOrNull { it -> it.student.id == studentId }?.student
+        when {
+            student != null -> student
+            studentId != 0L && studentRepository.isCurrentStudentSet() -> {
+                studentRepository.getCurrentStudent(false).also {
+                    sharedPref.putLong(getStudentWidgetKey(appWidgetId), it.id)
                 }
-                .subscribeOn(schedulers.backgroundThread)
-                .blockingGet()
-        } catch (e: Exception) {
-            if (e.cause !is NoCurrentStudentException) {
-                Timber.e(e, "An error has occurred in timetable widget provider")
             }
-            null
+            else -> null
         }
+    } catch (e: Exception) {
+        if (e.cause !is NoCurrentStudentException) {
+            Timber.e(e, "An error has occurred in timetable widget provider")
+        }
+        null
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
new file mode 100644
index 000000000..b0b6999eb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/DividerItemDecoration.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.ui.widgets
+
+import android.content.Context
+import android.graphics.Canvas
+import android.view.View
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+
+class DividerItemDecoration(context: Context) : DividerItemDecoration(context, VERTICAL) {
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        canvas.save()
+        val dividerLeft = parent.paddingLeft
+        val dividerRight = parent.width - parent.paddingRight
+        val childCount = parent.childCount
+
+        for (i in 0..childCount - 2) {
+            val child: View = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+            val dividerTop: Int = child.bottom + params.bottomMargin
+            val dividerBottom = dividerTop + drawable!!.intrinsicHeight
+            drawable?.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom)
+            drawable?.draw(canvas)
+        }
+        canvas.restore()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
index a444da6fe..1098a9a06 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AppInfo.kt
@@ -4,16 +4,14 @@ import android.content.res.Resources
 import android.os.Build.MANUFACTURER
 import android.os.Build.MODEL
 import android.os.Build.VERSION.SDK_INT
-import io.github.wulkanowy.BuildConfig.CRASHLYTICS_ENABLED
 import io.github.wulkanowy.BuildConfig.DEBUG
 import io.github.wulkanowy.BuildConfig.VERSION_CODE
 import io.github.wulkanowy.BuildConfig.VERSION_NAME
+import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-open class AppInfo {
-
-    open val isCrashlyticsEnabled get() = CRASHLYTICS_ENABLED
+open class AppInfo @Inject constructor() {
 
     open val isDebug get() = DEBUG
 
diff --git a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
index c2b1efaa8..f10b00a07 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/AttendanceExtension.kt
@@ -1,6 +1,9 @@
 package io.github.wulkanowy.utils
 
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.entities.Attendance
 import io.github.wulkanowy.data.db.entities.AttendanceSummary
+import io.github.wulkanowy.sdk.scrapper.attendance.AttendanceCategory
 
 /**
  * [UONET+ - Zasady tworzenia podsumowań liczb uczniów obecnych i nieobecnych w tabeli frekwencji]
@@ -23,4 +26,15 @@ private fun calculatePercentage(presence: Double, absence: Double): Double {
     return if ((presence + absence) == 0.0) 0.0 else (presence / (presence + absence)) * 100
 }
 
-
+inline val Attendance.description
+    get() = when (AttendanceCategory.getCategoryByName(name)) {
+        AttendanceCategory.PRESENCE -> R.string.attendance_present
+        AttendanceCategory.ABSENCE_UNEXCUSED -> R.string.attendance_absence_unexcused
+        AttendanceCategory.ABSENCE_EXCUSED -> R.string.attendance_absence_excused
+        AttendanceCategory.UNEXCUSED_LATENESS -> R.string.attendance_unexcused_lateness
+        AttendanceCategory.EXCUSED_LATENESS -> R.string.attendance_excused_lateness
+        AttendanceCategory.ABSENCE_FOR_SCHOOL_REASONS -> R.string.attendance_absence_school
+        AttendanceCategory.EXEMPTION -> R.string.attendance_exemption
+        AttendanceCategory.DELETED -> R.string.attendance_deleted
+        else -> R.string.attendance_unknown
+    }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
index a265378e2..cf715e657 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/ContextExtension.kt
@@ -9,6 +9,8 @@ import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
+import io.github.wulkanowy.BuildConfig.APPLICATION_ID
 
 @ColorInt
 fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
@@ -20,6 +22,11 @@ fun Context.getThemeAttrColor(@AttrRes colorAttr: Int): Int {
     }
 }
 
+@ColorInt
+fun Context.getThemeAttrColor(@AttrRes colorAttr: Int, alpha: Int): Int {
+    return ColorUtils.setAlphaComponent(getThemeAttrColor(colorAttr), alpha)
+}
+
 @ColorInt
 fun Context.getCompatColor(@ColorRes colorRes: Int) = ContextCompat.getColor(this, colorRes)
 
@@ -32,12 +39,22 @@ fun Context.openInternetBrowser(uri: String, onActivityNotFound: (uri: String) -
     }
 }
 
-fun Context.openEmailClient(chooserTitle: String, email: String, subject: String?, body: String?) {
-    val emailIntent = Intent(Intent.ACTION_SENDTO, Uri.fromParts("mailto", email, null))
-    emailIntent.putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
-    if (subject != null) emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
-    if (body != null) emailIntent.putExtra(Intent.EXTRA_TEXT, body)
-    startActivity(Intent.createChooser(emailIntent, chooserTitle))
+fun Context.openAppInMarket(onActivityNotFound: (uri: String) -> Unit) {
+    openInternetBrowser("market://details?id=${APPLICATION_ID}") {
+        openInternetBrowser("https://github.com/wulkanowy/wulkanowy/releases", onActivityNotFound)
+    }
+}
+
+fun Context.openEmailClient(chooserTitle: String, email: String, subject: String, body: String, onActivityNotFound: () -> Unit = {}) {
+    val intent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:")).apply {
+        putExtra(Intent.EXTRA_EMAIL, arrayOf(email))
+        putExtra(Intent.EXTRA_SUBJECT, subject)
+        putExtra(Intent.EXTRA_TEXT, body)
+    }
+
+    if (intent.resolveActivity(packageManager) != null) {
+        startActivity(Intent.createChooser(intent, chooserTitle))
+    } else onActivityNotFound()
 }
 
 fun Context.openNavigation(location: String) {
@@ -54,4 +71,17 @@ fun Context.openDialer(phone: String) {
     startActivity(intent)
 }
 
+fun Context.shareText(text: String, subject: String?) {
+    val sendIntent: Intent = Intent().apply {
+        action = Intent.ACTION_SEND
+        putExtra(Intent.EXTRA_TEXT, text)
+        if (subject != null) {
+            putExtra(Intent.EXTRA_SUBJECT, subject)
+        }
+        type = "text/plain"
+    }
+    val shareIntent = Intent.createChooser(sendIntent, null)
+    startActivity(shareIntent)
+}
+
 fun Context.dpToPx(dp: Float) = dp * resources.displayMetrics.densityDpi / DENSITY_DEFAULT
diff --git a/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
new file mode 100644
index 000000000..ecc8e05eb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/DispatchersProvider.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.utils
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+open class DispatchersProvider {
+
+    open val backgroundThread: CoroutineDispatcher
+        get() = Dispatchers.IO
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
new file mode 100644
index 000000000..58c93729b
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/EditTextExtension.kt
@@ -0,0 +1,10 @@
+package io.github.wulkanowy.utils
+
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+
+fun EditText.setOnEditorDoneSignIn(callback: () -> Boolean) {
+    setOnEditorActionListener { _, id, _ ->
+        if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) callback() else false
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
deleted file mode 100644
index bd6867a38..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/FlexibleAdapterExtension.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.github.wulkanowy.utils
-
-import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
-
-inline fun FlexibleAdapter<*>.setOnItemClickListener(crossinline listener: (item: AbstractFlexibleItem<*>) -> Unit) {
-    addListener(FlexibleAdapter.OnItemClickListener { _, position ->
-        listener(getItem(position) as AbstractFlexibleItem<*>)
-        true
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
new file mode 100644
index 000000000..724458c04
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/FlowUtils.kt
@@ -0,0 +1,98 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.Resource
+import io.github.wulkanowy.data.Status
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.takeWhile
+
+inline fun <ResultType, RequestType> networkBoundResource(
+    showSavedOnLoading: Boolean = true,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline filterResult: (ResultType) -> ResultType = { it }
+) = flow {
+    emit(Resource.loading())
+
+    val data = query().first()
+    emitAll(if (shouldFetch(data)) {
+        if (showSavedOnLoading) emit(Resource.loading(filterResult(data)))
+
+        try {
+            saveFetchResult(data, fetch(data))
+            query().map { Resource.success(filterResult(it)) }
+        } catch (throwable: Throwable) {
+            onFetchFailed(throwable)
+            query().map { Resource.error(throwable, filterResult(it)) }
+        }
+    } else {
+        query().map { Resource.success(filterResult(it)) }
+    })
+}
+
+@JvmName("networkBoundResourceWithMap")
+inline fun <ResultType, RequestType, T> networkBoundResource(
+    showSavedOnLoading: Boolean = true,
+    crossinline query: () -> Flow<ResultType>,
+    crossinline fetch: suspend (ResultType) -> RequestType,
+    crossinline saveFetchResult: suspend (old: ResultType, new: RequestType) -> Unit,
+    crossinline onFetchFailed: (Throwable) -> Unit = { Unit },
+    crossinline shouldFetch: (ResultType) -> Boolean = { true },
+    crossinline mapResult: (ResultType) -> T
+) = flow {
+    emit(Resource.loading())
+
+    val data = query().first()
+    emitAll(if (shouldFetch(data)) {
+        if (showSavedOnLoading) emit(Resource.loading(mapResult(data)))
+
+        try {
+            saveFetchResult(data, fetch(data))
+            query().map { Resource.success(mapResult(it)) }
+        } catch (throwable: Throwable) {
+            onFetchFailed(throwable)
+            query().map { Resource.error(throwable, mapResult(it)) }
+        }
+    } else {
+        query().map { Resource.success(mapResult(it)) }
+    })
+}
+
+fun <T> flowWithResource(block: suspend () -> T) = flow {
+    emit(Resource.loading())
+    emit(try {
+        Resource.success(block())
+    } catch (e: Throwable) {
+        Resource.error(e)
+    })
+}
+
+fun <T> flowWithResourceIn(block: suspend () -> Flow<Resource<T>>) = flow {
+    emit(Resource.loading())
+
+    block()
+        .catch { emit(Resource.error(it)) }
+        .collect {
+            if (it.status != Status.LOADING) { // LOADING is already emitted
+                emit(it)
+            }
+        }
+}
+
+fun <T> Flow<Resource<T>>.afterLoading(callback: () -> Unit) = onEach {
+    if (it.status != Status.LOADING) callback()
+}
+
+suspend fun <T> Flow<Resource<T>>.toFirstResult() = filter { it.status != Status.LOADING }.first()
+
+suspend fun <T> Flow<Resource<T>>.waitForResult() = takeWhile { it.status == Status.LOADING }.collect()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
index 9cec331f8..9dc1e18a0 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/FragNavControlerExtension.kt
@@ -4,14 +4,14 @@ import androidx.fragment.app.Fragment
 import com.ncapdevi.fragnav.FragNavController
 import io.github.wulkanowy.ui.modules.main.MainView
 
-inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?) -> Unit) {
+inline fun FragNavController.setOnViewChangeListener(crossinline listener: (section: MainView.Section?, name: String?) -> Unit) {
     transactionListener = object : FragNavController.TransactionListener {
         override fun onFragmentTransaction(fragment: Fragment?, transactionType: FragNavController.TransactionType) {
-            listener(fragment?.toSection())
+            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
         }
 
         override fun onTabTransaction(fragment: Fragment?, index: Int) {
-            listener(fragment?.toSection())
+            listener(fragment?.toSection(), fragment?.let { it::class.java.simpleName })
         }
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
index c1e182ba2..c57b62470 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/GradeExtension.kt
@@ -24,14 +24,7 @@ fun List<GradeSummary>.calcAverage(): Double {
 
 fun Grade.getBackgroundColor(theme: String): Int {
     return when (theme) {
-        "grade_color" -> when (color) {
-            "000000" -> R.color.grade_black
-            "F04C4C" -> R.color.grade_red
-            "20A4F7" -> R.color.grade_blue
-            "6ECD07" -> R.color.grade_green
-            "B16CF1" -> R.color.grade_purple
-            else -> R.color.grade_material_default
-        }
+        "grade_color" -> getGradeColor()
         "material" -> when (value.toInt()) {
             6 -> R.color.grade_material_six
             5 -> R.color.grade_material_five
@@ -53,6 +46,17 @@ fun Grade.getBackgroundColor(theme: String): Int {
     }
 }
 
+fun Grade.getGradeColor(): Int {
+    return when (color) {
+        "000000" -> R.color.grade_black
+        "F04C4C" -> R.color.grade_red
+        "20A4F7" -> R.color.grade_blue
+        "6ECD07" -> R.color.grade_green
+        "B16CF1" -> R.color.grade_purple
+        else -> R.color.grade_material_default
+    }
+}
+
 inline val Grade.colorStringId: Int
     get() {
         return when (color) {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
new file mode 100644
index 000000000..b96faeb21
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/LifecycleAwareVariable.kt
@@ -0,0 +1,55 @@
+package io.github.wulkanowy.utils
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+class LifecycleAwareVariable<T : Any> : ReadWriteProperty<Fragment, T>, LifecycleObserver {
+
+    private var _value: T? = null
+
+    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
+        thisRef.viewLifecycleOwner.lifecycle.removeObserver(this)
+        _value = value
+        thisRef.viewLifecycleOwner.lifecycle.addObserver(this)
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>) = _value
+        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
+
+    @Suppress("unused")
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun onDestroyView() {
+        _value = null
+    }
+}
+
+class LifecycleAwareVariableActivity<T : Any> : ReadWriteProperty<AppCompatActivity, T>, LifecycleObserver {
+
+    private var _value: T? = null
+
+    override fun setValue(thisRef: AppCompatActivity, property: KProperty<*>, value: T) {
+        thisRef.lifecycle.removeObserver(this)
+        _value = value
+        thisRef.lifecycle.addObserver(this)
+    }
+
+    override fun getValue(thisRef: AppCompatActivity, property: KProperty<*>) = _value
+        ?: throw IllegalStateException("Trying to call an lifecycle-aware value outside of the view lifecycle, or the value has not been initialized")
+
+    @Suppress("unused")
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    fun onDestroyView() {
+        _value = null
+    }
+}
+
+
+@Suppress("unused")
+fun <T : Any> Fragment.lifecycleAwareVariable() = LifecycleAwareVariable<T>()
+
+fun <T : Any> lifecycleAwareVariable() = LifecycleAwareVariableActivity<T>()
diff --git a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
index f9db04653..48d46892b 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/LoggerUtils.kt
@@ -18,34 +18,36 @@ class DebugLogTree : Timber.DebugTree() {
     }
 }
 
+private fun Bundle?.checkSavedState() = if (this == null) "(STATE IS NULL)" else "(STATE IS NOT NULL)"
+
 class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 
-    override fun onActivityPaused(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} PAUSED") }
+    override fun onActivityPaused(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} PAUSED")
     }
 
-    override fun onActivityResumed(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} RESUMED") }
+    override fun onActivityResumed(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} RESUMED")
     }
 
-    override fun onActivityStarted(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} STARTED") }
+    override fun onActivityStarted(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} STARTED")
     }
 
-    override fun onActivityDestroyed(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} DESTROYED") }
+    override fun onActivityDestroyed(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} DESTROYED")
     }
 
-    override fun onActivitySaveInstanceState(activity: Activity?, outState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} SAVED INSTANCE STATE") }
+    override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        Timber.d("${activity::class.java.simpleName} SAVED INSTANCE STATE")
     }
 
-    override fun onActivityStopped(activity: Activity?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} STOPPED") }
+    override fun onActivityStopped(activity: Activity) {
+        Timber.d("${activity::class.java.simpleName} STOPPED")
     }
 
-    override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        activity?.let { Timber.d("${it::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}") }
+    override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        Timber.d("${activity::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
     }
 }
 
@@ -53,7 +55,7 @@ class ActivityLifecycleLogger : Application.ActivityLifecycleCallbacks {
 class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLifecycleCallbacks() {
 
     override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} VIEW CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} VIEW CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentStopped(fm: FragmentManager, f: Fragment) {
@@ -61,7 +63,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
@@ -89,7 +91,7 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
     }
 
     override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${checkSavedState(savedInstanceState)}")
+        Timber.d("${f::class.java.simpleName} ACTIVITY CREATED ${savedInstanceState.checkSavedState()}")
     }
 
     override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
@@ -100,5 +102,3 @@ class FragmentLifecycleLogger @Inject constructor() : FragmentManager.FragmentLi
         Timber.d("${f::class.java.simpleName} DETACHED")
     }
 }
-
-private fun checkSavedState(savedInstanceState: Bundle?) = if (savedInstanceState == null) "(STATE IS NULL)" else ""
diff --git a/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
new file mode 100644
index 000000000..da5fd3dbb
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/ResourcesExtension.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.utils
+
+import android.content.res.Resources
+import io.github.wulkanowy.R
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import io.github.wulkanowy.sdk.scrapper.exception.ScrapperException
+import io.github.wulkanowy.sdk.scrapper.exception.ServiceUnavailableException
+import io.github.wulkanowy.sdk.scrapper.exception.VulcanException
+import io.github.wulkanowy.sdk.scrapper.login.NotLoggedInException
+import io.github.wulkanowy.sdk.scrapper.login.PasswordChangeRequiredException
+import okhttp3.internal.http2.StreamResetException
+import java.io.InterruptedIOException
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+fun Resources.getString(error: Throwable) = when (error) {
+    is UnknownHostException -> getString(R.string.error_no_internet)
+    is SocketTimeoutException, is InterruptedIOException, is ConnectException, is StreamResetException -> getString(R.string.error_timeout)
+    is NotLoggedInException -> getString(R.string.error_login_failed)
+    is PasswordChangeRequiredException -> getString(R.string.error_password_change_required)
+    is ServiceUnavailableException -> getString(R.string.error_service_unavailable)
+    is FeatureDisabledException -> getString(R.string.error_feature_disabled)
+    is FeatureNotAvailableException -> getString(R.string.error_feature_not_available)
+    is VulcanException -> getString(R.string.error_unknown_uonet)
+    is ScrapperException -> getString(R.string.error_unknown_app)
+    else -> getString(R.string.error_unknown)
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt b/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
deleted file mode 100644
index e426d4d5d..000000000
--- a/app/src/main/java/io/github/wulkanowy/utils/SchedulersProvider.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.wulkanowy.utils
-
-import io.reactivex.Scheduler
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
-
-open class SchedulersProvider {
-
-    open val mainThread: Scheduler
-        get() = AndroidSchedulers.mainThread()
-
-    open val backgroundThread: Scheduler
-        get() = Schedulers.io()
-}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
index 922aafbd8..e7c51745c 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/SchooldaysRangeLimiter.kt
@@ -3,8 +3,8 @@ package io.github.wulkanowy.utils
 import android.os.Parcel
 import android.os.Parcelable
 import com.wdullaer.materialdatetimepicker.date.DateRangeLimiter
-import org.threeten.bp.DayOfWeek
-import org.threeten.bp.LocalDate
+import java.time.DayOfWeek
+import java.time.LocalDate
 import java.util.Calendar
 
 @Suppress("UNUSED_PARAMETER")
@@ -17,7 +17,7 @@ class SchooldaysRangeLimiter : DateRangeLimiter {
     override fun isOutOfRange(year: Int, month: Int, day: Int): Boolean {
         val date = LocalDate.of(year, month + 1, day)
         val dayOfWeek = date.dayOfWeek
-        return dayOfWeek == DayOfWeek.SUNDAY || dayOfWeek == DayOfWeek.SATURDAY || date.isHolidays
+        return dayOfWeek == DayOfWeek.SUNDAY || date.isHolidays
     }
 
     override fun getStartDate(): Calendar {
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
new file mode 100644
index 000000000..63a30db8c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SdkExtension.kt
@@ -0,0 +1,31 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.sdk.Sdk
+import timber.log.Timber
+
+fun Sdk.init(student: Student): Sdk {
+    email = student.email
+    password = student.password
+    symbol = student.symbol
+    schoolSymbol = student.schoolSymbol
+    studentId = student.studentId
+    classId = student.classId
+
+    if (Sdk.Mode.valueOf(student.loginMode) != Sdk.Mode.API) {
+        scrapperBaseUrl = student.scrapperBaseUrl
+        loginType = Sdk.ScrapperLoginType.valueOf(student.loginType)
+    }
+    loginId = student.userLoginId
+
+    mode = Sdk.Mode.valueOf(student.loginMode)
+    mobileBaseUrl = student.mobileBaseUrl
+    certKey = student.certificateKey
+    privateKey = student.privateKey
+
+    emptyCookieJarInterceptor = true
+
+    Timber.d("Sdk in ${student.loginMode} mode reinitialized")
+
+    return this
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
new file mode 100644
index 000000000..6e11a8b2c
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/SemesterExtension.kt
@@ -0,0 +1,19 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Semester
+import java.time.LocalDate.now
+
+inline val Semester.isCurrent: Boolean
+    get() = now() in start..end
+
+fun List<Semester>.getCurrentOrLast(): Semester {
+    if (isEmpty()) throw RuntimeException("Empty semester list")
+
+    // when there is only one current semester
+    singleOrNull { it.isCurrent }?.let { return it }
+
+    // when there is more than one current semester - find one with higher id
+    singleOrNull { semester -> semester.semesterId == maxByOrNull { it.semesterId }?.semesterId }?.let { return it }
+
+    throw IllegalArgumentException("Duplicated last semester! Semesters: ${joinToString(separator = "\n")}")
+}
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
index a2672f865..9bd30e878 100644
--- a/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimeExtension.kt
@@ -1,44 +1,39 @@
 package io.github.wulkanowy.utils
 
-import org.threeten.bp.DateTimeUtils
-import org.threeten.bp.DayOfWeek.FRIDAY
-import org.threeten.bp.DayOfWeek.MONDAY
-import org.threeten.bp.DayOfWeek.SATURDAY
-import org.threeten.bp.DayOfWeek.SUNDAY
-import org.threeten.bp.Instant
-import org.threeten.bp.Instant.ofEpochMilli
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.Month
-import org.threeten.bp.ZoneId
-import org.threeten.bp.format.DateTimeFormatter.ofPattern
-import org.threeten.bp.format.TextStyle.FULL_STANDALONE
-import org.threeten.bp.temporal.TemporalAdjusters.firstInMonth
-import org.threeten.bp.temporal.TemporalAdjusters.next
-import org.threeten.bp.temporal.TemporalAdjusters.previous
-import java.util.Date
+import android.annotation.SuppressLint
+import java.time.DayOfWeek.FRIDAY
+import java.time.DayOfWeek.MONDAY
+import java.time.DayOfWeek.SATURDAY
+import java.time.DayOfWeek.SUNDAY
+import java.time.Instant.ofEpochMilli
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalDateTime.ofInstant
+import java.time.Month
+import java.time.ZoneId
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter.ofPattern
+import java.time.format.TextStyle.FULL
+import java.time.temporal.TemporalAdjusters.firstInMonth
+import java.time.temporal.TemporalAdjusters.next
+import java.time.temporal.TemporalAdjusters.previous
 import java.util.Locale
 
 private const val DATE_PATTERN = "dd.MM.yyyy"
 
-fun Date.toLocalDate(): LocalDate = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDate()
-
-fun Date.toLocalDateTime(): LocalDateTime = ofEpochMilli(time).atZone(ZoneId.systemDefault()).toLocalDateTime()
-
 fun String.toLocalDate(format: String = DATE_PATTERN): LocalDate = LocalDate.parse(this, ofPattern(format))
 
+fun LocalDateTime.toTimestamp() = atZone(ZoneId.systemDefault()).withZoneSameInstant(ZoneOffset.UTC).toInstant().toEpochMilli()
+
+fun Long.toLocalDateTime(): LocalDateTime = ofInstant(ofEpochMilli(this), ZoneId.systemDefault())
+
 fun LocalDate.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
 fun LocalDateTime.toFormattedString(format: String = DATE_PATTERN): String = format(ofPattern(format))
 
-fun LocalDateTime.toDate(): Date = DateTimeUtils.toDate(atZone(ZoneId.systemDefault()).toInstant())
-
-/**
- * https://github.com/ThreeTen/threetenbp/issues/55
- */
-
+@SuppressLint("DefaultLocale")
 fun Month.getFormattedName(): String {
-    return getDisplayName(FULL_STANDALONE, Locale.getDefault())
+    return getDisplayName(FULL, Locale.getDefault())
         .let {
             when (it) {
                 "stycznia" -> "Styczeń"
@@ -55,7 +50,7 @@ fun Month.getFormattedName(): String {
                 "grudnia" -> "Grudzień"
                 else -> it
             }
-        }
+        }.capitalize()
 }
 
 inline val LocalDate.nextSchoolDay: LocalDate
@@ -82,6 +77,12 @@ inline val LocalDate.nextOrSameSchoolDay: LocalDate
         }
     }
 
+inline val LocalDate.startExamsDay: LocalDate
+    get() = nextOrSameSchoolDay.monday
+
+inline val LocalDate.endExamsDay: LocalDate
+    get() = nextOrSameSchoolDay.monday.plusWeeks(4).minusDays(1)
+
 inline val LocalDate.previousOrSameSchoolDay: LocalDate
     get() {
         return when (dayOfWeek) {
@@ -93,19 +94,15 @@ inline val LocalDate.previousOrSameSchoolDay: LocalDate
 inline val LocalDate.weekDayName: String
     get() = format(ofPattern("EEEE", Locale.getDefault()))
 
-inline val LocalDate.shortcutWeekDayName: String
-    get() = format(ofPattern("EEE", Locale.getDefault()))
-
 inline val LocalDate.monday: LocalDate
     get() = with(MONDAY)
 
-inline val LocalDate.friday: LocalDate
-    get() = with(FRIDAY)
+inline val LocalDate.sunday: LocalDate
+    get() = with(SUNDAY)
 
 /**
  * [Dz.U. 2016 poz. 1335](http://prawo.sejm.gov.pl/isap.nsf/DocDetails.xsp?id=WDU20160001335)
  */
-
 inline val LocalDate.isHolidays: Boolean
     get() = isBefore(firstSchoolDay) && isAfter(lastSchoolDay)
 
@@ -121,7 +118,6 @@ inline val LocalDate.lastSchoolDay: LocalDate
     get() = LocalDate.of(year, 6, 20)
         .with(next(FRIDAY))
 
-
 private fun Int.getSchoolYearByMonth(monthValue: Int): Int {
     return when (monthValue) {
         in 9..12 -> this
diff --git a/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
new file mode 100644
index 000000000..f3591306e
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/utils/TimetableExtension.kt
@@ -0,0 +1,29 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.data.db.entities.Timetable
+import java.time.Duration
+import java.time.Duration.between
+import java.time.LocalDateTime
+import java.time.LocalDateTime.now
+
+fun Timetable.isShowTimeUntil(previousLessonEnd: LocalDateTime?) = when {
+    !isStudentPlan -> false
+    canceled -> false
+    now().isAfter(start) -> false
+    previousLessonEnd != null && now().isBefore(previousLessonEnd) -> false
+    else -> between(now(), start) <= Duration.ofMinutes(60)
+}
+
+inline val Timetable.left: Duration?
+    get() = when {
+        canceled -> null
+        !isStudentPlan -> null
+        end.isAfter(now()) && start.isBefore(now()) -> between(now(), end)
+        else -> null
+    }
+
+inline val Timetable.until: Duration
+    get() = between(now(), start)
+
+inline val Timetable.isJustFinished: Boolean
+    get() = end.isBefore(now()) && end.plusSeconds(15).isAfter(now()) && !canceled
diff --git a/app/src/main/play/release-notes/pl-PL/default.txt b/app/src/main/play/release-notes/pl-PL/default.txt
index 467c3ec82..e89c473fa 100644
--- a/app/src/main/play/release-notes/pl-PL/default.txt
+++ b/app/src/main/play/release-notes/pl-PL/default.txt
@@ -1,6 +1,7 @@
-Wersja 0.14.2
-
-- naprawiliśmy błąd powodujący zatrzymanie aplikacji na urządzeniach z Androidem poniżej 5.0
-- zmieniliśmy mało mówiący komunikat o niedostępnym dzienniku na taki mówiący o przerwie technicznej dziennika
+Wersja 0.22
+- naprawiliśmy krytyczny błąd ze stabilnością przy ładowaniu danych
+- naprawiliśmy skalowanie tekstu przy bardzo dużych jego rozmiarach
+- naprawiliśmy wyświetlanie powiadomień o odwołanych lekcjach (nie powinny się już pokazywać)
+- dodaliśmy informowanie o dostępności aktualizacji w aplikacji
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
index 2774dd5dd..21b406fdc 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_grade.xml
@@ -3,11 +3,7 @@
     android:height="24dp"
     android:viewportWidth="28.26087"
     android:viewportHeight="28.26087">
-    <group
-        android:translateX="1.1304348"
-        android:translateY="1.1304348">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2 2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
-    </group>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2 2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
index 4699c4576..bee1c7072 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_luckynumber.xml
@@ -3,11 +3,7 @@
     android:height="24dp"
     android:viewportWidth="26.086956"
     android:viewportHeight="26.086956">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2, 9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83, 12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22, 8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
-    </group>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M12,11.18C15.3,8.18 17,6.64 17,4.69C17,3.19 15.75,2 14.25,2C13.39,2 12.57,2.36 12,3C11.43,2.36 10.61,2 9.69,2C8.19,2 7,3.25 7,4.75C7,6.64 8.7,8.18 12,11.18M11.18,12C8.18,8.7 6.64,7 4.69,7C3.19,7 2,8.25 2, 9.75C2,10.61 2.36,11.43 3,12C2.36,12.57 2,13.39 2,14.31C2,15.81 3.25,17 4.75,17C6.64,17 8.18,15.3 11.18,12M12.83, 12C15.82,15.3 17.36,17 19.31,17C20.81,17 22,15.75 22,14.25C22,13.39 21.64,12.57 21,12C21.64,11.43 22,10.61 22,9.69C22, 8.19 20.75,7 19.25,7C17.36,7 15.82,8.7 12.83,12M12,12.82C8.7,15.82 7,17.36 7,19.31C7,20.81 8.25,22 9.75,22C10.61,22 11.43,21.64 12,21C12.57,21.64 13.39,22 14.31,22C15.81,22 17,20.75 17,19.25C17,17.36 15.3,15.82 12,12.82Z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
index cb42d7cc2..89a8aef29 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_message.xml
@@ -3,11 +3,7 @@
     android:height="24dp"
     android:viewportWidth="26.086956"
     android:viewportHeight="26.086956">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
-    </group>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
index d6b0d4d17..0f335336b 100644
--- a/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
+++ b/app/src/main/res/drawable-anydpi-v24/ic_stat_note.xml
@@ -3,11 +3,7 @@
     android:height="24dp"
     android:viewportWidth="26.086956"
     android:viewportHeight="26.086956">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
-    </group>
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
 </vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-hdpi/ic_shortcut_attendance.png
new file mode 100644
index 000000000..0b5feff2d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_attendance.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_exam.png b/app/src/main/res/drawable-hdpi/ic_shortcut_exam.png
new file mode 100644
index 000000000..e5af0d086
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_exam.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_grade.png b/app/src/main/res/drawable-hdpi/ic_shortcut_grade.png
new file mode 100644
index 000000000..095a8228c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_grade.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_message.png b/app/src/main/res/drawable-hdpi/ic_shortcut_message.png
new file mode 100644
index 000000000..7bcd79e01
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_message.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_shortcut_timetable.png b/app/src/main/res/drawable-hdpi/ic_shortcut_timetable.png
new file mode 100644
index 000000000..2808559a5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shortcut_timetable.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_push.png b/app/src/main/res/drawable-hdpi/ic_stat_push.png
new file mode 100644
index 000000000..84578183f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_timetable.png b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..201419d5d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-mdpi/ic_shortcut_attendance.png
new file mode 100644
index 000000000..e81e7ad92
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_attendance.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_exam.png b/app/src/main/res/drawable-mdpi/ic_shortcut_exam.png
new file mode 100644
index 000000000..3bdb5297f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_exam.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_grade.png b/app/src/main/res/drawable-mdpi/ic_shortcut_grade.png
new file mode 100644
index 000000000..e35135071
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_grade.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_message.png b/app/src/main/res/drawable-mdpi/ic_shortcut_message.png
new file mode 100644
index 000000000..392c45d24
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_message.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shortcut_timetable.png b/app/src/main/res/drawable-mdpi/ic_shortcut_timetable.png
new file mode 100644
index 000000000..7d61306a4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shortcut_timetable.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_push.png b/app/src/main/res/drawable-mdpi/ic_stat_push.png
new file mode 100644
index 000000000..d1e954b0c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_timetable.png b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..dcfe95f26
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-night/background_header_note.xml b/app/src/main/res/drawable-night/background_header_note.xml
index 2983b32c6..6b594e7c6 100644
--- a/app/src/main/res/drawable-night/background_header_note.xml
+++ b/app/src/main/res/drawable-night/background_header_note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimaryLight"/>
-    <corners android:radius="12dp"/>
+    <solid android:color="@color/colorPrimaryLight" />
+    <corners android:radius="12dp" />
 </shape>
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png
new file mode 100644
index 000000000..302b9e0ee
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_attendance.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_exam.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_exam.png
new file mode 100644
index 000000000..9f36ca47a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_exam.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_grade.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_grade.png
new file mode 100644
index 000000000..281bc7a31
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_grade.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_message.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_message.png
new file mode 100644
index 000000000..184929a3c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_message.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shortcut_timetable.png b/app/src/main/res/drawable-xhdpi/ic_shortcut_timetable.png
new file mode 100644
index 000000000..9a40fe61c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shortcut_timetable.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_push.png b/app/src/main/res/drawable-xhdpi/ic_stat_push.png
new file mode 100644
index 000000000..79b38e63f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..7264bd92a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_attendance.png
new file mode 100644
index 000000000..9b4ef2daf
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_attendance.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_exam.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_exam.png
new file mode 100644
index 000000000..c2677a139
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_exam.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_grade.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_grade.png
new file mode 100644
index 000000000..8b51021cb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_grade.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_message.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_message.png
new file mode 100644
index 000000000..250c290aa
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_message.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shortcut_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_shortcut_timetable.png
new file mode 100644
index 000000000..c530153a1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shortcut_timetable.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxhdpi/ic_stat_push.png
new file mode 100644
index 000000000..bc33cb5b1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..1fb37b092
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attendance.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attendance.png
new file mode 100644
index 000000000..7b9a68a70
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_attendance.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_exam.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_exam.png
new file mode 100644
index 000000000..519c50abc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_exam.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_grade.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_grade.png
new file mode 100644
index 000000000..13c793d5e
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_grade.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_message.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_message.png
new file mode 100644
index 000000000..eaffa2dde
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_message.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shortcut_timetable.png b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_timetable.png
new file mode 100644
index 000000000..03522e9a5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shortcut_timetable.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png
new file mode 100644
index 000000000..b354bd06c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_push.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png
new file mode 100644
index 000000000..a95cc4f5d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_timetable.png differ
diff --git a/app/src/main/res/drawable/background_header_note.xml b/app/src/main/res/drawable/background_header_note.xml
index 8e92e3abf..c21e55c6b 100644
--- a/app/src/main/res/drawable/background_header_note.xml
+++ b/app/src/main/res/drawable/background_header_note.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorPrimary"/>
-    <corners android:radius="12dp"/>
-</shape>
\ No newline at end of file
+    <solid android:color="@color/colorPrimary" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/background_timetable_time_left.xml b/app/src/main/res/drawable/background_timetable_time_left.xml
new file mode 100644
index 000000000..0f3326112
--- /dev/null
+++ b/app/src/main/res/drawable/background_timetable_time_left.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="3dp"/>
+    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_about_creator.xml b/app/src/main/res/drawable/ic_about_creator.xml
new file mode 100644
index 000000000..c3daf609d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_creator.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFF"
+      android:pathData="M9,13.75c-2.34,0 -7,1.17 -7,3.5L2,19h14v-1.75c0,-2.33 -4.66,-3.5 -7,-3.5zM4.34,17c0.84,-0.58 2.87,-1.25 4.66,-1.25s3.82,0.67 4.66,1.25L4.34,17zM9,12c1.93,0 3.5,-1.57 3.5,-3.5S10.93,5 9,5 5.5,6.57 5.5,8.5 7.07,12 9,12zM9,7c0.83,0 1.5,0.67 1.5,1.5S9.83,10 9,10s-1.5,-0.67 -1.5,-1.5S8.17,7 9,7zM16.04,13.81c1.16,0.84 1.96,1.96 1.96,3.44L18,19h4v-1.75c0,-2.02 -3.5,-3.17 -5.96,-3.44zM15,12c1.93,0 3.5,-1.57 3.5,-3.5S16.93,5 15,5c-0.54,0 -1.04,0.13 -1.5,0.35 0.63,0.89 1,1.98 1,3.15s-0.37,2.26 -1,3.15c0.46,0.22 0.96,0.35 1.5,0.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_done.xml b/app/src/main/res/drawable/ic_all_done.xml
new file mode 100644
index 000000000..bb657f6ec
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_done.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_all_done_all.xml b/app/src/main/res/drawable/ic_all_done_all.xml
new file mode 100644
index 000000000..e27672efa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_all_done_all.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_attachment.xml b/app/src/main/res/drawable/ic_attachment.xml
new file mode 100644
index 000000000..c18714f5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_attachment.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 000000000..3c728c59f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_excuse_denied.xml b/app/src/main/res/drawable/ic_excuse_denied.xml
new file mode 100644
index 000000000..218cfbdc4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_excuse_denied.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_excuse_waiting.xml b/app/src/main/res/drawable/ic_excuse_waiting.xml
new file mode 100644
index 000000000..863418b7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_excuse_waiting.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
new file mode 100644
index 000000000..86b7649b6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
new file mode 100644
index 000000000..bb7140f29
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fullscreen_exit.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_main_grade.xml b/app/src/main/res/drawable/ic_main_grade.xml
index 7577f399e..bf4c2cf20 100644
--- a/app/src/main/res/drawable/ic_main_grade.xml
+++ b/app/src/main/res/drawable/ic_main_grade.xml
@@ -1,7 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M13,11H15V13H13M13,15H15A2,2 0 0,0 17,13V11C17,9.89 16.1,9 15,9H13V7H17V5H13A2,2 0 0,0 11,7V13C11,14.11 11.9,15 13,15M21,17H7V3H21M21,1H7A2,2 0 0,0 5,3V17A2,2 0 0,0 7,19H21A2,2 0 0,0 23,17V3A2,2 0 0,0 21,1M3,5H1V21A2,2 0 0,0 3,23H19V21H3V5Z" />
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M13,11H15V13H13M13,15H15A2,2 0 0,0 17,13V11C17,9.89 16.1,9 15,9H13V7H17V5H13A2,2 0 0,0 11,7V13C11,14.11 11.9,15 13,15M21,17H7V3H21M21,1H7A2,2 0 0,0 5,3V17A2,2 0 0,0 7,19H21A2,2 0 0,0 23,17V3A2,2 0 0,0 21,1M3,5H1V21A2,2 0 0,0 3,23H19V21H3V5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_main_more.xml b/app/src/main/res/drawable/ic_main_more.xml
index 1b436a327..f57a72456 100644
--- a/app/src/main/res/drawable/ic_main_more.xml
+++ b/app/src/main/res/drawable/ic_main_more.xml
@@ -1,7 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z" />
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M4,5H20V7H4V5M4,9H20V11H4V9M4,13H20V15H4V13M4,17H14V19H4V17Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_print.xml b/app/src/main/res/drawable/ic_menu_message_print.xml
new file mode 100644
index 000000000..204b0f6e3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_print.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,8h-1L18,3L6,3v5L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM8,5h8v3L8,8L8,5zM16,17v2L8,19v-4h8v2zM18,15v-2L6,13v2L4,15v-4c0,-0.55 0.45,-1 1,-1h14c0.55,0 1,0.45 1,1v4h-2z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,11.5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_message_share.xml b/app/src/main/res/drawable/ic_menu_message_share.xml
new file mode 100644
index 000000000..67a8ee494
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_message_share.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 000000000..cc2d1e04f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 000000000..cd9985cb1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 000000000..045bbc0c0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d07dbbd8a..2f88ecc82 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -8,18 +9,20 @@
         android:id="@+id/mainToolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:contentInsetStartWithNavigation="0dp"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/mainFragmentContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?actionBarSize"
-        android:layout_marginBottom="@dimen/bottom_navigation_height" />
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/mainBottomNav"
+        app:layout_constraintTop_toBottomOf="@id/mainToolbar" />
 
     <com.aurelhubert.ahbottomnavigation.AHBottomNavigation
         android:id="@+id/mainBottomNav"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_send_message.xml b/app/src/main/res/layout/activity_send_message.xml
index f59dcabdf..e0ec52bb6 100644
--- a/app/src/main/res/layout/activity_send_message.xml
+++ b/app/src/main/res/layout/activity_send_message.xml
@@ -148,7 +148,7 @@
                     android:hint="@string/message_content"
                     android:imeOptions="flagNoExtractUi"
                     android:importantForAutofill="no"
-                    android:inputType="textMultiLine"
+                    android:inputType="textMultiLine|textCapSentences"
                     android:minHeight="58dp"
                     android:paddingStart="16dp"
                     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/activity_widget_configure.xml b/app/src/main/res/layout/activity_widget_configure.xml
index 548b86041..9a463284e 100644
--- a/app/src/main/res/layout/activity_widget_configure.xml
+++ b/app/src/main/res/layout/activity_widget_configure.xml
@@ -10,9 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:paddingStart="24dp"
-        android:paddingLeft="24dp"
         android:paddingEnd="24dp"
-        android:paddingRight="24dp"
         android:text="@string/account_title"
         android:textSize="20sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/dialog_account.xml b/app/src/main/res/layout/dialog_account.xml
index f2ee0bca7..d56de3a2e 100644
--- a/app/src/main/res/layout/dialog_account.xml
+++ b/app/src/main/res/layout/dialog_account.xml
@@ -2,49 +2,63 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="280dp"
+    android:layout_width="300dp"
     android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/accountDialogTitle"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:paddingStart="24dp"
-        android:paddingLeft="24dp"
-        android:paddingEnd="24dp"
-        android:paddingRight="24dp"
-        android:text="@string/account_title"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        app:firstBaselineToTopHeight="40dp" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/accountDialogRecycler"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/accountDialogTitle"
-        android:overScrollMode="never"
-        tools:itemCount="3"
-        tools:listitem="@layout/item_account" />
+        android:orientation="vertical">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/accountDialogAdd"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/accountDialogRecycler"
-        android:layout_margin="8dp"
-        android:text="@string/account_add_new"
-        android:textColor="?android:textColorPrimary" />
+        <TextView
+            android:id="@+id/accountDialogTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="24dp"
+            android:paddingLeft="24dp"
+            android:paddingEnd="24dp"
+            android:paddingRight="24dp"
+            android:text="@string/account_title"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            app:firstBaselineToTopHeight="40dp" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/accountDialogRemove"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/accountDialogRecycler"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_margin="8dp"
-        android:text="@string/account_logout" />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/accountDialogRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_weight="1"
+            android:overScrollMode="never"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_account" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/accountDialogAdd"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/account_add_new"
+                android:textColor="?android:textColorPrimary" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/accountDialogRemove"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"
+                android:text="@string/account_logout" />
+        </LinearLayout>
+    </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index ec25f6a4f..2d4e5d0ba 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -1,27 +1,49 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minWidth="300dp"
     android:orientation="vertical">
 
-    <LinearLayout
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingTop="20dp"
+        android:text="@string/all_details"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/errorDialogMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="10dp"
+        android:textSize="21sp"
+        tools:text="@tools:sample/lorem" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:orientation="vertical">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/errorDialogNestedScroll"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:overScrollMode="ifContentScrolls">
+            android:overScrollMode="ifContentScrolls"
+            android:paddingHorizontal="24dp"
+            app:layout_constrainedHeight="true"
+            app:layout_constraintHeight_max="300dp"
+            app:layout_constraintHeight_min="200dp"
+            app:layout_constraintTop_toTopOf="parent">
 
             <HorizontalScrollView
-                android:layout_width="350dp"
-                android:layout_height="wrap_content"
-                android:paddingLeft="24dp"
-                android:paddingTop="24dp"
-                android:paddingRight="24dp">
+                android:id="@+id/errorDialogHorizontalScroll"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
                 <TextView
                     android:id="@+id/errorDialogContent"
@@ -33,16 +55,31 @@
                     tools:text="@tools:sample/lorem/random" />
             </HorizontalScrollView>
         </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
+        android:background="@drawable/ic_all_divider"
         android:gravity="end"
         android:minHeight="52dp"
         android:orientation="horizontal">
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/errorDialogReport"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/about_feedback" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/errorDialogCancel"
             style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -50,7 +87,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@android:string/cancel" />
 
         <com.google.android.material.button.MaterialButton
@@ -60,7 +96,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:text="@android:string/copy" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_excuse.xml b/app/src/main/res/layout/dialog_excuse.xml
new file mode 100644
index 000000000..4ed9294ce
--- /dev/null
+++ b/app/src/main/res/layout/dialog_excuse.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/excuseReason"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/attendance_excuse_dialog_reason" />
+
+        <requestFocus />
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_grade.xml b/app/src/main/res/layout/dialog_grade.xml
index f95b9cfdb..be0570c20 100644
--- a/app/src/main/res/layout/dialog_grade.xml
+++ b/app/src/main/res/layout/dialog_grade.xml
@@ -17,90 +17,84 @@
             android:padding="20dp"
             tools:ignore="UselessParent">
 
-            <TextView
-                android:id="@+id/gradeDialogValue"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+            <LinearLayout
+                android:id="@+id/gradeDialogValueLayout"
+                android:layout_width="86dp"
+                android:layout_height="match_parent"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_gravity="end"
-                android:background="@color/grade_material_default"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="30sp"
-                tools:text="6" />
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/gradeDialogSubject"
-                android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/gradeDialogValue"
+                    android:layout_width="match_parent"
+                    android:layout_height="86dp"
+                    android:background="@color/grade_material_default"
+                    android:gravity="center"
+                    android:textColor="@android:color/white"
+                    android:textSize="30sp"
+                    tools:text="6" />
+
+                <TextView
+                    android:id="@+id/gradeDialogColorAndWeightValue"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/grade_black"
+                    android:gravity="center"
+                    android:maxLines="2"
+                    android:minHeight="32dp"
+                    android:textColor="@android:color/white"
+                    android:textIsSelectable="true"
+                    android:textSize="14sp"
+                    tools:text="Waga: 1.00" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/gradeDialogHeader"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_toStartOf="@+id/gradeDialogValueLayout"
+                android:layout_toLeftOf="@+id/gradeDialogValueLayout"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentTop="true"
-                android:layout_gravity="start"
-                android:layout_marginEnd="90dp"
-                android:layout_marginRight="90dp"
-                android:layout_marginBottom="10dp"
                 android:gravity="center_vertical"
-                android:maxLines="5"
-                android:minHeight="80dp"
-                android:minLines="2"
-                android:text="@string/grade_header"
-                android:textIsSelectable="true"
-                android:textSize="20sp" />
+                android:minHeight="120dp"
+                android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/gradeDialogDescription"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogSubject"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:text="@string/all_description"
-                android:textIsSelectable="true"
-                android:textSize="17sp" />
+                <TextView
+                    android:id="@+id/gradeDialogSubject"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="start"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"
+                    android:text="@string/grade_header"
+                    android:textIsSelectable="true"
+                    android:textSize="20sp" />
 
-            <TextView
-                android:id="@+id/gradeDialogDescriptionValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogDescription"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/all_no_description"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogWeight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogDescriptionValue"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="10dp"
-                android:text="@string/grade_weight"
-                android:textSize="17sp" />
-
-            <TextView
-                android:id="@+id/gradeDialogWeightValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogWeight"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:layout_marginTop="3dp"
-                android:text="@string/grade_weight"
-                android:textIsSelectable="true"
-                android:textSize="12sp" />
+                <TextView
+                    android:id="@+id/gradeDialogDescriptionValue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:text="@string/all_no_description"
+                    android:textColor="?android:textColorSecondary"
+                    android:textIsSelectable="true"
+                    android:textSize="16sp" />
+            </LinearLayout>
 
             <TextView
                 android:id="@+id/gradeDialogComment"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/gradeDialogWeightValue"
+                android:layout_below="@+id/gradeDialogHeader"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentLeft="true"
                 android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/dialog_homework.xml b/app/src/main/res/layout/dialog_homework.xml
index 7ed9b795b..7c149d4b0 100644
--- a/app/src/main/res/layout/dialog_homework.xml
+++ b/app/src/main/res/layout/dialog_homework.xml
@@ -1,109 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/parent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="300dp"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/homeworkDialogRecycler"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:minWidth="300dp"
+        tools:itemCount="1"
+        tools:listitem="@layout/item_homework_dialog_details" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="20dp">
+        android:background="@drawable/ic_all_divider"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="5dp">
 
-        <TextView
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/homeworkDialogRead"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
-            android:text="@string/all_details"
-            android:textSize="20sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/all_subject"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogSubject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_teacher"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogTeacher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_date"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_entry_date"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogEntryDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/all_content"
-            android:textSize="17sp" />
-
-        <TextView
-            android:id="@+id/homeworkDialogContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
-            android:lineSpacingMultiplier="1.2"
-            android:text="@string/all_no_data"
-            android:textIsSelectable="true"
-            android:textSize="12sp" />
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
+            android:text="@string/homework_mark_as_done"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeworkDialogClose"
             style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginTop="15dp"
-            android:text="@string/all_close" />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
+            android:text="@string/all_close"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_note.xml b/app/src/main/res/layout/dialog_note.xml
index 0393e56af..71506b01f 100644
--- a/app/src/main/res/layout/dialog_note.xml
+++ b/app/src/main/res/layout/dialog_note.xml
@@ -64,6 +64,22 @@
             android:textIsSelectable="true"
             android:textSize="12sp" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/note_points"
+            android:textSize="17sp" />
+
+        <TextView
+            android:id="@+id/noteDialogPoints"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:text="@string/all_no_data"
+            android:textIsSelectable="true"
+            android:textSize="12sp" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 556bdfd09..6747b7d0c 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/aboutRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_about" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index daf7e67f9..39b00d306 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -56,6 +56,20 @@
                 android:textSize="20sp" />
         </LinearLayout>
 
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/attendanceExcuseButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/attendance_excuse_title"
+            android:tint="?colorOnSecondary"
+            android:visibility="gone"
+            app:icon="@drawable/ic_all_done_all"
+            tools:visibility="visible" />
+
         <LinearLayout
             android:id="@+id/attendanceError"
             android:layout_width="match_parent"
@@ -139,8 +153,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/attendanceNextButton"
diff --git a/app/src/main/res/layout/fragment_contributor.xml b/app/src/main/res/layout/fragment_contributor.xml
new file mode 100644
index 000000000..d913c5a4d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_contributor.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/creatorProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/creatorRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            tools:listitem="@layout/item_contributor" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/creatorSeeMore"
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="32dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="32dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/contributor_see_more" />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_exam.xml b/app/src/main/res/layout/fragment_exam.xml
index 1e1b0c99e..ed4094a50 100644
--- a/app/src/main/res/layout/fragment_exam.xml
+++ b/app/src/main/res/layout/fragment_exam.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/examNextButton"
diff --git a/app/src/main/res/layout/fragment_grade_statistics.xml b/app/src/main/res/layout/fragment_grade_statistics.xml
index 10c8bb195..b3fcac448 100644
--- a/app/src/main/res/layout/fragment_grade_statistics.xml
+++ b/app/src/main/res/layout/fragment_grade_statistics.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:background="?android:windowBackground"
         android:padding="5dp"
-        android:visibility="invisible"
+        android:visibility="gone"
         tools:ignore="UnusedAttribute"
         tools:listitem="@layout/item_attendance_summary"
         tools:visibility="visible">
@@ -31,13 +31,13 @@
             android:spinnerMode="dialog" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 
-
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/gradeStatisticsSwipe"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <androidx.core.widget.NestedScrollView
+            android:id="@+id/gradeStatisticsScroll"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fillViewport="true">
@@ -59,9 +59,7 @@
                         android:orientation="horizontal"
                         android:paddingStart="16dp"
                         android:paddingTop="5dp"
-                        android:paddingEnd="16dp"
-                        android:visibility="invisible"
-                        tools:visibility="visible">
+                        android:paddingEnd="16dp">
 
                         <com.google.android.material.radiobutton.MaterialRadioButton
                             android:id="@+id/gradeStatisticsTypePartial"
@@ -91,25 +89,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <com.github.mikephil.charting.charts.PieChart
-                        android:id="@+id/gradeStatisticsChart"
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/gradeStatisticsRecycler"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:background="?android:windowBackground"
-                        android:minHeight="400dp"
-                        android:visibility="gone"
-                        tools:visibility="visible" />
-
-                    <com.github.mikephil.charting.charts.BarChart
-                        android:id="@+id/gradeStatisticsChartPoints"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="10dp"
-                        android:background="?android:windowBackground"
-                        android:minHeight="400dp"
-                        android:visibility="gone"
-                        tools:visibility="visible" />
+                        tools:listitem="@layout/item_grade_statistics_pie" />
 
                     <me.zhanghai.android.materialprogressbar.MaterialProgressBar
                         android:id="@+id/gradeStatisticsProgress"
diff --git a/app/src/main/res/layout/fragment_homework.xml b/app/src/main/res/layout/fragment_homework.xml
index 0fcde9c07..26381da6a 100644
--- a/app/src/main/res/layout/fragment_homework.xml
+++ b/app/src/main/res/layout/fragment_homework.xml
@@ -138,8 +138,8 @@
             android:layout_height="match_parent"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/homeworkNextButton"
diff --git a/app/src/main/res/layout/fragment_license.xml b/app/src/main/res/layout/fragment_license.xml
index 80ecd6b10..f4105355c 100644
--- a/app/src/main/res/layout/fragment_license.xml
+++ b/app/src/main/res/layout/fragment_license.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -14,5 +15,6 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/licenseRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_license" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 15e0904b6..65af0b543 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -52,7 +52,7 @@
                 android:gravity="center"
                 android:orientation="horizontal"
                 android:paddingTop="24dp"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedWarningInfo"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
@@ -80,8 +80,24 @@
                     android:text="@string/login_type_hybrid" />
             </RadioGroup>
 
+            <TextView
+                android:id="@+id/loginFormAdvancedWarningInfo"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginRight="24dp"
+                android:gravity="center_horizontal"
+                android:lineSpacingExtra="3sp"
+                android:text="@string/login_advanced_warning_scraper"
+                android:textColor="?colorTimetableChange"
+                app:layout_constraintBottom_toTopOf="@id/loginFormUsernameLayout"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginTypeSwitch" />
+
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFormNameLayout"
+                android:id="@+id/loginFormUsernameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -95,13 +111,14 @@
                 app:layout_constraintBottom_toTopOf="@+id/loginFormPassLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginTypeSwitch">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormAdvancedWarningInfo">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginFormName"
+                    android:id="@+id/loginFormUsername"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="emailAddress"
+                    android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -121,10 +138,11 @@
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_password_hint"
                 app:errorEnabled="true"
+                app:errorIconDrawable="@null"
                 app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
@@ -134,6 +152,7 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
@@ -216,6 +235,7 @@
                     android:layout_height="wrap_content"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="no"
                     android:inputType="textAutoComplete|textNoSuggestions"
                     android:maxLines="1"
                     tools:ignore="LabelFor" />
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index bb93c1827..d91d7b037 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -67,7 +67,6 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
                         android:layout_weight="1"
                         android:text="@string/login_contact_email"
                         app:icon="@drawable/ic_more_messages" />
@@ -78,7 +77,6 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
-                        android:layout_marginLeft="8dp"
                         android:layout_weight="1"
                         android:text="@string/about_faq"
                         app:icon="@drawable/ic_about_faq" />
@@ -105,7 +103,7 @@
                 android:text="@string/login_header_default"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormNameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormUsernameLayout"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginFormContact"
@@ -113,7 +111,7 @@
 
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/loginFormNameLayout"
+                android:id="@+id/loginFormUsernameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -130,10 +128,11 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginFormHeader">
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/loginFormName"
+                    android:id="@+id/loginFormUsername"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="emailAddress"
+                    android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -153,10 +152,11 @@
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_password_hint"
                 app:errorEnabled="true"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormHostLayout"
+                app:errorIconDrawable="@null"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormRecoverLink"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormNameLayout"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormUsernameLayout"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
@@ -166,6 +166,7 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
@@ -173,6 +174,21 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginFormRecoverLink"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="24dp"
+                android:text="@string/login_recover_button"
+                android:textAppearance="?android:textAppearance"
+                app:backgroundTint="?android:windowBackground"
+                app:fontFamily="sans-serif-medium"
+                app:layout_constraintBottom_toTopOf="@id/loginFormHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout"
+                tools:visibility="visible" />
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginFormHostLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -180,15 +196,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
                 android:layout_marginLeft="24dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="24dp"
                 android:layout_marginRight="24dp"
                 android:hint="@string/login_host_hint"
                 android:orientation="vertical"
-                app:layout_constraintBottom_toTopOf="@+id/loginFormSignIn"
+                app:layout_constraintBottom_toTopOf="@+id/loginFormAdvancedButton"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginFormPassLayout">
+                app:layout_constraintTop_toBottomOf="@+id/loginFormRecoverLink">
 
                 <AutoCompleteTextView
                     android:id="@+id/loginFormHost"
@@ -204,10 +220,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
                 android:text="@string/login_advanced"
                 android:textAppearance="?android:textAppearance"
-                android:textColor="@color/colorPrimary"
+                android:visibility="gone"
                 app:backgroundTint="?android:windowBackground"
                 app:fontFamily="sans-serif-medium"
                 app:layout_constraintBottom_toBottomOf="@id/loginFormSignIn"
@@ -223,7 +238,6 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginTop="48dp"
                 android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_sign_in"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_login_recover.xml b/app/src/main/res/layout/fragment_login_recover.xml
new file mode 100644
index 000000000..205a4bea3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_login_recover.xml
@@ -0,0 +1,259 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.modules.login.recover.LoginRecoverFragment">
+
+    <me.zhanghai.android.materialprogressbar.MaterialProgressBar
+        android:id="@+id/loginRecoverProgress"
+        style="@style/Widget.MaterialProgressBar.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        tools:visibility="visible">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/loginRecoverFormContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp"
+            android:visibility="visible">
+
+            <TextView
+                android:id="@+id/loginFormHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="48dp"
+                android:layout_marginEnd="32dp"
+                android:layout_marginRight="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_recover_title"
+                android:textSize="16sp"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverInfoMessage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <TextView
+                android:id="@+id/loginRecoverInfoMessage"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_recover_warning"
+                android:textColor="?colorTimetableChange"
+                app:layout_constraintBottom_toTopOf="@id/loginRecoverNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginFormHeader" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginRecoverNameLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_email_hint"
+                app:errorEnabled="true"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverHostLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverInfoMessage">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginRecoverName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="emailAddress"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1"
+                    android:imeOptions="actionDone"
+                    tools:targetApi="o" />
+
+                <requestFocus />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/loginRecoverHostLayout"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="24dp"
+                android:layout_marginLeft="24dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:hint="@string/login_host_hint"
+                android:orientation="vertical"
+                app:layout_constraintBottom_toTopOf="@+id/loginRecoverButton"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverNameLayout">
+
+                <AutoCompleteTextView
+                    android:id="@+id/loginRecoverHost"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:editable="false"
+                    tools:ignore="Deprecated,LabelFor" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <Button
+                android:id="@+id/loginRecoverButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="24dp"
+                android:layout_marginRight="24dp"
+                android:text="@string/login_recover"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/loginRecoverHostLayout" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/loginRecoverCaptchaContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <WebView
+            android:id="@+id/loginRecoverWebView"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/loginRecoverError"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        tools:ignore="UseCompoundDrawables"
+        tools:visibility="invisible">
+
+        <ImageView
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:srcCompat="@drawable/ic_error"
+            app:tint="?colorOnBackground"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:id="@+id/loginRecoverErrorMessage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:gravity="center"
+            android:padding="8dp"
+            android:text="@string/error_unknown"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginRecoverErrorDetails"
+                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginRight="8dp"
+                android:text="@string/all_details" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginRecoverErrorRetry"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/all_retry" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/loginRecoverSuccess"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:scrollbars="none"
+        android:visibility="invisible"
+        tools:visibility="invisible">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            tools:ignore="UseCompoundDrawables">
+
+            <ImageView
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:srcCompat="@drawable/ic_all_done"
+                app:tint="?colorOnBackground"
+                tools:ignore="contentDescription" />
+
+            <TextView
+                android:id="@+id/loginRecoverSuccessTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="35dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginEnd="35dp"
+                android:gravity="center"
+                android:textSize="20sp"
+                tools:text="Pomyślnie wysłano email!" />
+
+            <TextView
+                android:id="@+id/loginRecoverSuccessMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="35dp"
+                android:lineSpacingMultiplier="1.5"
+                android:scrollbars="vertical"
+                android:text="@string/login_recover"
+                android:textSize="14sp"
+                tools:text="@tools:sample/lorem/random" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loginRecoverLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="30dp"
+                android:layout_marginBottom="30dp"
+                android:text="@android:string/ok" />
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_login_student_select.xml b/app/src/main/res/layout/fragment_login_student_select.xml
index 64e06cbd5..f9c6c1572 100644
--- a/app/src/main/res/layout/fragment_login_student_select.xml
+++ b/app/src/main/res/layout/fragment_login_student_select.xml
@@ -24,10 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:visibility="gone"
             tools:visibility="visible">
 
             <View
@@ -42,9 +42,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="32dp"
                 android:layout_marginLeft="32dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginEnd="32dp"
                 android:layout_marginRight="32dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
                 android:text="@string/login_contact_header"
@@ -55,28 +55,29 @@
                 android:id="@+id/loginStudentSelectContactButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
                 android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp">
+                android:layout_marginRight="16dp"
+                android:orientation="horizontal">
+
                 <com.google.android.material.button.MaterialButton
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:id="@+id/loginStudentSelectContactEmail"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginRight="8dp"
                     android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_weight="1"
                     android:text="@string/login_contact_email"
                     app:icon="@drawable/ic_more_messages" />
 
                 <com.google.android.material.button.MaterialButton
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:id="@+id/loginStudentSelectContactDiscord"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginLeft="8dp"
                     android:layout_marginStart="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_weight="1"
                     android:text="@string/login_contact_discord"
                     app:icon="@drawable/ic_about_discord" />
             </LinearLayout>
@@ -95,9 +96,9 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginLeft="32dp"
+            android:layout_marginTop="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginRight="32dp"
-            android:layout_marginTop="32dp"
             android:layout_marginBottom="32dp"
             android:gravity="center_horizontal"
             android:text="@string/login_select_student"
@@ -129,8 +130,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
             android:layout_marginEnd="24dp"
-            android:layout_marginRight="24dp"
             android:layout_marginBottom="32dp"
+            android:enabled="false"
             android:text="@string/login_sign_in"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_login_symbol.xml b/app/src/main/res/layout/fragment_login_symbol.xml
index 56b4a32e5..77f44d213 100644
--- a/app/src/main/res/layout/fragment_login_symbol.xml
+++ b/app/src/main/res/layout/fragment_login_symbol.xml
@@ -108,31 +108,41 @@
                 android:text="@string/login_header_symbol"
                 android:textSize="16sp"
                 app:fontFamily="sans-serif-light"
-                app:layout_constraintBottom_toTopOf="@+id/loginSymbolNameLayout"
+                app:layout_constraintBottom_toTopOf="@+id/loginSymbolHelper"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/loginSymbolContact"
                 app:layout_constraintVertical_chainStyle="packed" />
 
+            <TextView
+                android:id="@+id/loginSymbolHelper"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginEnd="32dp"
+                android:gravity="center_horizontal"
+                android:text="@string/login_symbol_helper"
+                app:fontFamily="sans-serif-light"
+                app:layout_constraintBottom_toTopOf="@id/loginSymbolNameLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/loginSymbolHeader"
+                app:layout_constraintVertical_chainStyle="packed" />
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/loginSymbolNameLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginLeft="24dp"
-                android:layout_marginTop="48dp"
-                android:layout_marginEnd="24dp"
-                android:layout_marginRight="24dp"
+                android:layout_margin="24dp"
                 android:hint="@string/login_symbol_hint"
-                app:helperText="@string/login_symbol_helper"
-                app:helperTextEnabled="true"
                 app:layout_constraintBottom_toTopOf="@+id/loginSymbolSignIn"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHeader">
+                app:layout_constraintTop_toBottomOf="@+id/loginSymbolHelper">
 
                 <AutoCompleteTextView
                     android:id="@+id/loginSymbolName"
diff --git a/app/src/main/res/layout/fragment_logviewer.xml b/app/src/main/res/layout/fragment_logviewer.xml
new file mode 100644
index 000000000..64f9125fb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_logviewer.xml
@@ -0,0 +1,34 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.logviewer.LogViewerFragment">
+
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="3dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/logViewerRecycler"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
+    </HorizontalScrollView>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/logViewRefreshButton"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:text="@string/logviewer_refresh"
+        android:tint="?colorOnSecondary"
+        app:srcCompat="@drawable/ic_refresh" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_message_preview.xml b/app/src/main/res/layout/fragment_message_preview.xml
index 4a6f7e9a7..0931990f6 100644
--- a/app/src/main/res/layout/fragment_message_preview.xml
+++ b/app/src/main/res/layout/fragment_message_preview.xml
@@ -5,55 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/messagePreviewRecycler"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/messagePreviewContentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
-
-            <TextView
-                android:id="@+id/messagePreviewSubject"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="15dp"
-                android:lineSpacingMultiplier="1.2"
-                android:textSize="22sp"
-                tools:text="@tools:sample/lorem" />
-
-            <TextView
-                android:id="@+id/messagePreviewAuthor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="15sp"
-                tools:text="@tools:sample/full_names" />
-
-            <TextView
-                android:id="@+id/messagePreviewDate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="15dp"
-                android:textColor="?android:textColorSecondary"
-                android:textSize="15sp"
-                tools:text="@tools:sample/date/ddmmyy" />
-
-            <TextView
-                android:id="@+id/messagePreviewContent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:lineSpacingMultiplier="1.2"
-                android:textIsSelectable="true"
-                tools:text="@tools:sample/lorem" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
+        android:layout_height="match_parent"
+        tools:itemCount="1"
+        tools:listitem="@layout/item_message_preview" />
 
     <LinearLayout
         android:id="@+id/messagePreviewError"
@@ -95,7 +52,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:text="@string/all_details" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_timetable.xml b/app/src/main/res/layout/fragment_timetable.xml
index 98ccabbff..533af2fa1 100644
--- a/app/src/main/res/layout/fragment_timetable.xml
+++ b/app/src/main/res/layout/fragment_timetable.xml
@@ -139,8 +139,8 @@
             android:background="?selectableItemBackgroundBorderless"
             android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/timetableNextButton"
diff --git a/app/src/main/res/layout/fragment_timetable_completed.xml b/app/src/main/res/layout/fragment_timetable_completed.xml
index 110670449..4934327c5 100644
--- a/app/src/main/res/layout/fragment_timetable_completed.xml
+++ b/app/src/main/res/layout/fragment_timetable_completed.xml
@@ -115,8 +115,8 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_gravity="bottom"
-        android:orientation="horizontal"
         android:gravity="center"
+        android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
         <ImageButton
@@ -125,24 +125,24 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_prev"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitStart"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_left"
-            android:contentDescription="@string/all_prev"/>
+            app:srcCompat="@drawable/ic_chevron_left" />
 
         <TextView
             android:id="@+id/completedLessonsNavDate"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:fontFamily="sans-serif"
             android:background="?selectableItemBackgroundBorderless"
+            android:fontFamily="sans-serif"
             android:gravity="center"
-            android:text="@string/app_name"
-            android:textSize="16sp" />
+            android:textSize="16sp"
+            tools:text="@tools:sample/date/ddmmyy" />
 
         <ImageButton
             android:id="@+id/completedLessonsNextButton"
@@ -150,13 +150,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/all_next"
             android:paddingLeft="12dp"
             android:paddingTop="8dp"
             android:paddingRight="12dp"
             android:paddingBottom="8dp"
             android:scaleType="fitEnd"
             android:tint="?colorPrimary"
-            app:srcCompat="@drawable/ic_chevron_right"
-            android:contentDescription="@string/all_next" />
+            app:srcCompat="@drawable/ic_chevron_right" />
     </io.github.wulkanowy.ui.widgets.MaterialLinearLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/header_account.xml b/app/src/main/res/layout/header_account.xml
new file mode 100644
index 000000000..6219c26db
--- /dev/null
+++ b/app/src/main/res/layout/header_account.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingHorizontal="24dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.account.AccountAdapter">
+
+    <TextView
+        android:id="@+id/accountHeaderEmail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="14sp"
+        tools:text="jan@fakelog.cf" />
+
+    <TextView
+        android:id="@+id/accountHeaderType"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        tools:text="Konto ucznia" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/header_exam.xml b/app/src/main/res/layout/header_exam.xml
index 3a2e38c59..43f089f73 100644
--- a/app/src/main/res/layout/header_exam.xml
+++ b/app/src/main/res/layout/header_exam.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.exam.ExamHeader">
+    tools:context=".ui.modules.exam.ExamAdapter">
 
     <TextView
         android:id="@+id/examHeaderDay"
@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="25.01.2020" />
diff --git a/app/src/main/res/layout/header_grade_details.xml b/app/src/main/res/layout/header_grade_details.xml
index 0fa3872e1..f2ba9a8c9 100644
--- a/app/src/main/res/layout/header_grade_details.xml
+++ b/app/src/main/res/layout/header_grade_details.xml
@@ -1,68 +1,93 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/gradeHeaderContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingLeft="16dp"
-    android:paddingTop="10dp"
-    android:paddingRight="14dp"
-    android:paddingBottom="10dp"
-    tools:context=".ui.modules.grade.details.GradeDetailsHeader"
-    android:paddingEnd="12dp"
-    android:paddingStart="16dp">
+    android:background="?android:windowBackground">
 
-    <TextView
-        android:id="@+id/gradeHeaderSubject"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gradeHeaderContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeHeaderNote"
-        android:layout_toLeftOf="@id/gradeHeaderNote"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="15sp"
-        tools:text="Fizyka" />
+        android:background="?selectableItemBackground"
+        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
 
-    <TextView
-        android:id="@+id/gradeHeaderAverage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gradeHeaderSubject"
-        android:layout_marginTop="5dp"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Average: 6,00" />
+        <View
+            android:id="@+id/gradeHeaderDivider"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/gradeHeaderNumber"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/gradeHeaderSubject"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_toEndOf="@+id/gradeHeaderAverage"
-        android:layout_toRightOf="@+id/gradeHeaderAverage"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="12 grades" />
+        <TextView
+            android:id="@+id/gradeHeaderSubject"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="20dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toStartOf="@id/gradeHeaderNote"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@tools:sample/lorem/random" />
 
-    <TextView
-        android:id="@+id/gradeHeaderNote"
-        android:layout_width="wrap_content"
-        android:minWidth="20dp"
-        android:layout_height="20dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:gravity="center"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/background_header_note"
-        android:textColor="?colorOnPrimary"
-        android:textSize="14sp"
-        tools:text="255" />
-</RelativeLayout>
+        <TextView
+            android:id="@+id/gradeHeaderAverage"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="10dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@id/gradeHeaderSubject"
+            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
+            tools:text="Average: 6,00" />
+
+        <TextView
+            android:id="@+id/gradeHeaderPointsSum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderAverage"
+            app:layout_constraintTop_toBottomOf="@+id/gradeHeaderSubject"
+            tools:text="Points: 123/200 (61,5%)" />
+
+        <TextView
+            android:id="@+id/gradeHeaderNumber"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="5dp"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/gradeHeaderPointsSum"
+            app:layout_constraintTop_toBottomOf="@id/gradeHeaderSubject"
+            tools:text="12 grades" />
+
+        <TextView
+            android:id="@+id/gradeHeaderNote"
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/background_header_note"
+            android:gravity="center"
+            android:minWidth="20dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:textColor="?colorOnPrimary"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="255" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/header_homework.xml b/app/src/main/res/layout/header_homework.xml
index 207fcdb40..e1c6608f4 100644
--- a/app/src/main/res/layout/header_homework.xml
+++ b/app/src/main/res/layout/header_homework.xml
@@ -10,7 +10,7 @@
     android:paddingTop="10dp"
     android:paddingRight="20dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.homework.HomeworkHeader">
+    tools:context=".ui.modules.homework.HomeworkAdapter">
 
     <TextView
         android:id="@+id/homeworkHeaderDay"
@@ -25,7 +25,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="22.02.2022" />
diff --git a/app/src/main/res/layout/item_about.xml b/app/src/main/res/layout/item_about.xml
index b5dc3758c..6a95e5529 100644
--- a/app/src/main/res/layout/item_about.xml
+++ b/app/src/main/res/layout/item_about.xml
@@ -4,17 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="72dp"
-    android:background="?selectableItemBackground">
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.about.AboutAdapter">
 
     <ImageView
         android:id="@+id/aboutItemImage"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
         app:tint="?colorOnBackground"
         tools:ignore="ContentDescription"
         tools:src="@drawable/ic_all_about" />
@@ -24,9 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="32dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
-        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -36,16 +33,15 @@
     <TextView
         android:id="@+id/aboutItemSummary"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:layout_below="@id/aboutItemTitle"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/aboutItemImage"
-        android:layout_toRightOf="@id/aboutItemImage"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
         tools:text="@tools:sample/lorem" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 309be8121..9568b345a 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -1,53 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
+    android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:orientation="horizontal"
-    android:paddingStart="24dp"
-    android:paddingLeft="24dp"
-    android:paddingEnd="24dp"
-    android:paddingRight="24dp"
-    tools:context=".ui.modules.account.AccountItem">
+    android:paddingVertical="8dp"
+    android:paddingHorizontal="16dp"
+    tools:context=".ui.modules.account.AccountAdapter">
 
     <ImageView
         android:id="@+id/accountItemImage"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_centerVertical="true"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_all_account"
         tools:ignore="ContentDescription"
         tools:tint="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/accountItemName"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/accountItemImage"
-        android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
-        android:layout_toEndOf="@id/accountItemImage"
-        android:layout_toRightOf="@id/accountItemImage"
+        android:layout_marginStart="16dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toTopOf="@+id/accountItemImage"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/accountItemSchool"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/accountItemName"
-        android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="3dp"
-        android:layout_toEndOf="@id/accountItemImage"
-        android:layout_toRightOf="@id/accountItemImage"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toBottomOf="@id/accountItemName"
         tools:text="@tools:sample/lorem/random" />
-</RelativeLayout>
+
+    <TextView
+        android:id="@+id/accountItemLoginMode"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="3dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="12sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/accountItemImage"
+        app:layout_constraintTop_toBottomOf="@id/accountItemSchool"
+        tools:text="Tryb API mobilne"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_attendance.xml b/app/src/main/res/layout/item_attendance.xml
index 95a8f0174..e25b51f69 100644
--- a/app/src/main/res/layout/item_attendance.xml
+++ b/app/src/main/res/layout/item_attendance.xml
@@ -1,4 +1,4 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceItemContainer"
@@ -11,57 +11,96 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.attendance.AttendanceItem">
+    tools:context=".ui.modules.attendance.AttendanceAdapter">
 
-    <TextView
-        android:id="@+id/attendanceItemNumber"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_centerVertical="true"
+    <LinearLayout
+        android:id="@+id/attendanceItemNumberContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:gravity="center"
-        android:includeFontPadding="false"
-        android:maxLength="2"
-        android:textSize="32sp"
-        tools:text="5" />
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/attendanceItemDetailsContainer">
 
-    <TextView
-        android:id="@+id/attendanceItemSubject"
-        android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/attendanceItemNumber"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLength="2"
+            android:textSize="32sp"
+            android:visibility="gone"
+            tools:text="5"
+            tools:visibility="visible" />
+
+        <com.google.android.material.checkbox.MaterialCheckBox
+            android:id="@+id/attendanceItemExcuseCheckbox"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:text="@null"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/attendanceItemExcuseInfo"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_excuse_waiting"
+            app:tint="?attr/colorOnSurface" />
+    </LinearLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/attendanceItemDetailsContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toStartOf="@id/attendanceItemAlert"
-        android:layout_toLeftOf="@id/attendanceItemAlert"
-        android:layout_toEndOf="@+id/attendanceItemNumber"
-        android:layout_toRightOf="@+id/attendanceItemNumber"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="17sp"
-        tools:text="Matematyka" />
+        android:layout_marginEnd="10dp"
+        app:layout_constraintEnd_toStartOf="@+id/attendanceItemAlert"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/attendanceItemNumberContainer"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <TextView
-        android:id="@+id/attendanceItemDescription"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@id/attendanceItemSubject"
-        android:layout_alignLeft="@id/attendanceItemSubject"
-        android:layout_alignBottom="@+id/attendanceItemNumber"
-        android:maxLines="1"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="12sp"
-        tools:text="Present" />
+        <TextView
+            android:id="@+id/attendanceItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textSize="17sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Matematyka" />
+
+        <TextView
+            android:id="@+id/attendanceItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textColor="?android:textColorSecondary"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@id/attendanceItemDetailsContainer"
+            app:layout_constraintStart_toStartOf="@id/attendanceItemDetailsContainer"
+            app:layout_constraintTop_toBottomOf="@id/attendanceItemSubject"
+            tools:text="Present" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ImageView
         android:id="@+id/attendanceItemAlert"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
+        app:layout_constraintBottom_toBottomOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/attendanceItemDetailsContainer"
+        app:layout_constraintTop_toTopOf="@+id/attendanceItemDetailsContainer"
         app:srcCompat="@drawable/ic_all_mark"
         app:tint="?colorPrimary"
         tools:ignore="contentDescription" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_attendance_summary.xml b/app/src/main/res/layout/item_attendance_summary.xml
index b49461955..155526299 100644
--- a/app/src/main/res/layout/item_attendance_summary.xml
+++ b/app/src/main/res/layout/item_attendance_summary.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -20,7 +21,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="January" />
@@ -46,7 +46,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_present"
             android:textSize="14sp" />
@@ -57,9 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="50" />
@@ -77,7 +74,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_unexcused"
             android:textSize="14sp" />
@@ -88,9 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -108,7 +102,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_excused"
             android:textSize="14sp" />
@@ -119,9 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="25" />
@@ -139,7 +130,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_absence_school"
             android:textSize="14sp" />
@@ -150,9 +140,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -170,7 +158,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_exemption"
             android:textSize="14sp" />
@@ -181,9 +168,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="6" />
@@ -201,7 +186,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_unexcused_lateness"
             android:textSize="14sp" />
@@ -212,9 +196,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
@@ -232,7 +214,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/attendance_excused_lateness"
             android:textSize="14sp" />
@@ -243,9 +224,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="0" />
diff --git a/app/src/main/res/layout/item_attendance_summary_subject.xml b/app/src/main/res/layout/item_attendance_summary_subject.xml
index 263c08a73..ff731461d 100644
--- a/app/src/main/res/layout/item_attendance_summary_subject.xml
+++ b/app/src/main/res/layout/item_attendance_summary_subject.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/attendanceSummaryItemSubject"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
     android:gravity="start"
     android:maxLines="1"
     android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout/item_completed_lesson.xml b/app/src/main/res/layout/item_completed_lesson.xml
index 8b49ba765..e9944f56f 100644
--- a/app/src/main/res/layout/item_completed_lesson.xml
+++ b/app/src/main/res/layout/item_completed_lesson.xml
@@ -3,21 +3,20 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/ic_all_divider"
-    android:foreground="?selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:paddingStart="8dp"
-    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
-    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.completed.CompletedLessonItem"
-    tools:ignore="UnusedAttribute">
+    tools:context=".ui.modules.timetable.completed.CompletedLessonsAdapter">
 
     <TextView
         android:id="@+id/completedLessonItemNumber"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:layout_centerVertical="true"
         android:gravity="center"
         android:includeFontPadding="false"
@@ -32,13 +31,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
         android:layout_toStartOf="@id/completedLessonItemAlert"
-        android:layout_toLeftOf="@id/completedLessonItemAlert"
         android:layout_toEndOf="@+id/completedLessonItemNumber"
-        android:layout_toRightOf="@+id/completedLessonItemNumber"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -48,13 +43,10 @@
         android:id="@+id/completedLessonItemTopic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/completedLessonItemSubject"
         android:layout_alignStart="@id/completedLessonItemSubject"
-        android:layout_alignLeft="@id/completedLessonItemSubject"
         android:layout_alignEnd="@+id/completedLessonItemAlert"
-        android:layout_alignRight="@+id/completedLessonItemAlert"
-        android:layout_alignBottom="@+id/completedLessonItemNumber"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
@@ -66,9 +58,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:tint="?colorTimetableChange"
         app:srcCompat="@drawable/ic_timetable_swap"
+        app:tint="?colorTimetableChange"
         tools:ignore="contentDescription" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
new file mode 100644
index 000000000..9b1263438
--- /dev/null
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:minHeight="56dp"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.contributor.ContributorAdapter">
+
+    <ImageView
+        android:id="@+id/creatorItemAvatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:contentDescription="@string/contributor_avatar_description"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/creatorItemName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toEndOf="@id/creatorItemAvatar"
+        android:gravity="bottom"
+        android:textSize="16sp"
+        tools:text="@tools:sample/lorem" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_exam.xml b/app/src/main/res/layout/item_exam.xml
index 459a7ecb3..bd1d47312 100644
--- a/app/src/main/res/layout/item_exam.xml
+++ b/app/src/main/res/layout/item_exam.xml
@@ -4,14 +4,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.exam.ExamItem">
+    tools:context=".ui.modules.exam.ExamAdapter">
 
     <TextView
         android:id="@+id/examItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginLeft="20dp"
         android:layout_marginTop="10dp"
         android:textSize="15sp"
         tools:text="@tools:sample/lorem" />
@@ -22,7 +21,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignStart="@id/examItemSubject"
-        android:layout_alignLeft="@id/examItemSubject"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:textSize="13sp"
@@ -34,15 +32,11 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/examItemSubject"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
         android:layout_marginBottom="10dp"
         android:layout_toEndOf="@id/examItemType"
-        android:layout_toRightOf="@id/examItemType"
         android:gravity="end"
         android:textSize="13sp"
         tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/layout/item_grade_details.xml b/app/src/main/res/layout/item_grade_details.xml
index d6d99d9b8..2f3bd2de5 100644
--- a/app/src/main/res/layout/item_grade_details.xml
+++ b/app/src/main/res/layout/item_grade_details.xml
@@ -1,82 +1,102 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/grade_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingLeft="12dp"
-    android:paddingTop="7dp"
-    android:paddingEnd="12dp"
-    android:paddingRight="12dp"
-    android:paddingBottom="7dp"
-    tools:context=".ui.modules.grade.details.GradeDetailsItem">
+    android:background="?android:windowBackground">
 
-    <TextView
-        android:id="@+id/gradeItemValue"
-        android:layout_width="45dp"
-        android:layout_height="40dp"
-        android:layout_centerVertical="true"
-        android:background="@color/grade_material_default"
-        android:gravity="center"
-        android:maxLength="5"
-        android:textColor="@android:color/white"
-        android:textSize="16sp"
-        tools:text="6" />
-
-    <TextView
-        android:id="@+id/gradeItemDescription"
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gradeSubItemContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeItemNote"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toEndOf="@+id/gradeItemValue"
-        android:layout_toRightOf="@+id/gradeItemValue"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="14sp"
-        tools:text="@tools:sample/lorem" />
+        android:background="?selectableItemBackground"
+        android:paddingStart="12dp"
+        android:paddingTop="7dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="7dp"
+        tools:context=".ui.modules.grade.details.GradeDetailsAdapter">
 
-    <TextView
-        android:id="@+id/gradeItemDate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/gradeItemDescription"
-        android:layout_alignLeft="@+id/gradeItemDescription"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:textSize="12sp"
-        tools:text="@tools:sample/lorem" />
+        <TextView
+            android:id="@+id/gradeItemValue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/grade_material_default"
+            android:gravity="center"
+            android:maxLength="5"
+            android:minWidth="45dp"
+            android:minHeight="40dp"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+            app:layout_constraintEnd_toStartOf="@+id/gradeDetailsContainer"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
+            tools:text="6" />
 
-    <TextView
-        android:id="@+id/gradeItemWeight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/gradeItemValue"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_toStartOf="@id/gradeItemNote"
-        android:layout_toLeftOf="@id/gradeItemNote"
-        android:layout_toEndOf="@+id/gradeItemDate"
-        android:layout_toRightOf="@+id/gradeItemDate"
-        android:textSize="12sp"
-        tools:text="@tools:sample/lorem" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/gradeDetailsContainer"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/gradeItemNote"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/gradeItemValue"
+            app:layout_constraintTop_toTopOf="parent">
 
-    <ImageView
-        android:id="@+id/gradeItemNote"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="10dp"
-        app:srcCompat="@drawable/ic_all_round_mark"
-        app:tint="?colorPrimary"
-        tools:ignore="contentDescription" />
-</RelativeLayout>
+            <TextView
+                android:id="@+id/gradeItemDescription"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="20dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="@id/gradeDetailsContainer"
+                app:layout_constraintStart_toStartOf="@id/gradeDetailsContainer"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="@tools:sample/lorem" />
+
+            <TextView
+                android:id="@+id/gradeItemDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+                app:layout_constraintStart_toStartOf="@+id/gradeItemDescription"
+                app:layout_constraintTop_toBottomOf="@+id/gradeItemDescription"
+                tools:text="@tools:sample/date/ddmmyy" />
+
+            <TextView
+                android:id="@+id/gradeItemWeight"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="10dp"
+                android:layout_marginEnd="20dp"
+                android:maxLines="1"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+                app:layout_constraintEnd_toEndOf="@id/gradeDetailsContainer"
+                app:layout_constraintStart_toEndOf="@+id/gradeItemDate"
+                app:layout_constraintTop_toBottomOf="@+id/gradeItemDescription"
+                tools:text="@tools:sample/lorem" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <ImageView
+            android:id="@+id/gradeItemNote"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/gradeDetailsContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/gradeDetailsContainer"
+            app:layout_constraintTop_toTopOf="@+id/gradeDetailsContainer"
+            app:srcCompat="@drawable/ic_all_round_mark"
+            app:tint="?colorPrimary"
+            tools:ignore="contentDescription" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_bar.xml b/app/src/main/res/layout/item_grade_statistics_bar.xml
new file mode 100644
index 000000000..4557412f5
--- /dev/null
+++ b/app/src/main/res/layout/item_grade_statistics_bar.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/gradeStatisticsBarTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorControlHighlight"
+        android:paddingLeft="20dp"
+        android:paddingTop="10dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        tools:text="Matematyka" />
+
+    <com.github.mikephil.charting.charts.BarChart
+        android:id="@+id/gradeStatisticsBar"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:layout_margin="10dp"
+        android:background="?android:windowBackground"
+        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_statistics_pie.xml b/app/src/main/res/layout/item_grade_statistics_pie.xml
new file mode 100644
index 000000000..15992a37e
--- /dev/null
+++ b/app/src/main/res/layout/item_grade_statistics_pie.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/gradeStatisticsPieTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorControlHighlight"
+        android:paddingLeft="20dp"
+        android:paddingTop="10dp"
+        android:paddingRight="20dp"
+        android:paddingBottom="10dp"
+        android:textSize="18sp"
+        tools:text="Matematyka" />
+
+    <com.github.mikephil.charting.charts.PieChart
+        android:id="@+id/gradeStatisticsPie"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:layout_margin="10dp"
+        android:background="?android:windowBackground"
+        tools:context=".ui.modules.grade.statistics.GradeStatisticsAdapter" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_grade_summary.xml b/app/src/main/res/layout/item_grade_summary.xml
index a3a49ab62..85a78571e 100644
--- a/app/src/main/res/layout/item_grade_summary.xml
+++ b/app/src/main/res/layout/item_grade_summary.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    tools:context=".ui.modules.grade.summary.GradeSummaryItem">
+    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,7 +21,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
             android:layout_weight="1"
             android:textSize="17sp"
             tools:text="@tools:sample/lorem" />
@@ -48,7 +47,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_points"
             android:textSize="14sp" />
@@ -59,9 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="123/150" />
@@ -79,7 +75,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_predicted_grade"
             android:textSize="14sp" />
@@ -90,9 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
@@ -110,7 +103,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:layout_marginLeft="20dp"
             android:layout_weight="1"
             android:text="@string/grade_summary_final_grade"
             android:textSize="14sp" />
@@ -121,9 +113,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="25dp"
-            android:layout_marginRight="25dp"
             android:gravity="end"
             android:textSize="12sp"
             tools:text="5" />
diff --git a/app/src/main/res/layout/item_homework.xml b/app/src/main/res/layout/item_homework.xml
index 68169039d..89c3c6885 100644
--- a/app/src/main/res/layout/item_homework.xml
+++ b/app/src/main/res/layout/item_homework.xml
@@ -1,50 +1,83 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/homework_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.homework.HomeworkItem">
+    tools:context=".ui.modules.homework.HomeworkAdapter">
 
     <TextView
         android:id="@+id/homeworkItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
         android:layout_marginBottom="5dp"
-        android:textSize="17sp"
-        tools:text="@tools:sample/lorem" />
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toStartOf="@+id/homeworkItemTeacher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/homeworkItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_toEndOf="@id/homeworkItemSubject"
-        android:layout_toRightOf="@id/homeworkItemSubject"
+        android:ellipsize="end"
         android:gravity="end"
+        android:maxWidth="200dp"
+        android:minWidth="80dp"
+        android:singleLine="true"
         android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/homeworkItemSubject"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/homeworkItemContent"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/homeworkItemSubject"
-        android:layout_alignStart="@id/homeworkItemSubject"
-        android:layout_alignLeft="@id/homeworkItemSubject"
-        android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="50dp"
         android:layout_marginBottom="15dp"
+        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
+        android:maxLines="2"
         android:textSize="14sp"
-        tools:text="@tools:sample/lorem" />
-</RelativeLayout>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/homeworkItemSubject"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemSubject"
+        tools:text="@tools:sample/lorem/random" />
+
+    <ImageView
+        android:id="@+id/homeworkItemCheckImage"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
+        app:srcCompat="@drawable/ic_check"
+        app:tint="?android:textColorSecondary"
+        tools:ignore="ContentDescription"
+        tools:visibility="gone" />
+
+    <ImageView
+        android:id="@+id/homeworkItemAttachmentImage"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="@id/homeworkItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/homeworkItemTeacher"
+        app:srcCompat="@drawable/ic_attachment"
+        app:tint="?android:textColorSecondary"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachment.xml b/app/src/main/res/layout/item_homework_dialog_attachment.xml
new file mode 100644
index 000000000..ec0b37f2f
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_attachment.xml
@@ -0,0 +1,21 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="20dp"
+    android:paddingTop="3dp"
+    android:paddingEnd="10dp"
+    android:paddingBottom="3dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/homeworkDialogAttachment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="10dp"
+        android:textSize="12sp"
+        app:drawableStartCompat="@drawable/ic_attachment"
+        app:drawableTint="?colorOnBackground"
+        tools:text="@tools:sample/lorem" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_attachments_header.xml b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
new file mode 100644
index 000000000..383cbeaf7
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_attachments_header.xml
@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="20dp"
+    android:paddingEnd="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="3dp"
+        android:text="@string/homework_attachments"
+        android:textSize="17sp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_homework_dialog_details.xml b/app/src/main/res/layout/item_homework_dialog_details.xml
new file mode 100644
index 000000000..3b5705bf8
--- /dev/null
+++ b/app/src/main/res/layout/item_homework_dialog_details.xml
@@ -0,0 +1,124 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingStart="20dp"
+    android:paddingTop="20dp"
+    android:paddingEnd="20dp">
+
+    <ImageButton
+        android:id="@+id/homework_dialog_full_screen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="5dp"
+        app:srcCompat="@drawable/ic_fullscreen"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
+
+    <ImageButton
+        android:id="@+id/homework_dialog_full_screen_exit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="5dp"
+        android:visibility="gone"
+        app:srcCompat="@drawable/ic_fullscreen_exit"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="@string/all_details"
+        android:textSize="20sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/all_subject"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_teacher"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogTeacher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_date"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_entry_date"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogEntryDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/all_content"
+        android:textSize="17sp" />
+
+    <TextView
+        android:id="@+id/homeworkDialogContent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="10dp"
+        android:autoLink="web"
+        android:lineSpacingMultiplier="1.2"
+        android:text="@string/all_no_data"
+        android:textIsSelectable="true"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem/random" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_license.xml b/app/src/main/res/layout/item_license.xml
index 6a864433a..cb55ab87a 100644
--- a/app/src/main/res/layout/item_license.xml
+++ b/app/src/main/res/layout/item_license.xml
@@ -2,26 +2,32 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
     android:background="?selectableItemBackground"
     android:orientation="vertical"
     android:paddingStart="16dp"
     android:paddingLeft="16dp"
     android:paddingEnd="16dp"
-    android:paddingRight="16dp">
+    android:paddingRight="16dp"
+    tools:context=".ui.modules.about.license.LicenseAdapter">
 
     <TextView
         android:id="@+id/licenseItemName"
         android:layout_width="match_parent"
-        android:layout_height="28dp"
+        android:layout_height="wrap_content"
+        android:minHeight="28dp"
+        android:ellipsize="end"
         android:gravity="bottom"
+        android:singleLine="true"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/licenseItemSummary"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/item_login_student_select.xml b/app/src/main/res/layout/item_login_student_select.xml
index 254bff60f..1003636fc 100644
--- a/app/src/main/res/layout/item_login_student_select.xml
+++ b/app/src/main/res/layout/item_login_student_select.xml
@@ -2,29 +2,29 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/loginItemContainer"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:background="?selectableItemBackground">
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:minHeight="72dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    tools:context=".ui.modules.login.studentselect.LoginStudentSelectAdapter">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/loginItemCheck"
         android:layout_width="32dp"
         android:layout_height="24dp"
+        android:layout_centerVertical="true"
         android:layout_marginStart="12dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginTop="24dp"
         android:layout_marginEnd="28dp"
-        android:layout_marginRight="28dp"
         android:background="@android:color/transparent"
         tools:text=" " />
 
     <TextView
         android:id="@+id/loginItemName"
         android:layout_width="wrap_content"
-        android:layout_height="32dp"
+        android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
-        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
@@ -34,16 +34,32 @@
     <TextView
         android:id="@+id/loginItemSchool"
         android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
         android:layout_below="@id/loginItemName"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:layout_toEndOf="@id/loginItemCheck"
-        android:layout_toRightOf="@id/loginItemCheck"
         android:ellipsize="end"
         android:gravity="bottom"
-        android:maxLines="1"
+        android:maxLines="2"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
         tools:text="@tools:sample/lorem/random" />
+
+    <TextView
+        android:id="@+id/loginItemSignedIn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
+        android:layout_below="@id/loginItemSchool"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/loginItemCheck"
+        android:ellipsize="end"
+        android:enabled="false"
+        android:gravity="bottom"
+        android:maxLines="1"
+        android:text="@string/login_signed_in"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        android:visibility="gone"
+        tools:visibility="visible" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index ad914130a..111de88c9 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -1,5 +1,7 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
@@ -7,45 +9,56 @@
     android:paddingTop="10dp"
     android:paddingRight="16dp"
     android:paddingBottom="10dp"
-    tools:context=".ui.modules.message.MessageItem">
+    tools:context=".ui.modules.message.tab.MessageTabAdapter">
 
     <TextView
         android:id="@+id/messageItemAuthor"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
+        android:layout_marginEnd="10dp"
         android:ellipsize="end"
-        android:maxLines="1"
+        android:singleLine="true"
         android:textSize="15sp"
-        tools:text="@tools:sample/full_names" />
+        app:layout_constraintEnd_toStartOf="@+id/messageItemDate"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/messageItemDate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_toEndOf="@id/messageItemAuthor"
-        android:layout_toRightOf="@id/messageItemAuthor"
         android:gravity="end"
         android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/messageItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/messageItemAuthor"
-        android:layout_alignStart="@id/messageItemAuthor"
-        android:layout_alignLeft="@id/messageItemAuthor"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="10dp"
         android:ellipsize="end"
-        android:maxLines="1"
+        android:singleLine="true"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
+        app:layout_constraintEnd_toStartOf="@id/messageItemAttachmentIcon"
+        app:layout_constraintStart_toStartOf="@id/messageItemAuthor"
+        app:layout_constraintTop_toBottomOf="@+id/messageItemAuthor"
+        app:layout_goneMarginEnd="0dp"
         tools:text="@tools:sample/lorem/random" />
-</RelativeLayout>
+
+    <ImageView
+        android:id="@+id/messageItemAttachmentIcon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/messageItemSubject"
+        app:layout_constraintEnd_toEndOf="@id/messageItemDate"
+        app:srcCompat="@drawable/ic_attachment"
+        app:tint="?colorOnBackground"
+        tools:ignore="ContentDescription"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_message_attachment.xml b/app/src/main/res/layout/item_message_attachment.xml
new file mode 100644
index 000000000..fa30e9af2
--- /dev/null
+++ b/app/src/main/res/layout/item_message_attachment.xml
@@ -0,0 +1,22 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="10dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/messagePreviewAttachment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="10dp"
+        android:visibility="gone"
+        app:drawableStartCompat="@drawable/ic_attachment"
+        app:drawableTint="?colorOnBackground"
+        tools:text="@tools:sample/lorem"
+        tools:visibility="visible" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_message_divider.xml b/app/src/main/res/layout/item_message_divider.xml
new file mode 100644
index 000000000..2f4ad3e67
--- /dev/null
+++ b/app/src/main/res/layout/item_message_divider.xml
@@ -0,0 +1,6 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="2dp"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="10dp"
+    android:background="?android:attr/listDivider" />
diff --git a/app/src/main/res/layout/item_message_preview.xml b/app/src/main/res/layout/item_message_preview.xml
new file mode 100644
index 000000000..83a4406bb
--- /dev/null
+++ b/app/src/main/res/layout/item_message_preview.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/messagePreviewContentContainer"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/messagePreviewSubject"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:lineSpacingMultiplier="1.2"
+        android:textSize="22sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
+
+    <TextView
+        android:id="@+id/messagePreviewFromLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:text="@string/message_from"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/messagePreviewSubject" />
+
+    <TextView
+        android:id="@+id/messagePreviewFromSender"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/messagePreviewFromLabel"
+        app:layout_constraintTop_toTopOf="@id/messagePreviewFromLabel"
+        tools:text="@tools:sample/full_names[0]" />
+
+    <TextView
+        android:id="@+id/messagePreviewToLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:text="@string/message_to"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/messagePreviewFromLabel" />
+
+    <TextView
+        android:id="@+id/messagePreviewToRecipient"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/messagePreviewToLabel"
+        app:layout_constraintTop_toTopOf="@id/messagePreviewToLabel"
+        tools:text="@tools:sample/full_names[1]" />
+
+    <TextView
+        android:id="@+id/messagePreviewDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="15sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/messagePreviewToLabel"
+        tools:text="@tools:sample/date/ddmmyy" />
+
+    <TextView
+        android:id="@+id/messagePreviewContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp"
+        android:autoLink="web"
+        android:lineSpacingMultiplier="1.2"
+        android:textIsSelectable="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/messagePreviewDate"
+        tools:text="@tools:sample/lorem/random" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_mobile_device.xml b/app/src/main/res/layout/item_mobile_device.xml
index 95159d9bd..f49c62f38 100644
--- a/app/src/main/res/layout/item_mobile_device.xml
+++ b/app/src/main/res/layout/item_mobile_device.xml
@@ -3,32 +3,33 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mobileDevice_subitem_container"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
-    tools:context=".ui.modules.mobiledevice.MobileDeviceItem">
+    android:layout_height="wrap_content"
+    android:minHeight="64dp"
+    tools:context=".ui.modules.mobiledevice.MobileDeviceAdapter">
 
     <TextView
         android:id="@+id/mobileDeviceItemName"
         android:layout_width="match_parent"
-        android:layout_height="32dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginTop="0dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
-        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:ellipsize="end"
         android:gravity="bottom"
         android:maxLines="1"
+        android:minHeight="32dp"
         android:textSize="16sp"
         tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/mobileDeviceItemDate"
         android:layout_width="match_parent"
-        android:layout_height="20dp"
+        android:layout_height="wrap_content"
+        android:minHeight="20dp"
         android:layout_below="@id/mobileDeviceItemName"
         android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
         android:layout_toStartOf="@id/mobileDeviceItemUnregister"
-        android:layout_toLeftOf="@id/mobileDeviceItemUnregister"
         android:gravity="bottom"
         android:textColor="?android:textColorSecondary"
         android:textSize="14sp"
@@ -39,7 +40,6 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginStart="4dp"
         android:layout_marginLeft="4dp"
diff --git a/app/src/main/res/layout/item_more.xml b/app/src/main/res/layout/item_more.xml
index 6a941b96d..c9063ccfe 100644
--- a/app/src/main/res/layout/item_more.xml
+++ b/app/src/main/res/layout/item_more.xml
@@ -10,7 +10,7 @@
     android:paddingTop="8dp"
     android:paddingRight="16dp"
     android:paddingBottom="8dp"
-    tools:context=".ui.modules.more.MoreItem">
+    tools:context=".ui.modules.more.MoreAdapter">
 
     <ImageView
         android:id="@+id/moreItemImage"
@@ -27,7 +27,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="32dp"
-        android:layout_marginLeft="32dp"
         android:textSize="16sp"
         tools:text="@tools:sample/lorem" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_note.xml b/app/src/main/res/layout/item_note.xml
index a5d3e3623..660f32e00 100644
--- a/app/src/main/res/layout/item_note.xml
+++ b/app/src/main/res/layout/item_note.xml
@@ -1,61 +1,84 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/note_subitem_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
-    tools:context=".ui.modules.note.NoteItem">
+    tools:context=".ui.modules.note.NoteAdapter">
 
     <TextView
         android:id="@+id/noteItemDate"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="15dp"
-        android:layout_marginLeft="15dp"
         android:layout_marginTop="10dp"
+        android:textColor="?android:textColorSecondary"
         android:textSize="15sp"
+        app:layout_constraintRight_toLeftOf="@+id/noteItemTeacher"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/ddmmyy" />
 
     <TextView
         android:id="@+id/noteItemTeacher"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="10dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
-        android:layout_toEndOf="@id/noteItemDate"
-        android:layout_toRightOf="@id/noteItemDate"
+        android:ellipsize="end"
         android:gravity="end"
+        android:singleLine="true"
         android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/noteItemDate"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
     <TextView
         android:id="@+id/noteItemType"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/noteItemDate"
-        android:layout_alignStart="@id/noteItemDate"
-        android:layout_alignLeft="@id/noteItemDate"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="5dp"
-        android:textSize="13sp"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textSize="16sp"
+        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
+        app:layout_constraintRight_toLeftOf="@id/noteItemPoints"
+        app:layout_constraintTop_toBottomOf="@id/noteItemDate"
+        app:layout_goneMarginEnd="0dp"
         tools:text="@tools:sample/lorem" />
 
     <TextView
-        android:id="@+id/noteItemContent"
-        android:layout_width="wrap_content"
+        android:id="@+id/noteItemPoints"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_below="@id/noteItemType"
-        android:layout_alignStart="@id/noteItemDate"
-        android:layout_alignLeft="@id/noteItemDate"
-        android:layout_marginEnd="15dp"
-        android:layout_marginRight="15dp"
+        android:layout_marginTop="8dp"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:visibility="gone"
+        app:layout_constraintRight_toRightOf="@id/noteItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/noteItemTeacher"
+        tools:text="-5"
+        tools:textColor="@color/note_positive"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/noteItemContent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
         android:layout_marginBottom="15dp"
+        android:ellipsize="end"
         android:lineSpacingMultiplier="1.2"
+        android:maxLines="2"
         android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/noteItemDate"
+        app:layout_constraintRight_toRightOf="@+id/noteItemTeacher"
+        app:layout_constraintTop_toBottomOf="@id/noteItemType"
         tools:text="@tools:sample/lorem/random" />
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_teacher.xml b/app/src/main/res/layout/item_teacher.xml
index 3bac0573c..a30eb560b 100644
--- a/app/src/main/res/layout/item_teacher.xml
+++ b/app/src/main/res/layout/item_teacher.xml
@@ -9,7 +9,7 @@
     android:paddingEnd="12dp"
     android:paddingRight="12dp"
     android:paddingBottom="7dp"
-    tools:context=".ui.modules.schoolandteachers.teacher.TeacherItem">
+    tools:context=".ui.modules.schoolandteachers.teacher.TeacherAdapter">
 
     <TextView
         android:id="@+id/teacherItemName"
@@ -17,7 +17,6 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
@@ -28,11 +27,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
         android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
         android:layout_toEndOf="@+id/teacherItemName"
-        android:layout_toRightOf="@+id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="17sp"
@@ -44,7 +40,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/teacherItemName"
         android:layout_alignStart="@id/teacherItemName"
-        android:layout_alignLeft="@id/teacherItemName"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="12sp"
diff --git a/app/src/main/res/layout/item_timetable.xml b/app/src/main/res/layout/item_timetable.xml
index fcdae2e0a..7a90d5e74 100644
--- a/app/src/main/res/layout/item_timetable.xml
+++ b/app/src/main/res/layout/item_timetable.xml
@@ -1,120 +1,174 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relativeLayout2"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
     android:paddingStart="8dp"
-    android:paddingLeft="8dp"
     android:paddingTop="6dp"
     android:paddingEnd="12dp"
-    android:paddingRight="12dp"
     android:paddingBottom="6dp"
-    tools:context=".ui.modules.timetable.TimetableItem">
+    tools:context=".ui.modules.timetable.TimetableAdapter">
 
     <TextView
         android:id="@+id/timetableItemNumber"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:minWidth="40dp"
+        android:minHeight="40dp"
         android:gravity="center"
         android:includeFontPadding="false"
         android:maxLength="2"
-        android:textSize="32sp"
         android:textColor="?android:textColorPrimary"
+        android:textSize="32sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="5" />
 
     <TextView
         android:id="@+id/timetableItemSubject"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginEnd="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
+        android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:maxLines="1"
-        android:textSize="15sp"
         android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        app:layout_constraintEnd_toStartOf="@id/timetableItemTimeBarrier"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem" />
 
     <TextView
         android:id="@+id/timetableItemTimeStart"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/timetableItemNumber"
-        android:layout_toRightOf="@id/timetableItemNumber"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
-        android:layout_alignTop="@id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
+        app:layout_constraintTop_toTopOf="@id/timetableItemNumber"
         tools:text="11:11" />
 
     <TextView
         android:id="@+id/timetableItemTimeFinish"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/timetableItemNumber"
-        android:layout_toRightOf="@id/timetableItemNumber"
-        android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
-        android:layout_alignBottom="@+id/timetableItemNumber"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@id/timetableItemNumber"
         tools:text="12:00" />
 
     <TextView
         android:id="@+id/timetableItemRoom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTimeStart"
         tools:text="22"
-        tools:visibility="gone" />
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/timetableItemGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="5dp"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@+id/timetableItemTeacher"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemRoom"
+        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
+        tools:text="(2/2)"
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/timetableItemTeacher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/timetableItemNumber"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@id/timetableItemRoom"
-        android:layout_toRightOf="@id/timetableItemRoom"
-        android:maxLines="1"
         android:ellipsize="end"
+        android:maxLines="1"
         android:textColor="?android:textColorSecondary"
         android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/timetableItemNumber"
+        app:layout_constraintStart_toEndOf="@id/timetableItemGroup"
         tools:text="Agata Kowalska - Błaszczyk"
-        tools:visibility="gone" />
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/timetableItemDescription"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/timetableItemTimeFinish"
         android:layout_marginStart="10dp"
-        android:layout_marginLeft="10dp"
         android:layout_marginTop="0dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_toEndOf="@+id/timetableItemTimeStart"
-        android:layout_toRightOf="@+id/timetableItemTimeStart"
         android:textColor="?colorTimetableChange"
         android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/timetableItemTeacher"
+        app:layout_constraintTop_toTopOf="@+id/timetableItemTimeFinish"
         tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
         tools:visibility="visible" />
 
-</RelativeLayout>
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/timetableItemTimeBarrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="start"
+        app:constraint_referenced_ids="timetableItemTimeUntil,timetableItemTimeLeft" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeUntil"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:textColor="?colorPrimary"
+        android:textSize="13sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="za 15 min"
+        tools:visibility="gone" />
+
+    <TextView
+        android:id="@+id/timetableItemTimeLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="4dp"
+        android:background="@drawable/background_timetable_time_left"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:paddingLeft="7dp"
+        android:paddingTop="2dp"
+        android:paddingRight="7dp"
+        android:paddingBottom="2dp"
+        android:textColor="?colorOnPrimary"
+        android:textSize="13sp"
+        android:visibility="gone"
+        app:backgroundTint="?colorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="jeszcze 15 min"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_timetable_small.xml b/app/src/main/res/layout/item_timetable_small.xml
new file mode 100644
index 000000000..037c10d5d
--- /dev/null
+++ b/app/src/main/res/layout/item_timetable_small.xml
@@ -0,0 +1,84 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    tools:context=".ui.modules.timetable.TimetableAdapter">
+
+    <TextView
+        android:id="@+id/timetableSmallItemNumber"
+        android:layout_width="wrap_content"
+        android:minWidth="40dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:gravity="center"
+        android:maxLength="2"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        tools:text="5" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemTimeStart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/timetableSmallItemNumber"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@id/timetableSmallItemNumber"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="11:11" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemSubject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="10dp"
+        android:layout_toEndOf="@+id/timetableSmallItemTimeStart"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="15sp"
+        tools:text="Sieci komputerowe" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemRoom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@+id/timetableSmallItemSubject"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="22" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemTeacher"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_toEndOf="@id/timetableSmallItemRoom"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="Agata" />
+
+    <TextView
+        android:id="@+id/timetableSmallItemDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginEnd="16dp"
+        android:layout_toEndOf="@id/timetableSmallItemTeacher"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="13sp"
+        tools:text="zastępstwo jakieś tam gdzieś tam" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index c69bade8a..33f686dac 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -12,12 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@android:color/white"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="6dp"
         android:paddingStart="6dp"
+        android:paddingLeft="6dp"
+        android:paddingTop="6dp"
         android:paddingEnd="12dp"
-        android:paddingRight="12dp">
+        android:paddingRight="12dp"
+        android:paddingBottom="6dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
@@ -26,8 +26,8 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
+            android:textColor="?android:textColorPrimary"
             android:textSize="28sp"
-            android:textColor="@android:color/black"
             tools:text="5" />
 
         <TextView
@@ -43,19 +43,19 @@
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textSize="15sp"
             android:textColor="@android:color/black"
+            android:textSize="15sp"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignTop="@id/timetableWidgetItemNumber"
+            android:layout_marginStart="6dp"
+            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
             android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
-            android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/black"
             android:textSize="13sp"
@@ -116,15 +116,15 @@
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
+            android:layout_marginTop="0dp"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
-            android:layout_marginTop="0dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
             android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_dark"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone"/>
+            tools:visibility="gone" />
     </RelativeLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/item_widget_timetable_dark.xml b/app/src/main/res/layout/item_widget_timetable_dark.xml
index 3a143f747..34535c694 100644
--- a/app/src/main/res/layout/item_widget_timetable_dark.xml
+++ b/app/src/main/res/layout/item_widget_timetable_dark.xml
@@ -12,22 +12,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/colorWidgetBackground"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp"
-        android:paddingLeft="6dp"
         android:paddingStart="6dp"
+        android:paddingTop="6dp"
         android:paddingEnd="12dp"
-        android:paddingRight="12dp">
+        android:paddingBottom="6dp">
 
         <TextView
             android:id="@+id/timetableWidgetItemNumber"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="40dp"
+            android:minHeight="40dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:maxLength="2"
-            android:textSize="28sp"
             android:textColor="@android:color/white"
+            android:textSize="28sp"
             tools:text="5" />
 
         <TextView
@@ -36,26 +36,21 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginEnd="40dp"
-            android:layout_marginRight="40dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textSize="15sp"
             android:textColor="@android:color/white"
+            android:textSize="15sp"
             tools:text="@tools:sample/lorem" />
 
         <TextView
             android:id="@+id/timetableWidgetItemTimeStart"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
-            android:layout_marginLeft="6dp"
-            android:layout_marginStart="6dp"
             android:layout_alignTop="@id/timetableWidgetItemNumber"
+            android:layout_marginStart="6dp"
+            android:layout_toEndOf="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -67,9 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="6dp"
-            android:layout_marginLeft="6dp"
             android:layout_toEndOf="@id/timetableWidgetItemNumber"
-            android:layout_toRightOf="@id/timetableWidgetItemNumber"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -81,9 +74,7 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:maxLines="1"
             android:textColor="@android:color/white"
             android:textSize="13sp"
@@ -96,11 +87,8 @@
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/timetableWidgetItemNumber"
             android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_toEndOf="@id/timetableWidgetItemRoom"
-            android:layout_toRightOf="@id/timetableWidgetItemRoom"
             android:ellipsize="end"
             android:maxLines="1"
             android:textColor="@color/timetable_change_light"
@@ -115,16 +103,13 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/timetableWidgetItemTimeFinish"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:layout_marginTop="0dp"
+            android:layout_marginEnd="16dp"
             android:layout_toEndOf="@+id/timetableWidgetItemTimeStart"
-            android:layout_toRightOf="@+id/timetableWidgetItemTimeStart"
             android:textColor="@color/timetable_change_light"
             android:textSize="13sp"
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
-            tools:visibility="gone"/>
+            tools:visibility="gone" />
     </RelativeLayout>
 
     <FrameLayout
diff --git a/app/src/main/res/layout/item_widget_timetable_small.xml b/app/src/main/res/layout/item_widget_timetable_small.xml
new file mode 100644
index 000000000..36a6bbddf
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_small.xml
@@ -0,0 +1,98 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/white"
+    android:orientation="vertical"
+    android:paddingStart="6dp"
+    android:paddingLeft="6dp"
+    android:paddingEnd="6dp"
+    android:paddingRight="6dp"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="wrap_content"
+            android:minWidth="40dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLength="2"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="5" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="13sp"
+            tools:text="11:11" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeFinish"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="Sieci komputerowe" />
+
+
+        <TextView
+            android:id="@+id/timetableWidgetItemRoom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="22" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            tools:text="Agata" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            android:visibility="visible"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/colorDivider" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_widget_timetable_small_dark.xml b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
new file mode 100644
index 000000000..a02d85850
--- /dev/null
+++ b/app/src/main/res/layout/item_widget_timetable_small_dark.xml
@@ -0,0 +1,97 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorWidgetBackground"
+    android:orientation="vertical"
+    android:paddingStart="6dp"
+    android:paddingLeft="6dp"
+    android:paddingEnd="6dp"
+    android:paddingRight="6dp"
+    tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/timetableWidgetItemNumber"
+            android:layout_width="wrap_content"
+            android:minWidth="40dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLength="2"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="5" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeStart"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="13sp"
+            tools:text="11:11" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTimeFinish"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemSubject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="Sieci komputerowe" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemRoom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="22" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemTeacher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            tools:text="Agata" />
+
+        <TextView
+            android:id="@+id/timetableWidgetItemDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textColor="@android:color/white"
+            android:textSize="15sp"
+            android:visibility="visible"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/colorDividerInverse" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/scrollable_header_about.xml b/app/src/main/res/layout/scrollable_header_about.xml
index 9b7bb7324..e203d98d4 100644
--- a/app/src/main/res/layout/scrollable_header_about.xml
+++ b/app/src/main/res/layout/scrollable_header_about.xml
@@ -3,15 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="104dp"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:minHeight="104dp"
+    android:orientation="vertical"
+    tools:context=".ui.modules.about.AboutAdapter">
 
     <ImageView
         android:id="@+id/aboutScrollableHeaderIcon"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginEnd="24dp"
-        android:layout_marginRight="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/scrollable_header_attendance_summary.xml b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
index 94de11076..4593a5b6a 100644
--- a/app/src/main/res/layout/scrollable_header_attendance_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_attendance_summary.xml
@@ -6,7 +6,8 @@
     android:layout_marginTop="20dp"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:context=".ui.modules.attendance.summary.AttendanceSummaryAdapter">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/scrollable_header_grade_summary.xml b/app/src/main/res/layout/scrollable_header_grade_summary.xml
index ec069f8cf..2eea20f42 100644
--- a/app/src/main/res/layout/scrollable_header_grade_summary.xml
+++ b/app/src/main/res/layout/scrollable_header_grade_summary.xml
@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     android:layout_marginBottom="20dp"
     android:gravity="center_horizontal"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:context=".ui.modules.grade.summary.GradeSummaryAdapter">
 
     <LinearLayout
         android:layout_width="150dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="5dp"
-        android:layout_marginRight="5dp"
         android:orientation="vertical">
 
         <TextView
@@ -54,4 +54,4 @@
             android:textSize="21sp"
             tools:text="6,00" />
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index aa2269ad0..8a08b5d24 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -16,9 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
-            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
-            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -26,7 +24,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -37,7 +34,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -49,7 +45,6 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -60,7 +55,6 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -72,7 +66,6 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorPrimaryDark"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/layout/widget_timetable_dark.xml b/app/src/main/res/layout/widget_timetable_dark.xml
index 3a301eb94..5533eaeee 100644
--- a/app/src/main/res/layout/widget_timetable_dark.xml
+++ b/app/src/main/res/layout/widget_timetable_dark.xml
@@ -16,9 +16,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@id/timetableWidgetAccount"
-            android:layout_toLeftOf="@id/timetableWidgetAccount"
             android:layout_toEndOf="@id/timetableWidgetNext"
-            android:layout_toRightOf="@id/timetableWidgetNext"
             android:orientation="vertical">
 
             <TextView
@@ -26,7 +24,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="15sp"
@@ -37,7 +34,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="10dp"
-                android:layout_marginLeft="10dp"
                 android:maxLines="1"
                 android:textColor="@android:color/white"
                 android:textSize="13sp"
@@ -49,7 +45,6 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -60,7 +55,6 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_prev"
             android:src="@drawable/ic_widget_chevron"
@@ -72,7 +66,6 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toEndOf="@id/timetableWidgetPrev"
-            android:layout_toRightOf="@id/timetableWidgetPrev"
             android:backgroundTint="@color/colorWidgetNavButton"
             android:contentDescription="@string/all_next"
             android:rotation="180"
diff --git a/app/src/main/res/menu/action_menu_logviewer.xml b/app/src/main/res/menu/action_menu_logviewer.xml
new file mode 100644
index 000000000..84b076b15
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_logviewer.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/logViewerMenuShare"
+        android:icon="@drawable/ic_share"
+        android:orderInCategory="1"
+        android:title="@string/logviewer_share"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/action_menu_message_preview.xml b/app/src/main/res/menu/action_menu_message_preview.xml
index dfc12e234..4c1332e10 100644
--- a/app/src/main/res/menu/action_menu_message_preview.xml
+++ b/app/src/main/res/menu/action_menu_message_preview.xml
@@ -22,4 +22,18 @@
         android:title="@string/message_delete"
         app:iconTint="@color/material_on_surface_emphasis_medium"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuShare"
+        android:icon="@drawable/ic_menu_message_share"
+        android:orderInCategory="1"
+        android:title="@string/message_share"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/messagePreviewMenuPrint"
+        android:icon="@drawable/ic_menu_message_print"
+        android:orderInCategory="1"
+        android:title="@string/message_print"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="ifRoom" />
 </menu>
diff --git a/app/src/main/res/menu/action_menu_message_tab.xml b/app/src/main/res/menu/action_menu_message_tab.xml
new file mode 100644
index 000000000..18d348757
--- /dev/null
+++ b/app/src/main/res/menu/action_menu_message_tab.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/all_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="collapseActionView|ifRoom" />
+</menu>
diff --git a/app/src/main/res/menu/context_menu_excuse.xml b/app/src/main/res/menu/context_menu_excuse.xml
new file mode 100644
index 000000000..4eff14e3f
--- /dev/null
+++ b/app/src/main/res/menu/context_menu_excuse.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/excuseMenuSubmit"
+        android:icon="@drawable/ic_all_done"
+        android:title="@string/attendance_excuse_dialog_submit"
+        app:iconTint="@color/material_on_surface_emphasis_medium"
+        app:showAsAction="always" />
+</menu>
diff --git a/app/src/main/res/raw/custom_license_mappings.prop b/app/src/main/res/raw/custom_license_mappings.prop
new file mode 100644
index 000000000..f4ab55163
--- /dev/null
+++ b/app/src/main/res/raw/custom_license_mappings.prop
@@ -0,0 +1 @@
+io_github_wulkanowy__sdk:apache_2_0
diff --git a/app/src/main/res/raw/custom_license_year_mappings.prop b/app/src/main/res/raw/custom_license_year_mappings.prop
new file mode 100644
index 000000000..9605dada6
--- /dev/null
+++ b/app/src/main/res/raw/custom_license_year_mappings.prop
@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:2019
+io_github_wulkanowy__uonet_request_signer:2019
+io_github_wulkanowy__sdk:2020
diff --git a/app/src/main/res/raw/custom_name_mappings.prop b/app/src/main/res/raw/custom_name_mappings.prop
new file mode 100644
index 000000000..05e896805
--- /dev/null
+++ b/app/src/main/res/raw/custom_name_mappings.prop
@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:Material Chips Input
+io_github_wulkanowy__uonet_request_signer:UONET+ Request Signer
+io_github_wulkanowy__sdk:VULCAN UONET+ SDK
diff --git a/app/src/main/res/values-cs-rCZ/preferences_values.xml b/app/src/main/res/values-cs-rCZ/preferences_values.xml
new file mode 100644
index 000000000..bcb690e54
--- /dev/null
+++ b/app/src/main/res/values-cs-rCZ/preferences_values.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Světlý</item>
+        <item>Tmavý</item>
+        <item>Černý (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>Jazyk systému</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 minut</item>
+        <item>30 minut</item>
+        <item>1 hodina</item>
+        <item>2 hodiny</item>
+        <item>6 hodin</item>
+        <item>12 hodin</item>
+        <item>24 hodin</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,00</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Abecedně</item>
+        <item>Podle data</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Barvy známek v deníku</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Průměrná známka od druhého semestru</item>
+        <item>Průměr známek z obou semestrů</item>
+        <item>Průměr známek z celého roku</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Neukaž</item>
+        <item>Ukázat vše</item>
+        <item>Ukázat menší</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 000000000..c55abd967
--- /dev/null
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Přihlásit se</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Známky</string>
+    <string name="attendance_title">Prezence</string>
+    <string name="exam_title">Zkoušky</string>
+    <string name="timetable_title">Plán lekce</string>
+    <string name="settings_title">Nastavení</string>
+    <string name="more_title">Více</string>
+    <string name="about_title">O aplikaci</string>
+    <string name="logviewer_title">Prohlížeč protokolů</string>
+    <string name="contributors_title">Tvůrci</string>
+    <string name="license_title">Licence</string>
+    <string name="message_title">Zprávy</string>
+    <string name="send_message_title">Nová zpráva</string>
+    <string name="note_title">Poznámky a úspěchy</string>
+    <string name="homework_title">Domácí práce</string>
+    <string name="account_title">Vyberte účet</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Přihlaste se pomocí studentského nebo nadřazeného účtu</string>
+    <string name="login_header_symbol">Zadejte symbol</string>
+    <string name="login_nickname_hint">Uživatelské jméno</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Přihlášení, číslo PESEL nebo e-mail</string>
+    <string name="login_password_hint">Heslo</string>
+    <string name="login_host_hint">Deník UONET+</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybridní</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">Klíč API</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Přihlásit</string>
+    <string name="login_invalid_password">Toto heslo je příliš krátké</string>
+    <string name="login_incorrect_password">Přihlašovací údaje jsou nesprávné. Zkontrolujte, zda je v poli níže vybrán správný deník UONET+</string>
+    <string name="login_invalid_pin">Neplatný PIN</string>
+    <string name="login_invalid_token">Neplatný token</string>
+    <string name="login_expired_token">Platnost tokenu vypršela</string>
+    <string name="login_invalid_email">Nesprávná e-mailová adresa</string>
+    <string name="login_invalid_login">Neplatné přihlášení</string>
+    <string name="login_invalid_symbol">Neplatný symbol</string>
+    <string name="login_incorrect_symbol">Student nebyl nalezen. Zkontrolujte symbol</string>
+    <string name="login_field_required">Toto pole je povinné</string>
+    <string name="login_duplicate_student">Vybraný student je již přihlášen</string>
+    <string name="login_symbol_helper">Symbol najdete na stránce deníku v&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Vyberte studenty k přihlášení do aplikace</string>
+    <string name="login_advanced">Jiné možnosti</string>
+    <string name="login_advanced_warning_mobile_api">V tomto režimu nefungují následující: šťastné číslo, statistiky třídy, shrnutí docházky, ospravedlnění nepřítomnosti, absolvované lekce, informace o škole a prohlížení seznamu registrovaných zařízení</string>
+    <string name="login_advanced_warning_scraper">Tento režim zobrazuje stejná data, která se zobrazují na webových stránkách deníka</string>
+    <string name="login_advanced_warning_hybrid">Kombinace nejlepších vlastností ostatních dvou režimů. Funguje rychleji než scraper a poskytuje funkce, které nejsou k dispozici v režimu Mobile API. Je to v experimentální fázi</string>
+    <string name="login_privacy_policy">Zásady ochrany osobních údajů</string>
+    <string name="login_contact_header">Problémy s přihlášením? Napište nám!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">Poslat e-mail</string>
+    <string name="login_email_details">Popište podrobnosti problému:</string>
+    <string name="login_recover_warning">Ujistěte se, že je vybrán správný UONET+ deník!</string>
+    <string name="login_recover_button">Zapomněl jsem své heslo</string>
+    <string name="login_recover_title">Obnovte svůj účet</string>
+    <string name="login_recover">Obnovit</string>
+    <string name="login_signed_in">Student je již přihlášen</string>
+    <!--Main-->
+    <string name="main_account_picker">Správce účtu</string>
+    <string name="main_log_in">Přihlásit se</string>
+    <string name="main_session_expired">Platnost relace vypršela</string>
+    <string name="main_session_relogin">Vaše relace vypršela, přihlaste se prosím znovu</string>
+    <!--Grade-->
+    <string name="grade_header">Známka</string>
+    <string name="grade_semester">Semestr %d</string>
+    <string name="grade_switch_semester">Změnit semestr</string>
+    <string name="grade_no_items">Žádné známky</string>
+    <string name="grade_weight">Váha</string>
+    <string name="grade_weight_value">Váha: %s</string>
+    <string name="grade_comment">Komentář</string>
+    <string name="grade_no_new_items">Žádné nové známky</string>
+    <string name="grade_number_new_items">Počet nových známek: %1$d</string>
+    <string name="grade_average">Průměrný: %1$.2f</string>
+    <string name="grade_points_sum">Body: %s</string>
+    <string name="grade_no_average">Žádný průměr</string>
+    <string name="grade_predicted">Předpovězeno: %1$s</string>
+    <string name="grade_final">Konečná: %1$s</string>
+    <string name="grade_summary_points">Celkem bodů</string>
+    <string name="grade_summary_final_grade">Konečná známka</string>
+    <string name="grade_summary_predicted_grade">Předpokládaná známka</string>
+    <string name="grade_summary_calculated_average">Vypočítaný průměr</string>
+    <string name="grade_summary_final_average">Konečný průměr</string>
+    <string name="grade_menu_summary">Souhrn</string>
+    <string name="grade_menu_statistics">Třída</string>
+    <string name="grade_menu_read">Označit jako přečtené</string>
+    <string name="grade_statistics_partial">Částečně</string>
+    <string name="grade_statistics_semester">Semestr</string>
+    <string name="grade_statistics_points">Body</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d známka</item>
+        <item quantity="few">%d známky</item>
+        <item quantity="many">%d známky</item>
+        <item quantity="other">%d známky</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">Nová známka</item>
+        <item quantity="few">Nové známky</item>
+        <item quantity="many">Nové známky</item>
+        <item quantity="other">Nové známky</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">Nová předpokládaná známka</item>
+        <item quantity="few">Nové předpovídané známky</item>
+        <item quantity="many">Nové předpovídané známky</item>
+        <item quantity="other">Nové předpovídané známky</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">Nová konečná známka</item>
+        <item quantity="few">Nové konečné známky</item>
+        <item quantity="many">Nové konečné známky</item>
+        <item quantity="other">Nové konečné známky</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">Máte %1$d novou známku</item>
+        <item quantity="few">Máte %1$d nové známky</item>
+        <item quantity="many">Máte %1$d nové známky</item>
+        <item quantity="other">Máte %1$d nové známky</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">Máte %1$d novou konečnou známku</item>
+        <item quantity="few">Máte %1$d nové konečné známky</item>
+        <item quantity="many">Máte %1$d nové konečné známky</item>
+        <item quantity="other">Máte %1$d nové konečné známky</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">Máte %1$d novou konečnou známku</item>
+        <item quantity="few">Máte %1$d nové konečné známky</item>
+        <item quantity="many">Máte %1$d nové konečné známky</item>
+        <item quantity="other">Máte %1$d nové konečné známky</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lekce</string>
+    <string name="timetable_room">Pokoj</string>
+    <string name="timetable_group">Skupina</string>
+    <string name="timetable_time">Hodiny</string>
+    <string name="timetable_changes">Změny</string>
+    <string name="timetable_no_items">Dnes žádné lekce</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sek</string>
+    <string name="timetable_time_left">dosud %1$s</string>
+    <string name="timetable_time_until">za %1$s</string>
+    <string name="timetable_finished">Lekce skončila</string>
+    <string name="timetable_now">Nyní: %s</string>
+    <string name="timetable_next">Okamžik: %s</string>
+    <string name="timetable_later">Později: %s</string>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Dokončené lekce</string>
+    <string name="completed_lessons_button">Zobrazit dokončené lekce</string>
+    <string name="completed_lessons_no_items">Žádné informace o absolvovaných lekcích</string>
+    <string name="completed_lessons_topic">Téma</string>
+    <string name="completed_lessons_absence">Absence</string>
+    <string name="completed_lessons_resources">Zdroje</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Souhrn docházky</string>
+    <string name="attendance_absence_school">Nepřítomen ze školních důvodů</string>
+    <string name="attendance_absence_excused">Omluvená absence</string>
+    <string name="attendance_absence_unexcused">Neomluvená absence</string>
+    <string name="attendance_exemption">Osvobození</string>
+    <string name="attendance_excused_lateness">Oprávněné zpoždění</string>
+    <string name="attendance_unexcused_lateness">Neomluvená zpoždění</string>
+    <string name="attendance_present">Přítomnost</string>
+    <string name="attendance_deleted">Smazáno</string>
+    <string name="attendance_unknown">Neznámý</string>
+    <string name="attendance_number">Číslo lekce</string>
+    <string name="attendance_no_items">Žádné položky</string>
+    <plurals name="attendance_number_absences">
+        <item quantity="one">%1$d absence</item>
+        <item quantity="few">%1$d absence</item>
+        <item quantity="many">%1$d absence</item>
+        <item quantity="other">%1$d absence</item>
+    </plurals>
+    <string name="attendance_excuse_dialog_reason">Důvod absence (volitelný)</string>
+    <string name="attendance_excuse_dialog_submit">Poslat</string>
+    <string name="attendance_excuse_success">Absence úspěšně omluvena!</string>
+    <string name="attendance_excuse_no_selection">Musíte vybrat alespoň jednu nepřítomnost!</string>
+    <string name="attendance_excuse_title">Ospravedlnit</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Účast</string>
+    <string name="attendance_summary_total">Celkový</string>
+    <!--Exam-->
+    <string name="exam_no_items">Tento týden žádné testy</string>
+    <string name="exam_type">Typ</string>
+    <string name="exam_entry_date">Datum vstupu</string>
+    <!--Message-->
+    <string name="message_inbox">Doručená pošta</string>
+    <string name="message_sent">Odesláno</string>
+    <string name="message_trash">Koš</string>
+    <string name="message_no_subject">(žádné téma)</string>
+    <string name="message_no_items">Žádné zprávy</string>
+    <string name="message_preview_error">Při stahování obsahu zprávy došlo k chybě</string>
+    <string name="message_from">Od:</string>
+    <string name="message_to">Do:</string>
+    <string name="message_date">Datum: %s</string>
+    <string name="message_reply">Odpověď</string>
+    <string name="message_forward">Poslat dále</string>
+    <string name="message_delete">Vymazat</string>
+    <string name="message_move_to_bin">Přesunout do koše</string>
+    <string name="message_delete_forever">Trvale smazat</string>
+    <string name="message_delete_success">Zpráva byla úspěšně smazána</string>
+    <string name="message_share">Podíl</string>
+    <string name="message_print">Vytisknout</string>
+    <string name="message_subject">Téma</string>
+    <string name="message_content">Obsah</string>
+    <string name="message_send_successful">Zpráva úspěšně odeslána</string>
+    <string name="message_required_recipients">Musíte vybrat alespoň 1 příjemce</string>
+    <string name="message_content_min_length">Obsah zprávy musí mít alespoň 3 znaky</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%d zpráva</item>
+        <item quantity="few">%d zprávy</item>
+        <item quantity="many">%d zprávy</item>
+        <item quantity="other">%d zprávy</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">Nová zpráva</item>
+        <item quantity="few">Nové zprávy</item>
+        <item quantity="many">Nové zprávy</item>
+        <item quantity="other">Nové zprávy</item>
+    </plurals>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">Obdrželi jste %1$d zprávu</item>
+        <item quantity="few">Obdrželi jste %1$d zpráv</item>
+        <item quantity="many">Obdrželi jste %1$d zpráv</item>
+        <item quantity="other">Obdrželi jste %1$d zpráv</item>
+    </plurals>
+    <!--Note-->
+    <string name="note_no_items">Žádné informace o poznámkách</string>
+    <string name="note_points">Body</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d poznámka</item>
+        <item quantity="few">%d poznámky</item>
+        <item quantity="many">%d poznámky</item>
+        <item quantity="other">%d poznámky</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">Nová poznámka</item>
+        <item quantity="few">Nové poznámky</item>
+        <item quantity="many">Nové poznámky</item>
+        <item quantity="other">Nové poznámky</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">Máte %1$d novou poznámku</item>
+        <item quantity="few">Máte %1$d nové poznámky</item>
+        <item quantity="many">Máte %1$d nové poznámky</item>
+        <item quantity="other">Máte %1$d nové poznámky</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d chvála</item>
+        <item quantity="few">%d chvály</item>
+        <item quantity="many">%d chvály</item>
+        <item quantity="other">%d chvály</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">Nová chvála</item>
+        <item quantity="few">Nové chvály</item>
+        <item quantity="many">Nové chvály</item>
+        <item quantity="other">Nové chvály</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">Máte %1$d novou chválu</item>
+        <item quantity="few">Máte %1$d nové chvály</item>
+        <item quantity="many">Máte %1$d nové chvály</item>
+        <item quantity="other">Máte %1$d nové chvály</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutrální poznámka</item>
+        <item quantity="few">%d neutrální poznámky</item>
+        <item quantity="many">%d neutrální poznámky</item>
+        <item quantity="other">%d neutrální poznámky</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">Nová neutrální poznámka</item>
+        <item quantity="few">Nové neutrální poznámky</item>
+        <item quantity="many">Nové neutrální poznámky</item>
+        <item quantity="other">Nové neutrální poznámky</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">Máte %1$d novou neutrální pozornost</item>
+        <item quantity="few">Máte %1$d nové neutrální komentáře</item>
+        <item quantity="many">Máte %1$d nové neutrální komentáře</item>
+        <item quantity="other">Máte %1$d nové neutrální komentáře</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">Žádný domácí úkol</string>
+    <string name="homework_mark_as_done">Označit jako hotové</string>
+    <string name="homework_mark_as_undone">Neudělané</string>
+    <string name="homework_attachments">Přílohy</string>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Šťastné číslo</string>
+    <string name="lucky_number_header">Dnešní šťastné číslo je</string>
+    <string name="lucky_number_empty">Žádné informace o šťastném čísle</string>
+    <string name="lucky_number_notify_new_item_title">Šťastné číslo pro dnešek</string>
+    <string name="lucky_number_notify_new_item">Dnes je šťastným číslem: %d</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobilní přístup</string>
+    <string name="mobile_devices_no_items">Žádná zařízení</string>
+    <string name="mobile_devices_unregister">Zrušit registraci</string>
+    <string name="mobile_device_removed">Zařízení odstraněno</string>
+    <string name="mobile_device_qr">QR kód</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">Škola a učitelé</string>
+    <!--School-->
+    <string name="school_title">Škola</string>
+    <string name="school_no_info">Žádné informace o škole</string>
+    <string name="school_name">Školní jméno</string>
+    <string name="school_address">Adresa školy</string>
+    <string name="school_telephone">Telefon</string>
+    <string name="school_headmaster">Jméno ředitele</string>
+    <string name="school_pedagogue">Jméno pedagoga</string>
+    <string name="school_address_button">Zobrazit na mapě</string>
+    <string name="school_telephone_button">Volání</string>
+    <!--Teacher-->
+    <string name="teachers_title">Učitelé</string>
+    <string name="teacher_no_items">Žádné informace o učitelích</string>
+    <string name="teacher_no_subject">Žádný předmět</string>
+    <!--Account-->
+    <string name="account_add_new">Přidat účet</string>
+    <string name="account_logout">Odhlásit se</string>
+    <string name="account_confirm">Chcete se odhlásit z aktivního studenta?</string>
+    <string name="account_logout_student">Odhlášení studentů</string>
+    <string name="account_type_student">Studentský účet</string>
+    <string name="account_type_parent">Rodičovský účet</string>
+    <string name="account_login_mobile_api">Režimu Mobíle API</string>
+    <string name="account_login_hybrid">Hybridní režim</string>
+    <!--About-->
+    <string name="about_version">Verze aplikace</string>
+    <string name="about_contributor">Tvůrci</string>
+    <string name="about_contributor_summary">Seznam vývojářů Wulkanowy</string>
+    <string name="about_feedback">Nahlásit chybu</string>
+    <string name="about_feedback_summary">Pošlete hlášení o chybě e-mailem</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Přečtěte si často kladené otázky</string>
+    <string name="about_discord">Server Discord</string>
+    <string name="about_discord_summary">Připojte se ke komunitě Wulkanowy</string>
+    <string name="about_privacy">Zásady ochrany osobních údajů</string>
+    <string name="about_privacy_summary">Pravidla pro shromažďování osobních údajů</string>
+    <string name="about_homepage">Domovská stránka</string>
+    <string name="about_homepage_summary">Navštivte web a pomozte s vývojem aplikace</string>
+    <string name="about_licenses">Licence</string>
+    <string name="about_licenses_summary">Licence knihoven použitých v aplikaci</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">Licence</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">Zobrazit více na GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Sdílejte protokoly</string>
+    <string name="logviewer_refresh">Obnovit</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Kontrola aktualizací</string>
+    <string name="dialog_error_check_update_message">Před nahlášením chyby nejprve zkontrolujte, zda je k dispozici aktualizace s opravou chyby</string>
+    <!--Generic-->
+    <string name="all_content">Obsah</string>
+    <string name="all_retry">Zkuste to znovu</string>
+    <string name="all_description">Popis</string>
+    <string name="all_no_description">Bez popisu</string>
+    <string name="all_teacher">Učitel</string>
+    <string name="all_date">Datum</string>
+    <string name="all_entry_date">Datum vstupu</string>
+    <string name="all_color">Barva</string>
+    <string name="all_details">Detaily</string>
+    <string name="all_category">Kategorie</string>
+    <string name="all_close">Zavřít</string>
+    <string name="all_no_data">Žádná data</string>
+    <string name="all_subject">Předmět</string>
+    <string name="all_prev">Předchozí</string>
+    <string name="all_next">Další</string>
+    <string name="all_search">Vyhledávání</string>
+    <string name="all_search_hint">Vyhledávání…</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">Žádné lekce</string>
+    <string name="widget_timetable_theme_title">Vyberte téma</string>
+    <string name="widget_timetable_theme_light">Světlý</string>
+    <string name="widget_timetable_theme_dark">Tmavý</string>
+    <string name="widget_timetable_theme_system">Téma systému</string>
+    <!--Preferences-->
+    <string name="pref_view_header">Vzhled</string>
+    <string name="pref_view_list">Výchozí zobrazení</string>
+    <string name="pref_view_grade_average_mode">Výpočet koncoročního průměru</string>
+    <string name="pref_view_grade_average_force_calc">Vynutit průměrný výpočet podle aplikace</string>
+    <string name="pref_view_present">Zobrazit přítomnost v účasti</string>
+    <string name="pref_view_app_theme">Téma aplikace</string>
+    <string name="pref_view_expand_grade">Rozbalit známky</string>
+    <string name="pref_view_timetable_show_timers">Označte aktuální lekci v plánu lekce</string>
+    <string name="pref_view_timetable_show_groups">Ukázat skupiny vedle předmětů v plánu lekce</string>
+    <string name="pref_view_grade_statistics_list">Ukázat seznam grafů ve třídních známkách</string>
+    <string name="pref_view_timetable_show_whole_class">Ukázat lekce pro celou třídu</string>
+    <string name="pref_view_subjects_without_grades">Ukázat předměty bez známek v \"Známky\"</string>
+    <string name="pref_view_grade_color_scheme">Známky barevné schéma</string>
+    <string name="pref_view_grade_sorting_mode">Předměty seřazené v \"Známky\"</string>
+    <string name="pref_view_app_language">Jazyk aplikace</string>
+    <string name="pref_notify_header">Oznámení</string>
+    <string name="pref_notify_switch">Ukázat notifikace</string>
+    <string name="pref_notify_upcoming_lessons_switch">Ukázat nadcházející oznámení o lekci</string>
+    <string name="pref_notify_fix_sync_issues">Opravte problémy se synchronizací a upozorněním</string>
+    <string name="pref_notify_fix_sync_issues_message">Ve vašem zařízení mohou nastat problémy se synchronizací dat a oznámenímii.\n\nChcete-li je opravit, přidejte Wulkanowy do funkce Autostart a vypněte optimalizaci/úsporu baterie v nastavení systému telefonu.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Jdi do nastavení</string>
+    <string name="pref_notify_debug_switch">Ukázat oznámení o ladění</string>
+    <string name="pref_services_header">Synchronizace</string>
+    <string name="pref_services_switch">Automatická aktualizace</string>
+    <string name="pref_services_suspended">Pozastaveno na dovolené</string>
+    <string name="pref_services_interval">Interval aktualizací</string>
+    <string name="pref_services_wifi">Pouze Wi-Fi</string>
+    <string name="pref_services_force_sync">Nyní synchronizovat</string>
+    <string name="pref_services_message_sync_success">Synchronizováno!</string>
+    <string name="pref_services_message_sync_failed">Synchronizace se nezdařila</string>
+    <string name="pref_services_sync_in_progress">Probíhá synchronizace</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronizace</string>
+    <string name="pref_services_dialog_force_sync_summary">        Ruční synchronizace neobnoví zobrazení aplikace.
+        \nChcete-li zobrazit synchronizovaná data, restartujte aplikaci po synchronizaci.
+    </string>
+    <string name="pref_other_header">Jiný</string>
+    <string name="pref_other_grade_modifier_plus">Hodnota plusu</string>
+    <string name="pref_other_grade_modifier_minus">Hodnota mínusu</string>
+    <string name="pref_other_fill_message_content">Odpovědět s historií zpráv</string>
+    <!--Notification Channels-->
+    <string name="channel_new_entries">Nové položky v deník</string>
+    <string name="channel_new_grades">Nové známky</string>
+    <string name="channel_lucky_number">Šťastné číslo</string>
+    <string name="channel_new_message">Nové zprávy</string>
+    <string name="channel_new_notes">Nové poznámky</string>
+    <string name="channel_push">Oznámení push</string>
+    <string name="channel_upcoming_lessons">Nadcházející lekce</string>
+    <string name="channel_debug">Ladění</string>
+    <!--Colors-->
+    <string name="all_black">Černý</string>
+    <string name="all_red">Červený</string>
+    <string name="all_blue">Modrý</string>
+    <string name="all_green">Zelený</string>
+    <string name="all_purple">Nachový</string>
+    <string name="all_empty_color">Žádná barva</string>
+    <!--Others-->
+    <string name="all_copied">Zkopírováno</string>
+    <string name="all_undo">Vrátit</string>
+    <!--Errors-->
+    <string name="error_no_internet">Žádné internetové připojení</string>
+    <string name="error_timeout">Vypršel časový limit připojení k denik</string>
+    <string name="error_login_failed">Přihlášení selhalo. Zkuste to znovu nebo restartujte aplikaci</string>
+    <string name="error_password_change_required">Je vyžadována změna hesla</string>
+    <string name="error_service_unavailable">Probíhá údržba UONET+ deník. Zkuste to později znovu</string>
+    <string name="error_unknown">Došlo k neočekávané chybě</string>
+    <string name="error_feature_disabled">Funkce deaktivována vaší školou</string>
+    <string name="error_feature_not_available">Funkce není k dispozici. Přihlaste se v jiném režimu než Mobile API</string>
+</resources>
diff --git a/app/src/main/res/values-de-v29/preferences_values.xml b/app/src/main/res/values-de-v29/preferences_values.xml
new file mode 100644
index 000000000..c07650d6b
--- /dev/null
+++ b/app/src/main/res/values-de-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>System Thema</item>
+        <item>Licht</item>
+        <item>Dunkel</item>
+        <item>Schwarz (AMOLED)</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
new file mode 100644
index 000000000..2ee70f622
--- /dev/null
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Licht</item>
+        <item>Dunkel</item>
+        <item>Schwarz (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>System Sprache</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 Minuten</item>
+        <item>30 Minuten</item>
+        <item>1 Stunde</item>
+        <item>2 Stunden</item>
+        <item>6 Stunden</item>
+        <item>12 Stunden</item>
+        <item>24 Stunden</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,0</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Farben der Bewertungen im Logbuch</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Durchschnittsnote für das 2. Semester</item>
+        <item>Durchschnitt der Noten aus beiden Semestern</item>
+        <item>Durchschnitt der Noten aus dem ganzen Jahr</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Nicht zeigen</item>
+        <item>Alle zeigen</item>
+        <item>Zeigen die reduzierte</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..c33c273ab
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Anmelden</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Noten</string>
+    <string name="attendance_title">Schulbesuch</string>
+    <string name="exam_title">Prüfungen</string>
+    <string name="timetable_title">Zeitplan</string>
+    <string name="settings_title">Einstellungen</string>
+    <string name="more_title">Mehr</string>
+    <string name="about_title">Über die Applikation</string>
+    <string name="logviewer_title">Log Viewer</string>
+    <string name="contributors_title">Mitarbeiter</string>
+    <string name="license_title">Lizenzen</string>
+    <string name="message_title">Nachrichten</string>
+    <string name="send_message_title">neue Nachricht</string>
+    <string name="note_title">Eintragen und Erfolgen</string>
+    <string name="homework_title">Hausaufgaben</string>
+    <string name="account_title">Wählen Sie ein Konto</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Melden Sie sich mit dem Studenten- oder Elternkonto an</string>
+    <string name="login_header_symbol">Geben Sie das Symbol</string>
+    <string name="login_nickname_hint">Benutzername</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Anmeldung, PESEL oder e-mail</string>
+    <string name="login_password_hint">Passwort</string>
+    <string name="login_host_hint">UONET+ Klassenbuch</string>
+    <string name="login_type_api">Mobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybride</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">API Schlüssel</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Anmelden</string>
+    <string name="login_invalid_password">Passwort ist zu kurz</string>
+    <string name="login_incorrect_password">Anmeldedaten sind falsch. Stellen Sie sicher, dass das richtige UONET+-Register ausgewählt ist</string>
+    <string name="login_invalid_pin">Ungültige PIN</string>
+    <string name="login_invalid_token">Ungültige token</string>
+    <string name="login_expired_token">Token ist nicht mehr gültig</string>
+    <string name="login_invalid_email">Ungültige email</string>
+    <string name="login_invalid_login">Ungültige login</string>
+    <string name="login_invalid_symbol">Ungültige symbol</string>
+    <string name="login_incorrect_symbol">Student nicht gefunden. Überprüfen Sie das Symbol</string>
+    <string name="login_field_required">Dieses Datenfeld ist erforderlich</string>
+    <string name="login_duplicate_student">Ausgewählter Student ist bereits angemeldet.</string>
+    <string name="login_symbol_helper">Das Symbol finden Sie auf der Registerseite unter&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Wählen Sie die Studenten aus, die sich bei der Anwendung anmelden sollen.</string>
+    <string name="login_advanced">Andere Optionen</string>
+    <string name="login_advanced_warning_mobile_api">In diesem Modus funktioniert eine Glücknummer, eine Klassenstatistik, eine Zusammenfassung der Anwesenheit, eine Entschuldigung für die Abwesenheit, abgeschlossene Lektionen, Schulinformationen und eine Vorschau der Liste der registrierten Geräte nicht</string>
+    <string name="login_advanced_warning_scraper">In diesem Modus werden dieselben Daten angezeigt, die auf der Klassenbuch-Website angezeigt werden</string>
+    <string name="login_advanced_warning_hybrid">Die Kombination der besten Eigenschaften der beiden anderen Modus. Es arbeitet schneller als Scraper und bietet Funktionen, die im mobilen API-Modus nicht verfügbar sind. Es ist in der experimentellen Phase</string>
+    <string name="login_privacy_policy">Datenschutzerklärung</string>
+    <string name="login_contact_header">Probleme bei der Anmeldung? Kontaktieren Sie uns!</string>
+    <string name="login_contact_email">Email</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">email senden</string>
+    <string name="login_email_details">Beschreiben Sie die Details des Problems:</string>
+    <string name="login_recover_warning">Stellen Sie sicher, dass das richtige UONET + Klassenbuch ausgewählt ist!</string>
+    <string name="login_recover_button">Ich habe mein Passwort vergessen.</string>
+    <string name="login_recover_title">Ihr Konto wiederherstellen</string>
+    <string name="login_recover">Wiederherstellen</string>
+    <string name="login_signed_in">Student ist bereits angemeldet</string>
+    <!--Main-->
+    <string name="main_account_picker">Kundenbetreuer</string>
+    <string name="main_log_in">Anmelden</string>
+    <string name="main_session_expired">Die Sitzung ist abgelaufen</string>
+    <string name="main_session_relogin">Die Sitzung ist abgelaufen, bitte loggen Sie sich erneut ein</string>
+    <!--Grade-->
+    <string name="grade_header">Note</string>
+    <string name="grade_semester">Semester %d</string>
+    <string name="grade_switch_semester">Semester wechseln</string>
+    <string name="grade_no_items">Keine Noten</string>
+    <string name="grade_weight">Gewichtung</string>
+    <string name="grade_weight_value">Gewichtung: %s</string>
+    <string name="grade_comment">Kommentar</string>
+    <string name="grade_no_new_items">Keine neuen Noten</string>
+    <string name="grade_number_new_items">Anzahl der neuen Bewertungen: %1$d</string>
+    <string name="grade_average">Durchschnitt: %1$.2f</string>
+    <string name="grade_points_sum">Punkte: %s</string>
+    <string name="grade_no_average">Kein Durchschnitt</string>
+    <string name="grade_predicted">Vorausgesagt: %1$s</string>
+    <string name="grade_final">Finale: %1$s</string>
+    <string name="grade_summary_points">Gesamtpunkte</string>
+    <string name="grade_summary_final_grade">Finaler Note</string>
+    <string name="grade_summary_predicted_grade">Vorhergesagte Note</string>
+    <string name="grade_summary_calculated_average">Berechnender Durchschnitt</string>
+    <string name="grade_summary_final_average">Finaler Durchschnitt</string>
+    <string name="grade_menu_summary">Zusammenfassung</string>
+    <string name="grade_menu_statistics">Klasse</string>
+    <string name="grade_menu_read">Als gelesen markieren</string>
+    <string name="grade_statistics_partial">Partiell</string>
+    <string name="grade_statistics_semester">Semester</string>
+    <string name="grade_statistics_points">Punkte</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d Note</item>
+        <item quantity="other">%d Noten</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">Neue Note</item>
+        <item quantity="other">Neue Noten</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">Neue vorhergesagte Note</item>
+        <item quantity="other">Neue vorhergesagte Noten</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">Neue Abschlussnote</item>
+        <item quantity="other">Neue Abschlussnoten</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">Du hast %1$d Note bekommen</item>
+        <item quantity="other">Du hast %1$d Noten bekommen</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">Sie haben %1$d vorhergesagte Note bekommen</item>
+        <item quantity="other">Sie haben %1$d vorhergesagte Noten bekommen</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">Sie haben %1$d Abschlussnote bekommen</item>
+        <item quantity="other">Sie haben %1$d Abschlussnoten bekommen</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Lektion</string>
+    <string name="timetable_room">Klassenzimmer</string>
+    <string name="timetable_group">Gruppe</string>
+    <string name="timetable_time">Stunden</string>
+    <string name="timetable_changes">Änderungen</string>
+    <string name="timetable_no_items">Kein Unterricht an diesem Tag</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sek</string>
+    <string name="timetable_time_left">noch %1$s</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Fertig</string>
+    <string name="timetable_now">Jetzt: %s</string>
+    <string name="timetable_next">In einem Moment: %s</string>
+    <string name="timetable_later">Später: %s</string>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Beendete Lektionen</string>
+    <string name="completed_lessons_button">Beendete Lektionen anzeigen</string>
+    <string name="completed_lessons_no_items">Keine Informationen über beendete Lektionen</string>
+    <string name="completed_lessons_topic">Thema</string>
+    <string name="completed_lessons_absence">Abwesenheit</string>
+    <string name="completed_lessons_resources">Ressourcen</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Übersicht über die Schulbesuch</string>
+    <string name="attendance_absence_school">Aus schulischen Gründen abwesend</string>
+    <string name="attendance_absence_excused">Entschuldigte Abwesenheit</string>
+    <string name="attendance_absence_unexcused">Unentschuldigtes Abwesenheit</string>
+    <string name="attendance_exemption">Befreiung</string>
+    <string name="attendance_excused_lateness">Entschuldigte Verspätung</string>
+    <string name="attendance_unexcused_lateness">Unentschuldigte Verspätung</string>
+    <string name="attendance_present">Anwesend</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Lektion Nummer</string>
+    <string name="attendance_no_items">Keine Einträgen</string>
+    <plurals name="attendance_number_absences">
+        <item quantity="one">%1$d abwesenheit</item>
+        <item quantity="other">%1$d Abwesenheiten</item>
+    </plurals>
+    <string name="attendance_excuse_dialog_reason">Abwesenheitsgrund (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Senden</string>
+    <string name="attendance_excuse_success">Abwesenheit erfolgreich entschuldigt!</string>
+    <string name="attendance_excuse_no_selection">Sie müssen mindestens eine Abwesenheit auswählen!</string>
+    <string name="attendance_excuse_title">Verzeihung</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Schulbesuch</string>
+    <string name="attendance_summary_total">Gesamt</string>
+    <!--Exam-->
+    <string name="exam_no_items">Diese Woche keine Prüfungen</string>
+    <string name="exam_type">Form</string>
+    <string name="exam_entry_date">Eintrittsdatum</string>
+    <!--Message-->
+    <string name="message_inbox">Posteingang</string>
+    <string name="message_sent">Gesendet</string>
+    <string name="message_trash">Korb</string>
+    <string name="message_no_subject">(kein Thema)</string>
+    <string name="message_no_items">Keine Nachrichten</string>
+    <string name="message_preview_error">Beim Herunterladen des Nachrichteninhalts ist ein Fehler aufgetreten</string>
+    <string name="message_from">Von:</string>
+    <string name="message_to">An:</string>
+    <string name="message_date">Datum: %s</string>
+    <string name="message_reply">Antwort</string>
+    <string name="message_forward">Weiterleiten</string>
+    <string name="message_delete">Löschen</string>
+    <string name="message_move_to_bin">In den Korb wandern</string>
+    <string name="message_delete_forever">Dauerhaft löschen</string>
+    <string name="message_delete_success">Nachricht erfolgreich gelöscht</string>
+    <string name="message_share">Teilen</string>
+    <string name="message_print">Drucken</string>
+    <string name="message_subject">Thema</string>
+    <string name="message_content">Inhalt</string>
+    <string name="message_send_successful">Nachricht erfolgreich gesendet</string>
+    <string name="message_required_recipients">Sie müssen mindestens 1 Empfänger auswählen.</string>
+    <string name="message_content_min_length">Der Inhalt der Nachricht muss mindestens 3 Zeichen lang sein.</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%d nachricht</item>
+        <item quantity="other">%d nachrichten</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">Neu nachricht</item>
+        <item quantity="other">Neue nachrichten</item>
+    </plurals>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">Du hast %1$d nachricht bekommen</item>
+        <item quantity="other">Du hast %1$d nachrichten bekommen</item>
+    </plurals>
+    <!--Note-->
+    <string name="note_no_items">Keine Informationen über Eintragen</string>
+    <string name="note_points">Punkte</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d Eintrag</item>
+        <item quantity="other">%d Eintragen</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">Neu Eintrag</item>
+        <item quantity="other">Neue Eintragen</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">Du hast %1$d Eintrag bekommen</item>
+        <item quantity="other">Du hast %1$d Eintragen bekommen</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
+    <string name="homework_mark_as_done">Gemacht</string>
+    <string name="homework_mark_as_undone">Unvollständig</string>
+    <string name="homework_attachments">Anhänge</string>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Glückliche Nummer</string>
+    <string name="lucky_number_header">Die heutige Glücksnummer ist </string>
+    <string name="lucky_number_empty">Keine Information über die Glücksnummer.</string>
+    <string name="lucky_number_notify_new_item_title">Glücksnummer für heute</string>
+    <string name="lucky_number_notify_new_item">Die heutige Glücksnummer ist: %d</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Mobile Geräte</string>
+    <string name="mobile_devices_no_items">Keine Geräte</string>
+    <string name="mobile_devices_unregister">Abmelden</string>
+    <string name="mobile_device_removed">Gerät entfernt</string>
+    <string name="mobile_device_qr">QR Code</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">Schule und Lehrer</string>
+    <!--School-->
+    <string name="school_title">Schule</string>
+    <string name="school_no_info">Keine Informationen über die Schule</string>
+    <string name="school_name">Name der Schule</string>
+    <string name="school_address">Adresse der Schule</string>
+    <string name="school_telephone">Telefon</string>
+    <string name="school_headmaster">Name des Schulleiters</string>
+    <string name="school_pedagogue">Name des Pädagogen</string>
+    <string name="school_address_button">Auf Karte anzeigen</string>
+    <string name="school_telephone_button">Rufen Sie an</string>
+    <!--Teacher-->
+    <string name="teachers_title">Lehrerinnen und Lehrer</string>
+    <string name="teacher_no_items">Keine Informationen über Lehrer</string>
+    <string name="teacher_no_subject">Kein Thema</string>
+    <!--Account-->
+    <string name="account_add_new">Konto hinzufügen</string>
+    <string name="account_logout">Abmelden</string>
+    <string name="account_confirm">Wollen Sie sich von einem aktiven Studenten abmelden?</string>
+    <string name="account_logout_student">Abmeldung von Student</string>
+    <string name="account_type_student">Studentenkonto</string>
+    <string name="account_type_parent">Elternkonto</string>
+    <string name="account_login_mobile_api">Mobiler API Modus</string>
+    <string name="account_login_hybrid">Hybrid Modus</string>
+    <!--About-->
+    <string name="about_version">Version der App</string>
+    <string name="about_contributor">Mitarbeiter</string>
+    <string name="about_contributor_summary">Liste der Wulkanowy-Entwickler</string>
+    <string name="about_feedback">Melden Sie einen Fehler</string>
+    <string name="about_feedback_summary">Senden Sie einen Fehlerbericht per E-Mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Lesen Sie Häufig gestellte Fragen</string>
+    <string name="about_discord">Discord server</string>
+    <string name="about_discord_summary">Treten Sie der Wulkanowy-Gemeinschaft bei</string>
+    <string name="about_privacy">Datenschutzerklärung</string>
+    <string name="about_privacy_summary">Regeln für die Sammlung persönlicher Daten</string>
+    <string name="about_homepage">Startseite</string>
+    <string name="about_homepage_summary">Besuchen Sie die Website und helfen Sie bei der Entwicklung der Anwendung</string>
+    <string name="about_licenses">Lizenzen</string>
+    <string name="about_licenses_summary">Lizenzen der in der Anwendung verwendeten Bibliotheken</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">Lizenz</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Benutzerbild</string>
+    <string name="contributor_see_more">Sehen Sie mehr auf GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Logs teilen</string>
+    <string name="logviewer_refresh">Aktualisieren</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Auf Updates prüfen</string>
+    <string name="dialog_error_check_update_message">Bevor Sie einen Fehler melden, prüfen Sie zuerst, ob ein Update mit der Fehlerbehebung verfügbar ist</string>
+    <!--Generic-->
+    <string name="all_content">Inhalt</string>
+    <string name="all_retry">Wiederhol</string>
+    <string name="all_description">Beschreibung</string>
+    <string name="all_no_description">Keine Beschreibung</string>
+    <string name="all_teacher">Lehrer</string>
+    <string name="all_date">Datum</string>
+    <string name="all_entry_date">Eintrittsdatum</string>
+    <string name="all_color">Farbe</string>
+    <string name="all_details">Einzelheiten</string>
+    <string name="all_category">Kategorie</string>
+    <string name="all_close">Schließ</string>
+    <string name="all_no_data">Keine Daten</string>
+    <string name="all_subject">Thema</string>
+    <string name="all_prev">Zurück</string>
+    <string name="all_next">Nächste</string>
+    <string name="all_search">Suchen</string>
+    <string name="all_search_hint">Suchen…</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">Keine Lektionen</string>
+    <string name="widget_timetable_theme_title">Thema wählen</string>
+    <string name="widget_timetable_theme_light">Licht</string>
+    <string name="widget_timetable_theme_dark">Dunkel</string>
+    <string name="widget_timetable_theme_system">Systemthema</string>
+    <!--Preferences-->
+    <string name="pref_view_header">Erscheinungsbild</string>
+    <string name="pref_view_list">Standard Ansicht</string>
+    <string name="pref_view_grade_average_mode">Berechnung des Jahresenddurchschnitts</string>
+    <string name="pref_view_grade_average_force_calc">Mittelwertberechnung durch App erzwingen</string>
+    <string name="pref_view_present">Anwesenheit in Schulbesuch zeigen</string>
+    <string name="pref_view_app_theme">Thema der Anwendung</string>
+    <string name="pref_view_expand_grade">Noten erweitern</string>
+    <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
+    <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
+    <string name="pref_view_timetable_show_whole_class">Unterricht der ganzen Klasse anzeigen</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
+    <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in \"Grades\"</string>
+    <string name="pref_view_app_language">App Sprache</string>
+    <string name="pref_notify_header">Benachrichtigungen</string>
+    <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
+    <string name="pref_notify_upcoming_lessons_switch">Benachrichtigungen über bevorstehende Lektionen anzeigen</string>
+    <string name="pref_notify_fix_sync_issues">Synchronisierungs- und Benachrichtigungsprobleme reparieren</string>
+    <string name="pref_notify_fix_sync_issues_message">Ihr Gerät hat möglicherweise Probleme mit der Datensynchronisierung und Benachrichtigungen.\n\nUm diese zu reparieren, fügen Sie Wulkanowy zum Autostart hinzu und deaktivieren Sie die Batterieoptimierung in den Systemeinstellungen des Geräts.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Gehe zu den Einstellungen</string>
+    <string name="pref_notify_debug_switch">Debug-Benachrichtigungen anzeigen</string>
+    <string name="pref_services_header">Synchronisierung</string>
+    <string name="pref_services_switch">Automatische Aktualisierung</string>
+    <string name="pref_services_suspended">An Feiertagen suspendiert</string>
+    <string name="pref_services_interval">Aktualisierungsintervall</string>
+    <string name="pref_services_wifi">Nur Wi-Fi</string>
+    <string name="pref_services_force_sync">Jetzt synchronisieren</string>
+    <string name="pref_services_message_sync_success">Synchronisiert!</string>
+    <string name="pref_services_message_sync_failed">Synchronisierung fehlgeschlagen</string>
+    <string name="pref_services_sync_in_progress">Synchronisierung läuft</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronisation</string>
+    <string name="pref_services_dialog_force_sync_summary">        Die manuelle Synchronisierung aktualisiert die App-Ansichten nicht.
+        \nUm die synchronisierten Daten anzuzeigen, starten Sie die App nach der Synchronisierung neu.
+    </string>
+    <string name="pref_other_header">Andere</string>
+    <string name="pref_other_grade_modifier_plus">Wert des Plus</string>
+    <string name="pref_other_grade_modifier_minus">Wert des Minus</string>
+    <string name="pref_other_fill_message_content">Antwort mit Nachrichtenhistorie</string>
+    <!--Notification Channels-->
+    <string name="channel_new_entries">Neue Einträge im Klassenbuch</string>
+    <string name="channel_new_grades">Neue Noten</string>
+    <string name="channel_lucky_number">Glückliche Nummer</string>
+    <string name="channel_new_message">Neue Nachrichten</string>
+    <string name="channel_new_notes">Neue Eintragen</string>
+    <string name="channel_push">Push-Benachrichtigungen</string>
+    <string name="channel_upcoming_lessons">Bevorstehende Lektionen</string>
+    <string name="channel_debug">Debuggen</string>
+    <!--Colors-->
+    <string name="all_black">Schwarz</string>
+    <string name="all_red">Rot</string>
+    <string name="all_blue">Blau</string>
+    <string name="all_green">Grün</string>
+    <string name="all_purple">Violett</string>
+    <string name="all_empty_color">Keine Farbe</string>
+    <!--Others-->
+    <string name="all_copied">Kopiert</string>
+    <string name="all_undo">lösen</string>
+    <!--Errors-->
+    <string name="error_no_internet">Keine Internetverbindung</string>
+    <string name="error_timeout">Das Zeitlimit für die Verbindung zum Klassenbuch ist abgelaufen</string>
+    <string name="error_login_failed">Anmeldung fehlgeschlagen. Versuchen Sie es noch einmal oder starten Sie die Anwendung neu.</string>
+    <string name="error_password_change_required">Passwortänderung erforderlich</string>
+    <string name="error_service_unavailable">Wartung im Gange UONET + Klassenbuch. Versuchen Sie es später noch einmal</string>
+    <string name="error_unknown">Ein unerwarteter Fehler ist aufgetreten</string>
+    <string name="error_feature_disabled">Funktion, die von Ihrer Schule deaktiviert wurde</string>
+    <string name="error_feature_not_available">Feature in diesem Modus nicht verfügbar</string>
+</resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 492645381..a06a46f00 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -8,6 +8,8 @@
         <item name="colorDivider">@color/colorDividerInverse</item>
         <item name="android:windowBackground">?colorSurface</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@android:color/black
+        </item>
         <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/black</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
         <item name="mdtp_theme_dark">true</item>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 33a66e0f7..0634f6572 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Jasny</item>
+        <item>Ciemny</item>
+        <item>Czarny (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>Język systemu</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+    </string-array>
     <string-array name="services_interval_entries">
         <item>15 minut</item>
         <item>30 minut</item>
@@ -9,20 +23,6 @@
         <item>12 godzin</item>
         <item>24 godziny</item>
     </string-array>
-
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Jasny</item>
-        <item>Ciemny</item>
-        <item>Czarny (AMOLED)</item>
-    </string-array>
-
-    <string-array name="app_language_entries">
-        <item>Język systemu</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-    </string-array>
-
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
         <item>0,25</item>
@@ -30,15 +30,23 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alfabetycznie</item>
+        <item>Według daty</item>
+    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
         <item>Kolory ocen w dzienniku</item>
     </string-array>
-
     <string-array name="grade_average_mode_entries">
-        <item>Średnia ocen z 2 semestru</item>
-        <item>Średnia ocen z całego roku</item>
+        <item>Średnia ocen z drugiego semestru</item>
+        <item>Średnia średnich z obu semestrów</item>
+        <item>Średnia wszystkich ocen z całego roku</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Nie pokazuj</item>
+        <item>Pokazuj wszystkie</item>
+        <item>Pokazuj pomniejszone</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0972138fa..8dea21234 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
-
-
     <!--Activity/Fragment title-->
     <string name="login_title">Logowanie</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,64 +10,77 @@
     <string name="settings_title">Ustawienia</string>
     <string name="more_title">Więcej</string>
     <string name="about_title">O aplikacji</string>
+    <string name="logviewer_title">Przeglądarka logów</string>
+    <string name="contributors_title">Twórcy</string>
     <string name="license_title">Licencje</string>
     <string name="message_title">Wiadomości</string>
     <string name="send_message_title">Nowa wiadomość</string>
     <string name="note_title">Uwagi i osiągnięcia</string>
     <string name="homework_title">Zadania domowe</string>
     <string name="account_title">Wybierz konto</string>
-
-
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semestr %1$d, %2$d/%3$d</string>
     <!--Login-->
     <string name="login_header_default">Zaloguj się za pomocą konta ucznia lub rodzica</string>
     <string name="login_header_symbol">Podaj symbol</string>
-    <string name="login_nickname_hint">Email lub nick</string>
+    <string name="login_nickname_hint">Nazwa użytkownika</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL lub e-mail</string>
     <string name="login_password_hint">Hasło</string>
-    <string name="login_host_hint">Dziennik</string>
-    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_host_hint">Dziennik UONET+</string>
     <string name="login_type_api">Mobilne API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrydowe</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
     <string name="login_api_key_hint">Klucz API</string>
+    <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Zaloguj</string>
     <string name="login_invalid_password">To hasło jest za krótkie</string>
-    <string name="login_incorrect_password">Dane logowania są niepoprawne</string>
+    <string name="login_incorrect_password">Dane logowania są niepoprawne. Upewnij się, że został wybrany odpowiedni dziennik UONET+ w polu poniżej</string>
     <string name="login_invalid_pin">Nieprawidłowy PIN</string>
     <string name="login_invalid_token">Nieprawidłowy token</string>
     <string name="login_expired_token">Token stracił ważność</string>
+    <string name="login_invalid_email">Niepoprawny adres email</string>
+    <string name="login_invalid_login">Niepoprawny login</string>
     <string name="login_invalid_symbol">Niepoprawny symbol</string>
     <string name="login_incorrect_symbol">Nie znaleziono ucznia. Sprawdź symbol</string>
     <string name="login_field_required">To pole jest wymagane</string>
     <string name="login_duplicate_student">Wybrany uczeń jest już zalogowany</string>
-    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
+    <string name="login_symbol_helper">Symbol znajdziesz na stronie dziennika w&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b>.\n\nUpewnij się, że w polu <b>Dziennik UONET+</b> na poprzednim ekranie został ustawiony odpowiedni dziennik</string>
     <string name="login_select_student">Wybierz uczniów do zalogowania w aplikacji</string>
     <string name="login_advanced">Inne opcje</string>
+    <string name="login_advanced_warning_mobile_api">W tym trybie nie działa szczęśliwy numerek, uczeń na tle klasy, podsumowanie frekwencji, usprawiedliwianie nieobecności, lekcje zrealizowane, informacje o szkole i podgląd listy zarejestrowanych urządzeń</string>
+    <string name="login_advanced_warning_scraper">Tryb ten wyświetla te same dane, które widoczne są na stronie internetowej dziennika</string>
+    <string name="login_advanced_warning_hybrid">Połączenie najlepszych cech dwóch pozostałych trybów. Działa szybciej niż scraper i zapewnia funkcje niedostępne w trybie Mobilne API. Jest w fazie eksperymentalnej</string>
     <string name="login_privacy_policy">Polityka prywatności</string>
     <string name="login_contact_header">Problemy z logowaniem? Napisz do nas!</string>
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Wyślij email</string>
-
-
+    <string name="login_email_details">Opisz problem:</string>
+    <string name="login_recover_warning">Upewnij się, że został wybrany odpowiedni dziennik UONET+!</string>
+    <string name="login_recover_button">Nie pamiętam hasła</string>
+    <string name="login_recover_title">Przywróć swoje konto</string>
+    <string name="login_recover">Przywróć</string>
+    <string name="login_signed_in">Uczeń jest już zalogowany</string>
     <!--Main-->
     <string name="main_account_picker">Menadżer kont</string>
     <string name="main_log_in">Zaloguj się</string>
     <string name="main_session_expired">Sesja wygasła</string>
     <string name="main_session_relogin">Sesja wygasła, zaloguj się ponownie</string>
-
-
     <!--Grade-->
     <string name="grade_header">Ocena</string>
     <string name="grade_semester">Semestr %d</string>
     <string name="grade_switch_semester">Zmień semestr</string>
     <string name="grade_no_items">Brak ocen</string>
     <string name="grade_weight">Waga</string>
+    <string name="grade_weight_value">Waga: %s</string>
     <string name="grade_comment">Komentarz</string>
     <string name="grade_no_new_items">Brak nowych ocen</string>
     <string name="grade_number_new_items">Ilość nowych ocen: %1$d</string>
     <string name="grade_average">Średnia: %1$.2f</string>
+    <string name="grade_points_sum">Punkty: %s</string>
     <string name="grade_no_average">Brak średniej</string>
     <string name="grade_predicted">Przewidywana: %1$s</string>
     <string name="grade_final">Końcowa: %1$s</string>
@@ -96,14 +107,36 @@
         <item quantity="many">Nowe oceny</item>
         <item quantity="other">Nowe oceny</item>
     </plurals>
-    <plurals name="grade_notify_new_items">
-        <item quantity="one">Dostałeś %1$d ocenę</item>
-        <item quantity="few">"Dostałeś %1$d oceny</item>
-        <item quantity="many">Dostałeś %1$d ocen</item>
-        <item quantity="other">Dostałeś %1$d ocen</item>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">Nowa ocena przewidywana</item>
+        <item quantity="few">Nowe oceny przewidywane</item>
+        <item quantity="many">Nowe oceny przewidywane</item>
+        <item quantity="other">Nowe oceny przewidywane</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">Nowa ocena końcowa</item>
+        <item quantity="few">Nowe oceny końcowe</item>
+        <item quantity="many">Nowe oceny końcowe</item>
+        <item quantity="other">Nowe oceny końcowe</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">Masz %1$d nową ocenę</item>
+        <item quantity="few">Masz %1$d nowe oceny</item>
+        <item quantity="many">Masz %1$d nowych ocen</item>
+        <item quantity="other">Masz %1$d nowych ocen</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">Masz %1$d nową przewidywaną ocenę</item>
+        <item quantity="few">Masz %1$d nowe przewidywane oceny</item>
+        <item quantity="many">Masz %1$d nowych przewidywanych ocen</item>
+        <item quantity="other">Masz %1$d nowych przewidywanych ocen</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">Masz %1$d nową końcową ocenę</item>
+        <item quantity="few">Masz %1$d nowe końcowe oceny</item>
+        <item quantity="many">Masz %1$d nowych końcowych ocen</item>
+        <item quantity="other">Masz %1$d nowych końcowych ocen</item>
     </plurals>
-
-
     <!--Timetable-->
     <string name="timetable_lesson">Lekcja</string>
     <string name="timetable_room">Sala</string>
@@ -111,26 +144,32 @@
     <string name="timetable_time">Godziny</string>
     <string name="timetable_changes">Zmiany</string>
     <string name="timetable_no_items">Brak lekcji w tym dniu</string>
-
-
-    <!--CompletedLesson-->
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sek</string>
+    <string name="timetable_time_left">jeszcze %1$s</string>
+    <string name="timetable_time_until">za %1$s</string>
+    <string name="timetable_finished">Zakończona</string>
+    <string name="timetable_now">Teraz: %s</string>
+    <string name="timetable_next">Za chwilę: %s</string>
+    <string name="timetable_later">Później: %s</string>
+    <!--Completed lessons-->
     <string name="completed_lessons_title">Lekcje zrealizowane</string>
     <string name="completed_lessons_button">Zobacz lekcje zrealizowane</string>
     <string name="completed_lessons_no_items">Brak informacji o lekcjach zrealizowanych</string>
     <string name="completed_lessons_topic">Temat</string>
     <string name="completed_lessons_absence">Nieobecność</string>
     <string name="completed_lessons_resources">Zasoby</string>
-
-
     <!--Attendance-->
     <string name="attendance_summary_button">Podsumowanie frekwencji</string>
-    <string name="attendance_absence_school">Nieobecny z przyczyn szkolnych</string>
+    <string name="attendance_absence_school">Nieobecność z przyczyn szkolnych</string>
     <string name="attendance_absence_excused">Nieobecność usprawiedliwiona</string>
     <string name="attendance_absence_unexcused">Nieobecność nieusprawiedliwiona</string>
-    <string name="attendance_exemption">Zwolniony</string>
+    <string name="attendance_exemption">Zwolnienie</string>
     <string name="attendance_excused_lateness">Spóźnienie usprawiedliwione</string>
     <string name="attendance_unexcused_lateness">Spóźnienie nieusprawiedliwione</string>
-    <string name="attendance_present">Obecny</string>
+    <string name="attendance_present">Obecność</string>
+    <string name="attendance_deleted">Usunięty</string>
+    <string name="attendance_unknown">Nieznany</string>
     <string name="attendance_number">Numer lekcji</string>
     <string name="attendance_no_items">Brak wpisów</string>
     <plurals name="attendance_number_absences">
@@ -139,18 +178,18 @@
         <item quantity="many">%1$d nieobecności</item>
         <item quantity="other">%1$d nieobecności</item>
     </plurals>
-
-
+    <string name="attendance_excuse_dialog_reason">Powód nieobecności (opcjonalny)</string>
+    <string name="attendance_excuse_dialog_submit">Wyślij</string>
+    <string name="attendance_excuse_success">Usprawiedliwiono pomyślnie!</string>
+    <string name="attendance_excuse_no_selection">Musisz wybrać co najmniej jedną nieobecność!</string>
+    <string name="attendance_excuse_title">Usprawiedliw</string>
     <!--Attendance summary-->
     <string name="attendance_summary_final">Frekwencja</string>
-
-
+    <string name="attendance_summary_total">Razem</string>
     <!--Exam-->
     <string name="exam_no_items">Brak sprawdzianów w tym tygodniu</string>
     <string name="exam_type">Typ</string>
     <string name="exam_entry_date">Data wpisu</string>
-
-
     <!--Message-->
     <string name="message_inbox">Odebrane</string>
     <string name="message_sent">Wysłane</string>
@@ -167,6 +206,8 @@
     <string name="message_move_to_bin">Przenieś do kosza</string>
     <string name="message_delete_forever">Usuń trwale</string>
     <string name="message_delete_success">Wiadomość usunięta pomyślnie</string>
+    <string name="message_share">Udostępnij</string>
+    <string name="message_print">Drukuj</string>
     <string name="message_subject">Temat</string>
     <string name="message_content">Treść</string>
     <string name="message_send_successful">Wiadomość wysłana pomyślnie</string>
@@ -185,15 +226,14 @@
         <item quantity="other">Nowe wiadomości</item>
     </plurals>
     <plurals name="message_notify_new_items">
-        <item quantity="one">Dostałeś %1$d wiadomość</item>
-        <item quantity="few">"Dostałeś %1$d wiadomości</item>
-        <item quantity="many">Dostałeś %1$d wiadomości</item>
-        <item quantity="other">Dostałeś %1$d wiadomości</item>
+        <item quantity="one">Masz %1$d nową wiadomość</item>
+        <item quantity="few">Masz %1$d nowe wiadomości</item>
+        <item quantity="many">Masz %1$d nowych wiadomości</item>
+        <item quantity="other">Masz %1$d nowych wiadomości</item>
     </plurals>
-
-
     <!--Note-->
     <string name="note_no_items">Brak informacji o uwagach</string>
+    <string name="note_points">Punkty</string>
     <plurals name="note_number_item">
         <item quantity="one">%d uwaga</item>
         <item quantity="few">%d uwagi</item>
@@ -207,25 +247,60 @@
         <item quantity="other">Nowe uwagi</item>
     </plurals>
     <plurals name="note_notify_new_items">
-        <item quantity="one">Dostałeś %1$d uwagę</item>
-        <item quantity="few">"Dostałeś %1$d uwagi</item>
-        <item quantity="many">Dostałeś %1$d uwag</item>
-        <item quantity="other">Dostałeś %1$d uwag</item>
+        <item quantity="one">Masz %1$d nową uwagę</item>
+        <item quantity="few">Masz %1$d nowe uwagi</item>
+        <item quantity="many">Masz %1$d nowych uwag</item>
+        <item quantity="other">Masz %1$d nowych uwag</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d pochwała</item>
+        <item quantity="few">%d pochwały</item>
+        <item quantity="many">%d pochwał</item>
+        <item quantity="other">%d pochwał</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">Nowa pochwała</item>
+        <item quantity="few">Nowe pochwały</item>
+        <item quantity="many">Nowe pochwały</item>
+        <item quantity="other">Nowe pochwały</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">Masz %1$d nową pochwałę</item>
+        <item quantity="few">Masz %1$d nowe pochwały</item>
+        <item quantity="many">Masz %1$d nowych pochwał</item>
+        <item quantity="other">Masz %1$d nowych pochwał</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutralna uwaga</item>
+        <item quantity="few">%d neutralne uwagi</item>
+        <item quantity="many">%d neutralnych uwag</item>
+        <item quantity="other">%d neutralnych uwag</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">Nowa neutralna uwaga</item>
+        <item quantity="few">Nowe neutralne uwagi</item>
+        <item quantity="many">Nowe neutralne uwagi</item>
+        <item quantity="other">Nowe neutralne uwagi</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">Masz %1$d nową neutralną uwagę</item>
+        <item quantity="few">Masz %1$d nowe neutralne uwagi</item>
+        <item quantity="many">Masz %1$d nowych neutralnych uwag</item>
+        <item quantity="other">Masz %1$d nowych neutralnych uwag</item>
     </plurals>
-
-
     <!--Homework-->
     <string name="homework_no_items">Brak zadań domowych</string>
-
-
+    <string name="homework_mark_as_done">Wykonane</string>
+    <string name="homework_mark_as_undone">Niewykonane</string>
+    <string name="homework_attachments">Załączniki</string>
     <!--Lucky number-->
     <string name="lucky_number_title">Szczęśliwy numerek</string>
     <string name="lucky_number_header">Dzisiejszym szczęśliwym numerkiem jest</string>
     <string name="lucky_number_empty">Brak informacji o szczęśliwym numerku</string>
     <string name="lucky_number_notify_new_item_title">Szczęśliwy numerek na dzisiaj</string>
     <string name="lucky_number_notify_new_item">Dziś szczęśliwym numerkiem jest: %d</string>
-
-
     <!--Mobile devices-->
     <string name="mobile_devices_title">Dostęp mobilny</string>
     <string name="mobile_devices_no_items">Brak urządzeń</string>
@@ -235,12 +310,8 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
-
-
     <!--School and teachers-->
     <string name="schoolandteachers_title">Szkoła i nauczyciele</string>
-
-
     <!--School-->
     <string name="school_title">Szkoła</string>
     <string name="school_no_info">Brak informacji o szkole</string>
@@ -249,25 +320,25 @@
     <string name="school_telephone">Telefon</string>
     <string name="school_headmaster">Imię i nazwisko dyrektora</string>
     <string name="school_pedagogue">Imię i nazwisko pedagoga</string>
-    <string name="school_address_button">Pokaż na mpaie</string>
+    <string name="school_address_button">Pokaż na mapie</string>
     <string name="school_telephone_button">Zadzwoń</string>
-
-
     <!--Teacher-->
     <string name="teachers_title">Nauczyciele</string>
     <string name="teacher_no_items">Brak informacji o nauczycielach</string>
     <string name="teacher_no_subject">Brak przedmiotu</string>
-
-
     <!--Account-->
     <string name="account_add_new">Dodaj konto</string>
     <string name="account_logout">Wyloguj</string>
     <string name="account_confirm">Czy chcesz wylogować aktualnego ucznia?</string>
     <string name="account_logout_student">Wylogowanie ucznia</string>
-
-
+    <string name="account_type_student">Konto ucznia</string>
+    <string name="account_type_parent">Konto rodzica</string>
+    <string name="account_login_mobile_api">Tryb API mobilne</string>
+    <string name="account_login_hybrid">Tryb hybrydowy</string>
     <!--About-->
     <string name="about_version">Wersja aplikacji</string>
+    <string name="about_contributor">Twórcy</string>
+    <string name="about_contributor_summary">Lista programistów Wulkanowego</string>
     <string name="about_feedback">Zgłoś błąd</string>
     <string name="about_feedback_summary">Wyślij zgłoszenie o błędzie poprzez e-maila</string>
     <string name="about_faq">FAQ</string>
@@ -280,12 +351,17 @@
     <string name="about_homepage_summary">Odwiedź stronę i pomóż rozwijać aplikację</string>
     <string name="about_licenses">Licencje</string>
     <string name="about_licenses_summary">Licencje użytych bibliotek w aplikacji</string>
-
-
     <!--Licenses-->
     <string name="license_dialog_title">Licencja</string>
-
-
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Awatar</string>
+    <string name="contributor_see_more">Zobacz więcej na GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Udostępnij logi</string>
+    <string name="logviewer_refresh">Odśwież</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Sprawdź dostępność aktualizacji</string>
+    <string name="dialog_error_check_update_message">Przed zgłoszeniem błędu sprawdź wcześniej, czy dostępna jest już aktualizacja z poprawką błędu</string>
     <!--Generic-->
     <string name="all_content">Treść</string>
     <string name="all_retry">Ponów</string>
@@ -302,15 +378,14 @@
     <string name="all_subject">Przedmiot</string>
     <string name="all_prev">Poprzedni</string>
     <string name="all_next">Następny</string>
-
-
+    <string name="all_search">Szukaj</string>
+    <string name="all_search_hint">Szukaj…</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Brak lekcji</string>
     <string name="widget_timetable_theme_title">Wybierz motyw</string>
     <string name="widget_timetable_theme_light">Jasny</string>
     <string name="widget_timetable_theme_dark">Ciemny</string>
-
-
+    <string name="widget_timetable_theme_system">Motyw systemu</string>
     <!--Preferences-->
     <string name="pref_view_header">Wygląd</string>
     <string name="pref_view_list">Domyślny widok</string>
@@ -319,30 +394,47 @@
     <string name="pref_view_present">Pokazuj obecność we frekwencji</string>
     <string name="pref_view_app_theme">Motyw aplikacji</string>
     <string name="pref_view_expand_grade">Rozwiń oceny</string>
+    <string name="pref_view_timetable_show_timers">Oznaczaj bieżącą lekcję na planie</string>
+    <string name="pref_view_timetable_show_groups">Pokazuj grupę obok przedmiotu na planie</string>
+    <string name="pref_view_grade_statistics_list">Pokazuj listę wykresów w ocenach klasy</string>
+    <string name="pref_view_timetable_show_whole_class">Pokazuj lekcje całej klasy</string>
+    <string name="pref_view_subjects_without_grades">Pokazuj przedmioty bez ocen w Oceny</string>
     <string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
+    <string name="pref_view_grade_sorting_mode">Sortowanie przedmiotów w \"Oceny\"</string>
     <string name="pref_view_app_language">Język aplikacji</string>
-
     <string name="pref_notify_header">Powiadomienia</string>
     <string name="pref_notify_switch">Pokazuj powiadomienia</string>
+    <string name="pref_notify_upcoming_lessons_switch">Pokazuj powiadomienia o nadchodzących lekcjach</string>
+    <string name="pref_notify_fix_sync_issues">Napraw problemy z synchronizacją i powiadomieniami</string>
+    <string name="pref_notify_fix_sync_issues_message">Na twoim urządzeniu mogą występować problemy z synchronizacją danych i powiadomieniami.\n\nBy je naprawić, dodaj Wulkanowego do autostartu i wyłącz optymalizację/oszczędzanie baterii w ustawieniach systemowych telefonu.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Przejdź do ustawień</string>
     <string name="pref_notify_debug_switch">Pokazuj powiadomienia debugowania</string>
-
     <string name="pref_services_header">Synchronizacja</string>
     <string name="pref_services_switch">Automatyczna aktualizacja</string>
     <string name="pref_services_suspended">Zawieszona na wakacjach</string>
     <string name="pref_services_interval">Interwał aktualizacji</string>
     <string name="pref_services_wifi">Tylko WiFi</string>
-
+    <string name="pref_services_force_sync">Synchronizuj teraz</string>
+    <string name="pref_services_message_sync_success">Zsynchronizowano!</string>
+    <string name="pref_services_message_sync_failed">Synchronizacja nie powiodła się</string>
+    <string name="pref_services_sync_in_progress">Synchronizacja w trakcie</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronizacja</string>
+    <string name="pref_services_dialog_force_sync_summary">        Ręczna synchronizacja nie odświeża widoków w aplikacji.
+        \nAby zobaczyć zsynchronizowane informacje, uruchom ponownie aplikację po zsynchronizowaniu.
+    </string>
     <string name="pref_other_header">Inne</string>
     <string name="pref_other_grade_modifier_plus">Wartość plusa</string>
     <string name="pref_other_grade_modifier_minus">Wartość minusa</string>
     <string name="pref_other_fill_message_content">Odpowiadaj z historią wiadomości</string>
-
-
     <!--Notification Channels-->
     <string name="channel_new_entries">Nowe wpisy w dzienniku</string>
+    <string name="channel_new_grades">Nowe oceny</string>
+    <string name="channel_lucky_number">Szczęśliwy numerek</string>
+    <string name="channel_new_message">Nowe wiadomości</string>
+    <string name="channel_new_notes">Nowe uwagi</string>
+    <string name="channel_push">Powiadomienia push</string>
+    <string name="channel_upcoming_lessons">Nadchodzące lekcje</string>
     <string name="channel_debug">Debugowanie</string>
-
-
     <!--Colors-->
     <string name="all_black">Czarny</string>
     <string name="all_red">Czerwony</string>
@@ -350,19 +442,18 @@
     <string name="all_green">Zielony</string>
     <string name="all_purple">Fioletowy</string>
     <string name="all_empty_color">Brak koloru</string>
-
-
     <!--Others-->
     <string name="all_copied">Skopiowano</string>
     <string name="all_undo">Cofnij</string>
-
-
     <!--Errors-->
     <string name="error_no_internet">Brak połączenia z internetem</string>
     <string name="error_timeout">Upłynął limit czasu na połączenie z dziennikiem</string>
-    <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie lub zrestartuj aplikację</string>
+    <string name="error_login_failed">Logowanie nie powiodło się. Spróbuj ponownie</string>
+    <string name="error_password_change_required">Wymagana zmiana hasła</string>
     <string name="error_service_unavailable">Trwa przerwa techniczna dziennika UONET+. Spróbuj ponownie później</string>
+    <string name="error_unknown_uonet">Wystąpił nieznany błąd dziennika UONET+. Spróbuj ponownie później</string>
+    <string name="error_unknown_app">Wystąpił nieznany błąd aplikacji</string>
     <string name="error_unknown">Wystąpił nieoczekiwany błąd</string>
     <string name="error_feature_disabled">Funkcja wyłączona przez szkołę</string>
-    <string name="error_feature_not_available">Funkcja niedostępna w tym trybie</string>
+    <string name="error_feature_not_available">Funkcja niedostępna. Zaloguj się w trybie innym niż Mobilne API</string>
 </resources>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index 641d754f8..304d678f7 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="services_interval_entries">
-        <item>15 минут</item>
-        <item>30 минут</item>
-        <item>1 час</item>
-        <item>2 часа</item>
-        <item>6 часов</item>
-        <item>12 часов</item>
-        <item>24 часа</item>
-    </string-array>
     <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
         <item>Светлая</item>
         <item>Тёмная</item>
@@ -19,6 +10,18 @@
         <item>Polski</item>
         <item>English</item>
         <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 минут</item>
+        <item>30 минут</item>
+        <item>1 час</item>
+        <item>2 часа</item>
+        <item>6 часов</item>
+        <item>12 часов</item>
+        <item>24 часа</item>
     </string-array>
     <string-array name="grade_modifier_entries">
         <item>0,0</item>
@@ -27,6 +30,10 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Алфавитный</item>
+        <item>По дате</item>
+    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -34,6 +41,12 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Средняя оценка со 2 семестра</item>
-        <item>Средняя оценка с целого года</item>
+        <item>Средняя оценка с двух семестров</item>
+        <item>Средняя оценок со всего года</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Не показывать</item>
+        <item>Показать все</item>
+        <item>Показать меньше</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0499cbf55..28ac69439 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="app_name">Wulkanowy</string>
-
-
+<resources>
     <!--Activity/Fragment title-->
     <string name="login_title">Авторизация</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,80 +8,93 @@
     <string name="exam_title">Тесты</string>
     <string name="timetable_title">Расписание</string>
     <string name="settings_title">Настройки</string>
-    <string name="more_title">Ещё</string>
+    <string name="more_title">Другое</string>
     <string name="about_title">О приложении</string>
+    <string name="logviewer_title">Просмотр журнала</string>
+    <string name="contributors_title">Разработчики</string>
     <string name="license_title">Лицензии</string>
     <string name="message_title">Сообщения</string>
     <string name="send_message_title">Новое сообщение</string>
     <string name="note_title">Предупреждения и свершения</string>
     <string name="homework_title">Домашние задания</string>
     <string name="account_title">Выберите аккаунт</string>
-
-
+    <!--Subtitles-->
+    <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
     <!--Login-->
     <string name="login_header_default">Авторизируйтесь при помощи аккаунта ученика или родителя</string>
     <string name="login_header_symbol">Впишите \"symbol\"</string>
-    <string name="login_nickname_hint">Электронная почта или имя пользователя</string>
+    <string name="login_nickname_hint">Имя пользователя</string>
+    <string name="login_email_hint">Электронная почта</string>
+    <string name="login_login_pesel_email_hint">Логин, PESEL или электронная почта</string>
     <string name="login_password_hint">Пароль</string>
-    <string name="login_host_hint">Дневник</string>
-    <string name="login_type_api">Мобильный API</string>
+    <string name="login_host_hint">Дневник UONET+</string>
+    <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
-    <string name="login_type_hybrid">Гибрид</string>
+    <string name="login_type_hybrid">Hybrid</string>
     <string name="login_token_hint">Token</string>
     <string name="login_pin_hint">PIN</string>
-    <string name="login_api_key_hint">клавиша API</string>
+    <string name="login_api_key_hint">Ключ API</string>
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Войти</string>
     <string name="login_invalid_password">Слишком короткий пароль</string>
-    <string name="login_incorrect_password">Указаны неверные данные</string>
-    <string name="login_invalid_pin">Недействительный PIN</string>
-    <string name="login_invalid_token">Недействительный token</string>
+    <string name="login_incorrect_password">Указаны неверные данные. Убедитесь, что вы выбрали нужный дневник</string>
+    <string name="login_invalid_pin">Неправильный PIN</string>
+    <string name="login_invalid_token">Неправильный token</string>
     <string name="login_expired_token">Токен просрочен</string>
-    <string name="login_invalid_symbol">Недействительный symbol</string>
-    <string name="login_incorrect_symbol">Не удалось найти ученика. Пожалуйста, проверьте \"symbol\"</string>
-    <string name="login_field_required">Это поле обязательно</string>
+    <string name="login_invalid_email">Неверный адрес электронной почты</string>
+    <string name="login_invalid_login">Неправильный логин</string>
+    <string name="login_invalid_symbol">Неправильный symbol</string>
+    <string name="login_incorrect_symbol">Не удалось найти ученика. Проверьте \"symbol\"</string>
+    <string name="login_field_required">Обязательное поле</string>
     <string name="login_duplicate_student">Данный ученик уже авторизован</string>
-    <string name="login_symbol_helper">Вы можете найти \"symbol\" в Uczeń -&gt; Dostęp Mobilny -&gt; Zarejestruj urządzenie mobilne</string>
+    <string name="login_symbol_helper">Вы можете найти \"symbol\" на странице VULCAN по пути <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Выберите учеников для авторизации в приложении</string>
     <string name="login_advanced">Другие варианты</string>
+    <string name="login_advanced_warning_mobile_api">В этом режиме не работают: счастливый номер, статистика класса по оценкам, статистика посещаемости и уроков, информация о школе и список зарегистрированных устройств</string>
+    <string name="login_advanced_warning_scraper">Scraper - режим, который показывает данные так же, как и сайт дневника</string>
+    <string name="login_advanced_warning_hybrid">Hybrid - это комбинация лучших функций остальных двух режимов. Он работает быстрее, чем Scraper, и вводит функции, которых нет в режиме Mobile API. Находится в экспериментальной стадии</string>
     <string name="login_privacy_policy">Политика приватности</string>
     <string name="login_contact_header">Проблемы с авторизацией? Свяжитесь с нами!</string>
     <string name="login_contact_email">Электронная почта</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Отправить письмо</string>
-
-
+    <string name="login_email_details">Опишите детали проблемы:</string>
+    <string name="login_recover_warning">Убедитесь, что выбран нужный дневник!</string>
+    <string name="login_recover_button">Забыли пароль?</string>
+    <string name="login_recover_title">Восстановите свой аккаунт</string>
+    <string name="login_recover">Восстановить</string>
+    <string name="login_signed_in">Студент уже вошел в систему</string>
     <!--Main-->
     <string name="main_account_picker">Менеджер аккаунтов</string>
     <string name="main_log_in">Войти</string>
     <string name="main_session_expired">Сеанс истёк</string>
     <string name="main_session_relogin">Сеанс истёк, пожалуйста, авторизируйтесь ещё раз</string>
-
-
     <!--Grade-->
     <string name="grade_header">Оценка</string>
     <string name="grade_semester">Семестр %d</string>
     <string name="grade_switch_semester">Сменить семестр</string>
     <string name="grade_no_items">Оценки отсутствуют</string>
-    <string name="grade_weight">Вес</string>
+    <string name="grade_weight">Стоимость</string>
+    <string name="grade_weight_value">Стоимость: %s</string>
     <string name="grade_comment">Комментарий</string>
     <string name="grade_no_new_items">Новые оценки отсутствуют</string>
     <string name="grade_number_new_items">Количество новых оценок: %1$d</string>
     <string name="grade_average">Средняя оценка: %1$.2f</string>
+    <string name="grade_points_sum">Баллы: %s</string>
     <string name="grade_no_average">Средняя оценка отсутствует</string>
     <string name="grade_predicted">Ожидаемая оценка: %1$s</string>
     <string name="grade_final">Итоговая оценка: %1$s</string>
-    <string name="grade_summary_points">Сумма очков</string>
+    <string name="grade_summary_points">Сумма баллов</string>
     <string name="grade_summary_final_grade">Итоговая оценка</string>
     <string name="grade_summary_predicted_grade">Ожидаемая оценка</string>
     <string name="grade_summary_calculated_average">Рассчитанная средняя оценка</string>
     <string name="grade_summary_final_average">Итоговая средняя оценка</string>
     <string name="grade_menu_summary">Итоги</string>
     <string name="grade_menu_statistics">Класс</string>
-    <string name="grade_menu_read">Пометить как \"прочитанное*</string>
+    <string name="grade_menu_read">Пометить как \"прочитанное\"</string>
     <string name="grade_statistics_partial">Частичные</string>
-    <string name="grade_statistics_semester">Семестровые</string>
-    <string name="grade_statistics_points">Очки</string>
+    <string name="grade_statistics_semester">За семестр</string>
+    <string name="grade_statistics_points">Баллы</string>
     <plurals name="grade_number_item">
         <item quantity="one">%d оценка</item>
         <item quantity="few">%d оценки</item>
@@ -93,46 +102,74 @@
         <item quantity="other">%d оценок</item>
     </plurals>
     <plurals name="grade_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новая оценка</item>
+        <item quantity="one">Новая оценка</item>
         <item quantity="few">Новые оценки</item>
         <item quantity="many">Новые оценки</item>
         <item quantity="other">Новые оценки</item>
     </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">Новая ожидаемая оценка</item>
+        <item quantity="few">Новые ожидаемые оценки</item>
+        <item quantity="many">Новые ожидаемые оценки</item>
+        <item quantity="other">Новые ожидаемые оценки</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">Новая итоговая оценка</item>
+        <item quantity="few">Новые итоговые оценки</item>
+        <item quantity="many">Новые итоговые оценки</item>
+        <item quantity="other">Новые итоговые оценки</item>
+    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Вы получили %1$d оценку</item>
         <item quantity="few">Вы получили %1$d оценки</item>
         <item quantity="many">Вы получили %1$d оценок</item>
         <item quantity="other">Вы получили %1$d оценок</item>
     </plurals>
-
-
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">Вы получили %1$d ожидаемую оценку</item>
+        <item quantity="few">Вы получили %1$d ожидаемые оценки</item>
+        <item quantity="many">Вы получили %1$d ожидаемых оценок</item>
+        <item quantity="other">Вы получили %1$d ожидаемых оценок</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">Вы получили %1$d финальную оценку</item>
+        <item quantity="few">Вы получили %1$d итоговых оценки</item>
+        <item quantity="many">Вы получили %1$d итоговых оценок</item>
+        <item quantity="other">Вы получили %1$d финальные оценки</item>
+    </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
     <string name="timetable_room">Аудитория</string>
     <string name="timetable_group">Группа</string>
     <string name="timetable_time">Часы</string>
     <string name="timetable_changes">Изменения</string>
-    <string name="timetable_no_items">Нету уроков в данный день</string>
-
-
-    <!--CompletedLesson-->
+    <string name="timetable_no_items">Нет уроков в данный день</string>
+    <string name="timetable_minutes">%s мин</string>
+    <string name="timetable_seconds">%s сек</string>
+    <string name="timetable_time_left">%1$s осталось</string>
+    <string name="timetable_time_until">через %1$s</string>
+    <string name="timetable_finished">Окончен</string>
+    <string name="timetable_now">Сейчас: %s</string>
+    <string name="timetable_next">Следующий: %s</string>
+    <string name="timetable_later">Позже: %s</string>
+    <!--Completed lessons-->
     <string name="completed_lessons_title">Проведённые уроки</string>
     <string name="completed_lessons_button">Просмотреть проведённые уроки</string>
     <string name="completed_lessons_no_items">Нет информации о проведённых уроках</string>
     <string name="completed_lessons_topic">Тема</string>
     <string name="completed_lessons_absence">Отсутствие</string>
     <string name="completed_lessons_resources">Ресурсы</string>
-
-
     <!--Attendance-->
     <string name="attendance_summary_button">Итоговая посещаемость</string>
     <string name="attendance_absence_school">Отсутствие по школьным причинам</string>
-    <string name="attendance_absence_excused">Оправданное отсутствие</string>
-    <string name="attendance_absence_unexcused">Неоправданное отсутствие</string>
+    <string name="attendance_absence_excused">Отсутствие по уважительной причине</string>
+    <string name="attendance_absence_unexcused">Отсутствие по неуважительной причине</string>
     <string name="attendance_exemption">Освобождение</string>
-    <string name="attendance_excused_lateness">Оправданное опоздание</string>
-    <string name="attendance_unexcused_lateness">Неоправданное опоздание</string>
+    <string name="attendance_excused_lateness">Опоздание по уважительным причинам</string>
+    <string name="attendance_unexcused_lateness">Опоздание по неуважительным причинам</string>
     <string name="attendance_present">Присутствие</string>
+    <string name="attendance_deleted">Удалено</string>
+    <string name="attendance_unknown">Неизвестно</string>
     <string name="attendance_number">Урок №</string>
     <string name="attendance_no_items">Данные не найдены</string>
     <plurals name="attendance_number_absences">
@@ -141,25 +178,25 @@
         <item quantity="many">%1$d отсутствий</item>
         <item quantity="other">%1$d отсутствий</item>
     </plurals>
-
-
+    <string name="attendance_excuse_dialog_reason">Причина отсутствия (необязательно)</string>
+    <string name="attendance_excuse_dialog_submit">Послать</string>
+    <string name="attendance_excuse_success">Статус отсутствия изменён</string>
+    <string name="attendance_excuse_no_selection">Выберите хотя-бы одно отсутствие</string>
+    <string name="attendance_excuse_title">Изменить статус</string>
     <!--Attendance summary-->
     <string name="attendance_summary_final">Посещаемость</string>
-
-
+    <string name="attendance_summary_total">Общая</string>
     <!--Exam-->
-    <string name="exam_no_items">Тесты на этой неделе не запланированы</string>
+    <string name="exam_no_items">Нет тестов на этой неделе</string>
     <string name="exam_type">Тип</string>
     <string name="exam_entry_date">Дата записи</string>
-
-
     <!--Message-->
     <string name="message_inbox">Полученные</string>
     <string name="message_sent">Отправленные</string>
     <string name="message_trash">Корзина</string>
-    <string name="message_no_subject">(нету темы)</string>
+    <string name="message_no_subject">(нет темы)</string>
     <string name="message_no_items">Нет сообщений</string>
-    <string name="message_preview_error">Произошла ошибка во время получения текста сообщения</string>
+    <string name="message_preview_error">Произошла ошибка во время получения содержания сообщения</string>
     <string name="message_from">От:</string>
     <string name="message_to">Кому:</string>
     <string name="message_date">Дата: %s</string>
@@ -169,6 +206,8 @@
     <string name="message_move_to_bin">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Сообщение успешно удалено</string>
+    <string name="message_share">Поделиться</string>
+    <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Текст</string>
     <string name="message_send_successful">Сообщение успешно отправлено</string>
@@ -181,7 +220,7 @@
         <item quantity="other">%d сообщений</item>
     </plurals>
     <plurals name="message_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новое сообщение</item>
+        <item quantity="one">Новое сообщение</item>
         <item quantity="few">Новые сообщения</item>
         <item quantity="many">Новые сообщения</item>
         <item quantity="other">Новые сообщения</item>
@@ -192,10 +231,9 @@
         <item quantity="many">Вы получили %1$d новых сообщений</item>
         <item quantity="other">Вы получили %1$d новых сообщений</item>
     </plurals>
-
-
     <!--Note-->
     <string name="note_no_items">Нет данных о предупреждениях</string>
+    <string name="note_points">Баллы</string>
     <plurals name="note_number_item">
         <item quantity="one">%d предупреждение</item>
         <item quantity="few">%d предупреждения</item>
@@ -203,7 +241,7 @@
         <item quantity="other">%d предупреждений</item>
     </plurals>
     <plurals name="note_new_items">
-        <item quantity="one" tools:ignore="ImpliedQuantity">Новое предупреждение</item>
+        <item quantity="one">Новое предупреждение</item>
         <item quantity="few">Новые предупреждения</item>
         <item quantity="many">Новых предупреждений</item>
         <item quantity="other">Новых предупреждений</item>
@@ -214,20 +252,55 @@
         <item quantity="many">Вы получили %1$d предупреждений</item>
         <item quantity="other">Вы получили %1$d предупреждений</item>
     </plurals>
-
-
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d похвала</item>
+        <item quantity="few">%d похвала</item>
+        <item quantity="many">%d похвала</item>
+        <item quantity="other">%d похвала</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">Новая похвала</item>
+        <item quantity="few">Новые похвалы</item>
+        <item quantity="many">Новые свершения</item>
+        <item quantity="other">Новые похвалы</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">Вы получили %1$d похвалу</item>
+        <item quantity="few">Вы получили %1$d похвалы</item>
+        <item quantity="many">Вы получили %1$d похвалы</item>
+        <item quantity="other">Вы получили %1$d похвалы</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d нейтральное замечание</item>
+        <item quantity="few">%d нейтральных замечания</item>
+        <item quantity="many">%d нейтральных замечаний</item>
+        <item quantity="other">%d нейтральных замечаний</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">Новое нейтральное замечание</item>
+        <item quantity="few">Новые нейтральные замечания</item>
+        <item quantity="many">Новые нейтральные замечания</item>
+        <item quantity="other">Новые нейтральные замечания</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">Вы получили %1$d нейтральное замечание</item>
+        <item quantity="few">Вы получили %1$d нейтральных замечания</item>
+        <item quantity="many">Вы получили %1$d нейтральных замечаний</item>
+        <item quantity="other">Вы получили %1$d нейтральных замечаний</item>
+    </plurals>
     <!--Homework-->
     <string name="homework_no_items">Нет домашних заданий</string>
-
-
+    <string name="homework_mark_as_done">сделанный</string>
+    <string name="homework_mark_as_undone">Не сделано</string>
+    <string name="homework_attachments">Вложения</string>
     <!--Lucky number-->
     <string name="lucky_number_title">Счастливый номер</string>
     <string name="lucky_number_header">Сегодняшний счастливый номер</string>
     <string name="lucky_number_empty">Нет данных о счастливом номере</string>
     <string name="lucky_number_notify_new_item_title">Сегодняшний счастливый номер</string>
     <string name="lucky_number_notify_new_item">Сегодняшний счастливый номер: %d</string>
-
-
     <!--Mobile devices-->
     <string name="mobile_devices_title">Мобильные устройства</string>
     <string name="mobile_devices_no_items">Нет устройств</string>
@@ -237,12 +310,8 @@
     <string name="mobile_device_token">Token</string>
     <string name="mobile_device_symbol">Symbol</string>
     <string name="mobile_device_pin">PIN</string>
-
-
     <!--School and teachers-->
     <string name="schoolandteachers_title">Школа и учителя</string>
-
-
     <!--School-->
     <string name="school_title">Школа</string>
     <string name="school_no_info">Нет информации о школе</string>
@@ -253,44 +322,49 @@
     <string name="school_pedagogue">Педагог</string>
     <string name="school_address_button">Показать на карте</string>
     <string name="school_telephone_button">Позвонить</string>
-
-
     <!--Teacher-->
     <string name="teachers_title">Учителя</string>
     <string name="teacher_no_items">Нет информации о учителях</string>
     <string name="teacher_no_subject">Нет предмета</string>
-
-
     <!--Account-->
     <string name="account_add_new">Добавить аккаунт</string>
     <string name="account_logout">Выйти</string>
     <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
     <string name="account_logout_student">Выйти</string>
-
-
+    <string name="account_type_student">Профиль ученика</string>
+    <string name="account_type_parent">Профиль родителя</string>
+    <string name="account_login_mobile_api">Режим Mobile API</string>
+    <string name="account_login_hybrid">Гибридный режим</string>
     <!--About-->
     <string name="about_version">Версия приложения</string>
-    <string name="about_feedback">Сообщить о ошибке</string>
-    <string name="about_feedback_summary">Отправить сообщение о ошибке через электронную почту</string>
+    <string name="about_contributor">Разработчики</string>
+    <string name="about_contributor_summary">Список разработчиков \"Wulkanowy\"</string>
+    <string name="about_feedback">Возникла ошибка?</string>
+    <string name="about_feedback_summary">Сообщить о ошибке</string>
     <string name="about_faq">FAQ</string>
-    <string name="about_faq_summary">Читайте часто задаваемые вопросы</string>
+    <string name="about_faq_summary">Часто задаваемые вопросы</string>
     <string name="about_discord">Сервер Discord</string>
     <string name="about_discord_summary">Присоединиться к сообществу приложения</string>
     <string name="about_privacy">Политика приватности</string>
-    <string name="about_privacy_summary">Правила сбора личных данных</string>
+    <string name="about_privacy_summary">Правила хранения личных данных</string>
     <string name="about_homepage">Домашняя страница</string>
-    <string name="about_homepage_summary">Посетить страницу и помочь в развитии приложения</string>
+    <string name="about_homepage_summary">Помочь в развитии приложения</string>
     <string name="about_licenses">Лицензии</string>
-    <string name="about_licenses_summary">Лицензии использованных в приложении библиотек</string>
-
-
+    <string name="about_licenses_summary">Лицензии использованных библиотек</string>
     <!--Licenses-->
     <string name="license_dialog_title">Лицензия</string>
-
-
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Aватар</string>
+    <string name="contributor_see_more">Страница проекта на GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Поделиться логами</string>
+    <string name="logviewer_refresh">Обновить</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Проверить наличие обновлений</string>
+    <string name="dialog_error_check_update_message">Прежде чем сообщать об ошибке, проверьте наличие обновлений</string>
     <!--Generic-->
     <string name="all_content">Содержание</string>
-    <string name="all_retry">Снова</string>
+    <string name="all_retry">Повторить</string>
     <string name="all_description">Описание</string>
     <string name="all_no_description">Нет описания</string>
     <string name="all_teacher">Учитель</string>
@@ -304,44 +378,63 @@
     <string name="all_subject">Предмет</string>
     <string name="all_prev">Предыдущий</string>
     <string name="all_next">Следующий</string>
-
-
+    <string name="all_search">Поиск</string>
+    <string name="all_search_hint">Поиск…</string>
     <!--Timetable Widget-->
     <string name="widget_timetable_no_items">Нет уроков</string>
     <string name="widget_timetable_theme_title">Выбрать тему</string>
     <string name="widget_timetable_theme_light">Светлая</string>
     <string name="widget_timetable_theme_dark">Тёмная</string>
-
-
+    <string name="widget_timetable_theme_system">Тема системы</string>
     <!--Preferences-->
-    <string name="pref_view_header">Внешний вид</string>
-    <string name="pref_view_list">При входе открывать</string>
-    <string name="pref_view_grade_average_mode">Рассчитывание средней годовой оценки</string>
+    <string name="pref_view_header">Вид</string>
+    <string name="pref_view_list">Окно по умолчанию</string>
+    <string name="pref_view_grade_average_mode">Способ определения средней годовой оценки</string>
     <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
     <string name="pref_view_present">Показывать присутствия в посещаемости</string>
     <string name="pref_view_app_theme">Тема приложения</string>
-    <string name="pref_view_expand_grade">Больше оценок</string>
+    <string name="pref_view_expand_grade">Разворачивать оценки</string>
+    <string name="pref_view_timetable_show_timers">Отмечать текущий урок в расписании</string>
+    <string name="pref_view_timetable_show_groups">Показать группу возле предмета в расписании</string>
+    <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
+    <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</string>
+    <string name="pref_view_subjects_without_grades">Показывать предметы без оценок в \"Оценках\"</string>
     <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
+    <string name="pref_view_grade_sorting_mode">Сортировка предметов в \"Оценках\"</string>
     <string name="pref_view_app_language">Язык приложения</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
+    <string name="pref_notify_upcoming_lessons_switch">Показывать уведомления о будущих уроках</string>
+    <string name="pref_notify_fix_sync_issues">Исправить проблемы с синхронизацией и уведомлениями</string>
+    <string name="pref_notify_fix_sync_issues_message">На вашем устройстве могут быть проблемы с синхронизацией данных и уведомлениями.\n\nЧтобы их исправить, вам необходимо добавить Wulkanowy в авто-старт и выключить оптимизацию/экономию батареи в настройках устройства.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Перейти в настройски</string>
     <string name="pref_notify_debug_switch">Показывать дебаг-уведомления</string>
     <string name="pref_services_header">Синхронизация</string>
     <string name="pref_services_switch">Автоматическая синхронизация</string>
     <string name="pref_services_suspended">Приостановить синхронизации во время каникул</string>
     <string name="pref_services_interval">Интервал синхронизации</string>
     <string name="pref_services_wifi">Только через Wi-Fi</string>
+    <string name="pref_services_force_sync">Синхронизировать</string>
+    <string name="pref_services_message_sync_success">Синхронизировано!</string>
+    <string name="pref_services_message_sync_failed">Синхронизация не удалась</string>
+    <string name="pref_services_sync_in_progress">Идёт синхронизация</string>
+    <string name="pref_services_dialog_force_sync_title">Синхронизация</string>
+    <string name="pref_services_dialog_force_sync_summary">Ручная синхронизация не обновляет данные в приложении.
+        \nЧтобы увидеть обновлённые данные, перезапустите приложение.
+    </string>
     <string name="pref_other_header">Другие</string>
-    <string name="pref_other_grade_modifier_plus">Вес плюса</string>
-    <string name="pref_other_grade_modifier_minus">Вес минуса</string>
-    <string name="pref_other_fill_message_content">Ответить с историей сообщений</string>
-
-
+    <string name="pref_other_grade_modifier_plus">Стоимость плюса</string>
+    <string name="pref_other_grade_modifier_minus">Стоимость минуса</string>
+    <string name="pref_other_fill_message_content">Отвечать с историей сообщений</string>
     <!--Notification Channels-->
     <string name="channel_new_entries">Новые данные в дневнике</string>
+    <string name="channel_new_grades">Новые оценки</string>
+    <string name="channel_lucky_number">Счастливый номер</string>
+    <string name="channel_new_message">Новые сообщения</string>
+    <string name="channel_new_notes">Новые заметки</string>
+    <string name="channel_push">Показывать push-уведомления</string>
+    <string name="channel_upcoming_lessons">Будущие уроки</string>
     <string name="channel_debug">Дебаг</string>
-
-
     <!--Colors-->
     <string name="all_black">Чёрный</string>
     <string name="all_red">Красный</string>
@@ -349,20 +442,16 @@
     <string name="all_green">Зелёный</string>
     <string name="all_purple">Фиолетовый</string>
     <string name="all_empty_color">Нет цвета</string>
-
-
     <!--Others-->
     <string name="all_copied">Скопировано</string>
     <string name="all_undo">Отменить</string>
-
-
     <!--Errors-->
     <string name="error_no_internet">Нет интернет-подключения</string>
     <string name="error_timeout">Слишком долгое ожидание соединения с дневником</string>
-    <string name="error_login_failed">Авторизация не удалась. Пожалуйста, попробуйте ещё раз или перезапустите дневник</string>
+    <string name="error_login_failed">Авторизация не удалась. Попробуйте ещё раз или перезапустите дневник</string>
+    <string name="error_password_change_required">Требуется смена пароля</string>
     <string name="error_service_unavailable">Технический перерыв в журнале UONET + продолжается. Попробуйте позже</string>
     <string name="error_unknown">Произошла неожиданная ошибка</string>
     <string name="error_feature_disabled">Функция была выключена школой</string>
     <string name="error_feature_not_available">Функция не доступна в этом режиме</string>
-
 </resources>
diff --git a/app/src/main/res/values-uk-v29/preferences_values.xml b/app/src/main/res/values-uk-v29/preferences_values.xml
new file mode 100644
index 000000000..52b41b4ef
--- /dev/null
+++ b/app/src/main/res/values-uk-v29/preferences_values.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Тема системи</item>
+        <item>Світла</item>
+        <item>Темна</item>
+        <item>Темна (AMOLED)</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
new file mode 100644
index 000000000..0ff8bfd0c
--- /dev/null
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
+        <item>Світла</item>
+        <item>Темна</item>
+        <item>Темна (AMOLED)</item>
+    </string-array>
+    <string-array name="app_language_entries">
+        <item>Мова системи</item>
+        <item>Polski</item>
+        <item>English</item>
+        <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
+    </string-array>
+    <string-array name="services_interval_entries">
+        <item>15 хвилин</item>
+        <item>30 хвилин</item>
+        <item>1 година</item>
+        <item>2 години</item>
+        <item>6 годин</item>
+        <item>12 годин</item>
+        <item>24 години</item>
+    </string-array>
+    <string-array name="grade_modifier_entries">
+        <item>0,0</item>
+        <item>0,25</item>
+        <item>0,33</item>
+        <item>0,5</item>
+        <item>0,75</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</item>
+    </string-array>
+    <string-array name="grade_color_scheme_entries">
+        <item>Dzienniczek+</item>
+        <item>Wulkanowy</item>
+        <item>Кольори оцінок в щоденнику</item>
+    </string-array>
+    <string-array name="grade_average_mode_entries">
+        <item>Середня оцінка з 2 семестру</item>
+        <item>Average of grades from both semesters</item>
+        <item>Average of grades from the whole year</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Не показувати</item>
+        <item>Показати все</item>
+        <item>Показати менше</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 000000000..ed10d24d4
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--Activity/Fragment title-->
+    <string name="login_title">Авторизація</string>
+    <string name="main_title">Wulkanowy</string>
+    <string name="grade_title">Оцінки</string>
+    <string name="attendance_title">Відвідуваність</string>
+    <string name="exam_title">Тести</string>
+    <string name="timetable_title">Розклад</string>
+    <string name="settings_title">Налаштування</string>
+    <string name="more_title">Інше</string>
+    <string name="about_title">Про додаток</string>
+    <string name="logviewer_title">Переглядач журналів</string>
+    <string name="contributors_title">Розробники</string>
+    <string name="license_title">Ліцензії</string>
+    <string name="message_title">Повідомлення</string>
+    <string name="send_message_title">Нове повідомлення</string>
+    <string name="note_title">Нотатки та досягнення</string>
+    <string name="homework_title">Домашні завдання</string>
+    <string name="account_title">Оберіть аккаунт</string>
+    <!--Subtitles-->
+    <string name="grade_subtitle">%1$d семестр, %2$d/%3$d</string>
+    <!--Login-->
+    <string name="login_header_default">Авторизуйтеся за допомогою аккаунта учня або батька</string>
+    <string name="login_header_symbol">Впишіть \"symbol\"</string>
+    <string name="login_nickname_hint">Ім\'я користувача</string>
+    <string name="login_email_hint">Електронна пошта</string>
+    <string name="login_login_pesel_email_hint">Логін, PESEL або електронна пошта</string>
+    <string name="login_password_hint">Пароль</string>
+    <string name="login_host_hint">Щоденник</string>
+    <string name="login_type_api">Мobile API</string>
+    <string name="login_type_scrapper">Scraper</string>
+    <string name="login_type_hybrid">Hybrid</string>
+    <string name="login_token_hint">Token</string>
+    <string name="login_pin_hint">PIN</string>
+    <string name="login_api_key_hint">Ключ API</string>
+    <string name="login_symbol_hint">Symbol</string>
+    <string name="login_sign_in">Увійти</string>
+    <string name="login_invalid_password">Занадто короткий пароль</string>
+    <string name="login_incorrect_password">Вказані невірні дані. Впевніться, що ви увібрали потрібний щоденник</string>
+    <string name="login_invalid_pin">Неправильний PIN</string>
+    <string name="login_invalid_token">Неправильний token</string>
+    <string name="login_expired_token">Минув термін дії токену</string>
+    <string name="login_invalid_email">Недійсна адреса електронної пошти</string>
+    <string name="login_invalid_login">Неправильний логін</string>
+    <string name="login_invalid_symbol">Неправильний symbol</string>
+    <string name="login_incorrect_symbol">Не вдалося знайти учня. Будь ласка, перевірте \"symbol\"</string>
+    <string name="login_field_required">Обов\'язкове поле</string>
+    <string name="login_duplicate_student">Даного учня вже авторизовано</string>
+    <string name="login_symbol_helper">Ви можете знайти \"symbol\" на сторінцi VULCAN стежкою <b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
+    <string name="login_select_student">Виберіть учнів для авторизації в додатку</string>
+    <string name="login_advanced">Інші варіанти</string>
+    <string name="login_advanced_warning_mobile_api">У цьому режимі не працюють: щасливий номер, статистика класу по оцінкам, статистика відвідуваності і уроків, інформація про школу і список зареєстрованних пристроїв</string>
+    <string name="login_advanced_warning_scraper">Scraper - режим, котрий показує дані так само, як і сторінка щоденника</string>
+    <string name="login_advanced_warning_hybrid">Hybrid - це комбінація найкращих функцій інших двох режимів. Він працює швидше, ніж Scraper, и впроваджує функції, котрих нема в режимі Mobile API. Знаходиться в експериментальній стадії</string>
+    <string name="login_privacy_policy">Політика приватності</string>
+    <string name="login_contact_header">Проблеми з авторизацією? Зв\'яжіться з нами!</string>
+    <string name="login_contact_email">Електронна пошта</string>
+    <string name="login_contact_discord">Discord</string>
+    <string name="login_email_intent_title">Відправити лист</string>
+    <string name="login_email_details">Опишіть деталі помилки:</string>
+    <string name="login_recover_warning">Переконайтесь, що обрано потрібний щоденник!</string>
+    <string name="login_recover_button">Забули пароль?</string>
+    <string name="login_recover_title">Відновіть свій аккаунт</string>
+    <string name="login_recover">Відновити</string>
+    <string name="login_signed_in">Учень вже увійшов до системи</string>
+    <!--Main-->
+    <string name="main_account_picker">Менеджер аккаунтів</string>
+    <string name="main_log_in">Увійти</string>
+    <string name="main_session_expired">Минув термін дії сесії</string>
+    <string name="main_session_relogin">Минув термін дії сесії, авторизуйтеся знову</string>
+    <!--Grade-->
+    <string name="grade_header">Оцінка</string>
+    <string name="grade_semester">%d семестр</string>
+    <string name="grade_switch_semester">Змінити семестр</string>
+    <string name="grade_no_items">Брак оцінок</string>
+    <string name="grade_weight">Вартість</string>
+    <string name="grade_weight_value">Вартість: %s</string>
+    <string name="grade_comment">Коментар</string>
+    <string name="grade_no_new_items">Брак нових оцінок</string>
+    <string name="grade_number_new_items">Кількість нових оцінок: %1$d</string>
+    <string name="grade_average">Середня оцінка: %1$.2f</string>
+    <string name="grade_points_sum">точок: %s</string>
+    <string name="grade_no_average">Брак середньої оцінки</string>
+    <string name="grade_predicted">Очікувана оцінка: %1$s</string>
+    <string name="grade_final">Підсумкова оцінка: %1$s</string>
+    <string name="grade_summary_points">Сума балів</string>
+    <string name="grade_summary_final_grade">Підсумкова оцінка</string>
+    <string name="grade_summary_predicted_grade">Очікувана оцінка</string>
+    <string name="grade_summary_calculated_average">Розрахована середня оцінка</string>
+    <string name="grade_summary_final_average">Підсумкова середня оцінка</string>
+    <string name="grade_menu_summary">Підсумок</string>
+    <string name="grade_menu_statistics">Клас</string>
+    <string name="grade_menu_read">Позначити як прочитане</string>
+    <string name="grade_statistics_partial">Поточні</string>
+    <string name="grade_statistics_semester">Семестрові</string>
+    <string name="grade_statistics_points">Бали</string>
+    <plurals name="grade_number_item">
+        <item quantity="one">%d оцінка</item>
+        <item quantity="few">%d оцінки</item>
+        <item quantity="many">%d оцінок</item>
+        <item quantity="other">%d оцінок</item>
+    </plurals>
+    <plurals name="grade_new_items">
+        <item quantity="one">Нова оцінка</item>
+        <item quantity="few">Нові оцінки</item>
+        <item quantity="many">Нові оцінки</item>
+        <item quantity="other">Нові оцінки</item>
+    </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="few">New predicted grades</item>
+        <item quantity="many">New predicted grades</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="few">New final grades</item>
+        <item quantity="many">New final grades</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items">
+        <item quantity="one">Ви отримали %1$d оцінку</item>
+        <item quantity="few">Ви отримали %1$d оцінки</item>
+        <item quantity="many">Ви отримали %1$d оцінок</item>
+        <item quantity="other">Ви отримали %1$d оцінок</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="few">You received %1$d predicted grades</item>
+        <item quantity="many">You received %1$d predicted grades</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="few">You received %1$d final grades</item>
+        <item quantity="many">You received %1$d final grades</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
+    <!--Timetable-->
+    <string name="timetable_lesson">Урок</string>
+    <string name="timetable_room">Аудиторія</string>
+    <string name="timetable_group">Група</string>
+    <string name="timetable_time">Години</string>
+    <string name="timetable_changes">Зміни</string>
+    <string name="timetable_no_items">Брак уроків у цей день</string>
+    <string name="timetable_minutes">%s хвилин</string>
+    <string name="timetable_seconds">%s сек</string>
+    <string name="timetable_time_left">%1$s лишилося</string>
+    <string name="timetable_time_until">через %1$s</string>
+    <string name="timetable_finished">Завершено</string>
+    <string name="timetable_now">Зараз: %s</string>
+    <string name="timetable_next">Наступний: %s</string>
+    <string name="timetable_later">Пізніше: %s</string>
+    <!--Completed lessons-->
+    <string name="completed_lessons_title">Уроки, що відбулися</string>
+    <string name="completed_lessons_button">Показати уроки, що відбулися</string>
+    <string name="completed_lessons_no_items">Брак інформації о уроках, що відбулися</string>
+    <string name="completed_lessons_topic">Тема</string>
+    <string name="completed_lessons_absence">Відсутність</string>
+    <string name="completed_lessons_resources">Ресурси</string>
+    <!--Attendance-->
+    <string name="attendance_summary_button">Підсумок відвідуваності</string>
+    <string name="attendance_absence_school">Відсутність зі шкільних причин</string>
+    <string name="attendance_absence_excused">Відсутність з поважних причин</string>
+    <string name="attendance_absence_unexcused">Відсутність з не поважних причин</string>
+    <string name="attendance_exemption">Звільнення</string>
+    <string name="attendance_excused_lateness">Спізнення з поважних причин</string>
+    <string name="attendance_unexcused_lateness">Спізнення з не поважних причин</string>
+    <string name="attendance_present">Присутність</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
+    <string name="attendance_number">Номер уроку</string>
+    <string name="attendance_no_items">Брак записів</string>
+    <plurals name="attendance_number_absences">
+        <item quantity="one">%1$d відсутність</item>
+        <item quantity="few">%1$d відсутності</item>
+        <item quantity="many">%1$d відсутностей</item>
+        <item quantity="other">%1$d відсутностей</item>
+    </plurals>
+    <string name="attendance_excuse_dialog_reason">Причина відсутності (необов’язково)</string>
+    <string name="attendance_excuse_dialog_submit">Надіслати</string>
+    <string name="attendance_excuse_success">Змінено статус відсутності</string>
+    <string name="attendance_excuse_no_selection">Оберіть хоча б одну відсутність</string>
+    <string name="attendance_excuse_title">Змінити статус</string>
+    <!--Attendance summary-->
+    <string name="attendance_summary_final">Відвідуваність</string>
+    <string name="attendance_summary_total">Загальна</string>
+    <!--Exam-->
+    <string name="exam_no_items">Брак тестів у цьому тижні</string>
+    <string name="exam_type">Тип</string>
+    <string name="exam_entry_date">Дата запису</string>
+    <!--Message-->
+    <string name="message_inbox">Отримані</string>
+    <string name="message_sent">Відправлені</string>
+    <string name="message_trash">Кошик</string>
+    <string name="message_no_subject">(брак теми)</string>
+    <string name="message_no_items">Нема повідомлень</string>
+    <string name="message_preview_error">З\'явилася помилка підчас завантаження змісту повідомлення</string>
+    <string name="message_from">Від:</string>
+    <string name="message_to">Кому:</string>
+    <string name="message_date">Дата: %s</string>
+    <string name="message_reply">Відповісти</string>
+    <string name="message_forward">Переслати</string>
+    <string name="message_delete">Видалити</string>
+    <string name="message_move_to_bin">Перемістити у кошик</string>
+    <string name="message_delete_forever">Видалити назавжди</string>
+    <string name="message_delete_success">Повідомлення було успішно видалено</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
+    <string name="message_subject">Тема</string>
+    <string name="message_content">Зміст</string>
+    <string name="message_send_successful">Повідомлення було успішно відправлено</string>
+    <string name="message_required_recipients">Необхідно обрати принаймні 1 адресата</string>
+    <string name="message_content_min_length">Зміст повідомлення мусить складатися принаймні з 3 знаків</string>
+    <plurals name="message_number_item">
+        <item quantity="one">%d повідомлення</item>
+        <item quantity="few">%d повідомлення</item>
+        <item quantity="many">%d повідомлень</item>
+        <item quantity="other">%d повідомлень</item>
+    </plurals>
+    <plurals name="message_new_items">
+        <item quantity="one">Нове повідомлення</item>
+        <item quantity="few">Нові повідомлення</item>
+        <item quantity="many">Нові повідомлення</item>
+        <item quantity="other">Нові повідомлення</item>
+    </plurals>
+    <plurals name="message_notify_new_items">
+        <item quantity="one">Ви отримали %1$d нове повідомлення</item>
+        <item quantity="few">Ви отримали %1$d нових повідомлення</item>
+        <item quantity="many">Ви отримали %1$d нових повідомлень</item>
+        <item quantity="other">Ви отримали %1$d нових повідомлень</item>
+    </plurals>
+    <!--Note-->
+    <string name="note_no_items">Брак інформації о зауваженнях</string>
+    <string name="note_points">Бали</string>
+    <plurals name="note_number_item">
+        <item quantity="one">%d зауваження</item>
+        <item quantity="few">%d зауваження</item>
+        <item quantity="many">%d зауважень</item>
+        <item quantity="other">%d зауважень</item>
+    </plurals>
+    <plurals name="note_new_items">
+        <item quantity="one">Нова нотатка</item>
+        <item quantity="few">Нові нотатки</item>
+        <item quantity="many">Нових нотаток</item>
+        <item quantity="other">Нових нотаток</item>
+    </plurals>
+    <plurals name="note_notify_new_items">
+        <item quantity="one">%1$d нове зауваження</item>
+        <item quantity="few">%1$d нових зауваження</item>
+        <item quantity="many">%1$d нових зауважень</item>
+        <item quantity="other">%1$d нових зауважень</item>
+    </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="few">%d praises</item>
+        <item quantity="many">%d praises</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="few">New praises</item>
+        <item quantity="many">New praises</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="few">You received %1$d praises</item>
+        <item quantity="many">You received %1$d praises</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="few">%d neutral notes</item>
+        <item quantity="many">%d neutral notes</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="few">New neutral notes</item>
+        <item quantity="many">New neutral notes</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="few">You received %1$d neutral notes</item>
+        <item quantity="many">You received %1$d neutral notes</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+    <!--Homework-->
+    <string name="homework_no_items">Брак домашніх завдань</string>
+    <string name="homework_mark_as_done">Позначити як зроблене</string>
+    <string name="homework_mark_as_undone">Позначити як не зроблене</string>
+    <string name="homework_attachments">Додатки</string>
+    <!--Lucky number-->
+    <string name="lucky_number_title">Щасливий номер</string>
+    <string name="lucky_number_header">Сьогоднішній щасливий номер</string>
+    <string name="lucky_number_empty">Брак інформації о щасливому номері</string>
+    <string name="lucky_number_notify_new_item_title">Сьогоднішній щасливий номер</string>
+    <string name="lucky_number_notify_new_item">Сьогоднішнім щасливим номером є %d</string>
+    <!--Mobile devices-->
+    <string name="mobile_devices_title">Мобільні пристрої</string>
+    <string name="mobile_devices_no_items">Брак пристроїв</string>
+    <string name="mobile_devices_unregister">Видалити</string>
+    <string name="mobile_device_removed">Пристрій видалено</string>
+    <string name="mobile_device_qr">QR-код</string>
+    <string name="mobile_device_token">Token</string>
+    <string name="mobile_device_symbol">Symbol</string>
+    <string name="mobile_device_pin">PIN</string>
+    <!--School and teachers-->
+    <string name="schoolandteachers_title">Школа та вчителі</string>
+    <!--School-->
+    <string name="school_title">Школа</string>
+    <string name="school_no_info">Брак інформації про школу</string>
+    <string name="school_name">Назва школи</string>
+    <string name="school_address">Адреса школи</string>
+    <string name="school_telephone">Телефон</string>
+    <string name="school_headmaster">Директор</string>
+    <string name="school_pedagogue">Викладач</string>
+    <string name="school_address_button">Показати на мапі</string>
+    <string name="school_telephone_button">Зателефонувати</string>
+    <!--Teacher-->
+    <string name="teachers_title">Вчителі</string>
+    <string name="teacher_no_items">Брак інформації про вчителів</string>
+    <string name="teacher_no_subject">Брак предмету</string>
+    <!--Account-->
+    <string name="account_add_new">Додати аккаунт</string>
+    <string name="account_logout">Вийти</string>
+    <string name="account_confirm">Ви впевнені, що хочете вийти з цього аккаунту?</string>
+    <string name="account_logout_student">Вийти з аккаунту учня</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_login_mobile_api">Mobile API mode</string>
+    <string name="account_login_hybrid">Hybrid mode</string>
+    <!--About-->
+    <string name="about_version">Версія додатка</string>
+    <string name="about_contributor">Розробники</string>
+    <string name="about_contributor_summary">Список розробників \"Wulkanowy\"</string>
+    <string name="about_feedback">Виникла помилка?</string>
+    <string name="about_feedback_summary">Повідомити о помилці за допомогою e-mail</string>
+    <string name="about_faq">FAQ</string>
+    <string name="about_faq_summary">Запитання, які часто задають</string>
+    <string name="about_discord">Сервер Discord</string>
+    <string name="about_discord_summary">Приєднатися до спільноти додатка</string>
+    <string name="about_privacy">Політика конфіденційності</string>
+    <string name="about_privacy_summary">Правила зберігання особистих даних</string>
+    <string name="about_homepage">Домашня сторінка</string>
+    <string name="about_homepage_summary">Допомогти розвитку додатка</string>
+    <string name="about_licenses">Ліцензії</string>
+    <string name="about_licenses_summary">Ліцензії вжитих бібліотек</string>
+    <!--Licenses-->
+    <string name="license_dialog_title">Ліцензія</string>
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Аватар</string>
+    <string name="contributor_see_more">Сторінка проекту на GitHub</string>
+    <!--Log viewer-->
+    <string name="logviewer_share">Поділитися логами</string>
+    <string name="logviewer_refresh">Оновити</string>
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Провірити наявність оновлень</string>
+    <string name="dialog_error_check_update_message">Перед тим, як повідомлювати о помілці, перевірте наявність оновлень</string>
+    <!--Generic-->
+    <string name="all_content">Зміст</string>
+    <string name="all_retry">Повторити</string>
+    <string name="all_description">Опис</string>
+    <string name="all_no_description">Брак опису</string>
+    <string name="all_teacher">Вчитель</string>
+    <string name="all_date">Дата</string>
+    <string name="all_entry_date">Дата запису</string>
+    <string name="all_color">Колір</string>
+    <string name="all_details">Деталі</string>
+    <string name="all_category">Категорія</string>
+    <string name="all_close">Закрити</string>
+    <string name="all_no_data">Немає даних</string>
+    <string name="all_subject">Предмет</string>
+    <string name="all_prev">Попередній</string>
+    <string name="all_next">Наступний</string>
+    <string name="all_search">Пошук</string>
+    <string name="all_search_hint">Пошук…</string>
+    <!--Timetable Widget-->
+    <string name="widget_timetable_no_items">Брак уроків</string>
+    <string name="widget_timetable_theme_title">Увібрати тему</string>
+    <string name="widget_timetable_theme_light">Яскрава</string>
+    <string name="widget_timetable_theme_dark">Темна</string>
+    <string name="widget_timetable_theme_system">Тема системи</string>
+    <!--Preferences-->
+    <string name="pref_view_header">Вигляд</string>
+    <string name="pref_view_list">Вікно за замовчуванням</string>
+    <string name="pref_view_grade_average_mode">Спосіб облічування оцінки на кінець року</string>
+    <string name="pref_view_grade_average_force_calc">Примусово розрахувати середню оцінку через додаток</string>
+    <string name="pref_view_present">Показувати присутність у відвідуваності</string>
+    <string name="pref_view_app_theme">Тема додатку</string>
+    <string name="pref_view_expand_grade">Більше оцінок</string>
+    <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
+    <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
+    <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
+    <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in \"Grades\"</string>
+    <string name="pref_view_app_language">Мова додатку</string>
+    <string name="pref_notify_header">Повідомлення</string>
+    <string name="pref_notify_switch">Показувати повідомлення</string>
+    <string name="pref_notify_upcoming_lessons_switch">Показувати повідомлення о наступних уроках</string>
+    <string name="pref_notify_fix_sync_issues">Виправити помилки з синхронізацією і повідомленнями</string>
+    <string name="pref_notify_fix_sync_issues_message">На вашому пристрої можуть бути помилки з синхронізацією і повідомленнями\n\nЩоб виправити іх, вам необхідно додати Wulkanowy в авто-старт и вимкнути оптимізацію/экономію батареї в налаштуваннях пристрою.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Перейти до налаштувань</string>
+    <string name="pref_notify_debug_switch">Показувати дебаг-повідомлення</string>
+    <string name="pref_services_header">Синхронізація</string>
+    <string name="pref_services_switch">Автоматична синхронізація</string>
+    <string name="pref_services_suspended">Призупинено на час канікул</string>
+    <string name="pref_services_interval">Інтервал оновлення</string>
+    <string name="pref_services_wifi">Тільки через Wi-Fi</string>
+    <string name="pref_services_force_sync">Синхронізувати</string>
+    <string name="pref_services_message_sync_success">Синхронізовано!</string>
+    <string name="pref_services_message_sync_failed">Синхронізація не вдалася</string>
+    <string name="pref_services_sync_in_progress">Триває синхронізація</string>
+    <string name="pref_services_dialog_force_sync_title">Синхронізація</string>
+    <string name="pref_services_dialog_force_sync_summary">Ручна синхронізація не оновлює дані в додатку.
+        \nЩоб побачити оновлені дані, перезавантажте додаток.
+    </string>
+    <string name="pref_other_header">Інші</string>
+    <string name="pref_other_grade_modifier_plus">Вартість плюсу</string>
+    <string name="pref_other_grade_modifier_minus">Вага мінуса</string>
+    <string name="pref_other_fill_message_content">Відповісти з історією повідомлень</string>
+    <!--Notification Channels-->
+    <string name="channel_new_entries">Нові дані в щоденнику</string>
+    <string name="channel_new_grades">Нові оцінки</string>
+    <string name="channel_lucky_number">Щасливий номер</string>
+    <string name="channel_new_message">Нові повідомлення</string>
+    <string name="channel_new_notes">Нові нотатки</string>
+    <string name="channel_push">Показувати push-повідомлення</string>
+    <string name="channel_upcoming_lessons">Наступні уроки</string>
+    <string name="channel_debug">Дебаг</string>
+    <!--Colors-->
+    <string name="all_black">Чорний</string>
+    <string name="all_red">Червоний</string>
+    <string name="all_blue">Голубий</string>
+    <string name="all_green">Зелений</string>
+    <string name="all_purple">Фіолетовий</string>
+    <string name="all_empty_color">Брак кольору</string>
+    <!--Others-->
+    <string name="all_copied">Скопійовано</string>
+    <string name="all_undo">Відмінити</string>
+    <!--Errors-->
+    <string name="error_no_internet">Брак з\'єднання з інтернетом</string>
+    <string name="error_timeout">Занадто довге очікування з\'єднання з щоденником</string>
+    <string name="error_login_failed">Аутентифікація не вдалася. Спробуйте ще раз або запустіть додаток знову</string>
+    <string name="error_password_change_required">Потрібно змінити пароль</string>
+    <string name="error_service_unavailable">Технічна перерва в журналі UONET + продовжується. Спробуйте пізніше</string>
+    <string name="error_unknown">Відбулася несподівана помилка</string>
+    <string name="error_feature_disabled">Функція вимкнена школою</string>
+    <string name="error_feature_not_available">Функція не доступна в цьому режимі</string>
+</resources>
diff --git a/app/src/main/res/values/api_hosts.xml b/app/src/main/res/values/api_hosts.xml
index df42f592b..29434602e 100644
--- a/app/src/main/res/values/api_hosts.xml
+++ b/app/src/main/res/values/api_hosts.xml
@@ -7,15 +7,60 @@
         <item>Lubelski Portal Oświatowy</item>
         <item>EduNet Miasta Tarnowa</item>
         <item>ResMan Rzeszów</item>
+        <item>Platforma Edukacyjna Koszalina</item>
+        <item>Rawa Mazowiecka - Platforma vEdukacja</item>
+        <item>Zduńska Wola - e-Urząd</item>
+        <item>Sieradz - Portal oświatowy</item>
+        <item>Skarżysko-Kamienna - e-Skarżysko</item>
+        <item>Łask - Platforma vEdukacja</item>
+        <item>Powiat łaski - Platforma edukacyjna</item>
+        <item>Powiat Krasnostawski - Platforma oświatowa</item>
+        <item>Powiat kętrzyński - Platforma e-Usług</item>
+        <item>Gmina Ulan-Majorat - Platforma oświatowa</item>
+        <item>Gmina Ozorków - Platforma edukacyjna</item>
+        <item>Gmina Łopiennik Górny - Platforma oświatowa</item>
         <item>Fakelog</item>
     </string-array>
     <string-array name="hosts_values">
-        <item>https://vulcan.net.pl</item>
+        <item>https://vulcan.net.pl/?standard</item>
         <item>https://eszkola.opolskie.pl</item>
         <item>https://edu.gdansk.pl</item>
         <item>https://edu.lublin.eu</item>
         <item>https://umt.tarnow.pl</item>
         <item>https://resman.pl</item>
-        <item>http://fakelog.cf</item>
+        <item>https://eduportal.koszalin.pl</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>https://vulcan.net.pl/</item>
+        <item>http://fakelog.tk/?standard</item>
+    </string-array>
+    <string-array name="hosts_symbols">
+        <item>Default</item>
+        <item>opole</item>
+        <item>gdansk</item>
+        <item>lublin</item>
+        <item>tarnow</item>
+        <item>rzeszow</item>
+        <item>koszalin</item>
+        <item>rawamazowiecka</item>
+        <item>zdunskawola</item>
+        <item>sieradz</item>
+        <item>skarzyskokamienna</item>
+        <item>lask</item>
+        <item>powiatlaski</item>
+        <item>powiatkrasnostawski</item>
+        <item>powiatketrzynski</item>
+        <item>gminaulanmajorat</item>
+        <item>gminaozorkow</item>
+        <item>gminalopiennikgorny</item>
+        <item>powiatwulkanowy</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/api_symbols.xml b/app/src/main/res/values/api_symbols.xml
index d9f89a238..6f9b1739d 100644
--- a/app/src/main/res/values/api_symbols.xml
+++ b/app/src/main/res/values/api_symbols.xml
@@ -18,6 +18,8 @@
         <item>Bielsko-Biała</item>
         <item>Bierawa</item>
         <item>Bierutów</item>
+        <item>Biskupice</item>
+        <item>Blachownia</item>
         <item>Błaszki</item>
         <item>Błonie</item>
         <item>Bochnia</item>
@@ -57,6 +59,7 @@
         <item>Dąbrowa Tarnowska</item>
         <item>Dębica</item>
         <item>Dobrzeń Wielki</item>
+        <item>Dobrzyń Nad Wisłą</item>
         <item>Dolnośląskie</item>
         <item>Duszniki-Zdrój</item>
         <item>Dynów</item>
@@ -77,36 +80,53 @@
         <item>Gmina Aleksandrów Kujawski</item>
         <item>Gmina Aleksandrów Łódzki</item>
         <item>Gmina Alwernia</item>
+        <item>Gmina Andrzejewo</item>
         <item>Gmina Annopol</item>
+        <item>Gmina Augustów</item>
         <item>Gmina Babice</item>
+        <item>Gmina Bądkowo</item>
         <item>Gmina Bałtów</item>
         <item>Gmina Baranów</item>
+        <item>Gmina Barciany</item>
         <item>Gmina Barcin</item>
         <item>Gmina Baruchowo</item>
         <item>Gmina Będzino</item>
         <item>Gmina Bełchatów</item>
+        <item>Gmina Białaczów</item>
         <item>Gmina Białe Błota</item>
+        <item>Gmina Bielsk Podlaski</item>
         <item>Gmina Bircza</item>
         <item>Gmina Błażowa</item>
         <item>Gmina Błędów</item>
         <item>Gmina Bobolice</item>
+        <item>Gmina Bobowa</item>
         <item>Gmina Bobowo</item>
         <item>Gmina Bobrowniki</item>
+        <item>Gmina Bodzentyn</item>
+        <item>Gmina Bogoria</item>
+        <item>Gmina Bojanów</item>
         <item>Gmina Bojanowo</item>
         <item>Gmina Bojszowy</item>
         <item>Gmina Bolesławiec</item>
         <item>Gmina Bolków</item>
         <item>Gmina Boronów</item>
+        <item>Gmina Borów</item>
         <item>Gmina Borowa</item>
         <item>Gmina Borzęcin</item>
         <item>Gmina Branice</item>
+        <item>Gmina Braniewo</item>
         <item>Gmina Brąszewice</item>
         <item>Gmina Brenna</item>
         <item>Gmina Brzeg Dolny</item>
         <item>Gmina Brzeziny</item>
         <item>Gmina Brzeźnio</item>
+        <item>Gmina Brzostek</item>
         <item>Gmina Brzozów</item>
+        <item>Gmina Brzuze</item>
         <item>Gmina Brzyska</item>
+        <item>Gmina Buczek</item>
+        <item>Gmina Buczkowice</item>
+        <item>Gmina Budzów</item>
         <item>Gmina Budzyń</item>
         <item>Gmina Bukowsko</item>
         <item>Gmina Byczyna</item>
@@ -115,15 +135,15 @@
         <item>Gmina Ceków-Kolonia</item>
         <item>Gmina Celestynów</item>
         <item>Gmina Cewice</item>
+        <item>Gmina Charsznica</item>
         <item>Gmina Chełm</item>
         <item>Gmina Chełmiec</item>
         <item>Gmina Chełmno</item>
         <item>Gmina Chmielnik</item>
-        <item>Gmina Chodecz</item>
+        <item>Gmina Chocz</item>
         <item>Gmina Chodel</item>
         <item>Gmina Chojnice</item>
         <item>Gmina Chojnów</item>
-        <item>Gmina Chorkówka</item>
         <item>Gmina Chrzypsko Wielkie</item>
         <item>Gmina Chybie</item>
         <item>Gmina Ciasna</item>
@@ -135,12 +155,12 @@
         <item>Gmina Czaplinek</item>
         <item>Gmina Czarna</item>
         <item>Gmina Czarnków</item>
-        <item>Gmina Czarny Bór</item>
         <item>Gmina Czarny Dunajec</item>
         <item>Gmina Czechowice-Dziedzice</item>
         <item>Gmina Czernichów</item>
         <item>Gmina Czerniejewo</item>
         <item>Gmina Czerwionka-Leszczyny</item>
+        <item>Gmina Czerwonka</item>
         <item>Gmina Człuchów</item>
         <item>Gmina Czosnów</item>
         <item>Gmina Damasławek</item>
@@ -148,6 +168,7 @@
         <item>Gmina Darłowo</item>
         <item>Gmina Dębe Wielkie</item>
         <item>Gmina Dębica</item>
+        <item>Gmina Dębno</item>
         <item>Gmina Dłutów</item>
         <item>Gmina Dobczyce</item>
         <item>Gmina Dobra</item>
@@ -159,6 +180,7 @@
         <item>Gmina Dominowo</item>
         <item>Gmina Dorohusk</item>
         <item>Gmina Drzewica</item>
+        <item>Gmina Dubiecko</item>
         <item>Gmina Dukla</item>
         <item>Gmina Dwikozy</item>
         <item>Gmina Dynów</item>
@@ -182,6 +204,7 @@
         <item>Gmina Głuszyca</item>
         <item>Gmina Gniew</item>
         <item>Gmina Gniewoszów</item>
+        <item>Gmina Gniezno</item>
         <item>Gmina Goczałkowice-Zdrój</item>
         <item>Gmina Godkowo</item>
         <item>Gmina Godów</item>
@@ -200,6 +223,7 @@
         <item>Gmina Gózd</item>
         <item>Gmina Grabów</item>
         <item>Gmina Grabowiec</item>
+        <item>Gmina Grabów Nad Pilicą</item>
         <item>Gmina Grajewo</item>
         <item>Gmina Granowo</item>
         <item>Gmina Grębocice</item>
@@ -210,6 +234,7 @@
         <item>Gmina Grodziec</item>
         <item>Gmina Grójec</item>
         <item>Gmina Gromadka</item>
+        <item>Gmina Gromnik</item>
         <item>Gmina Gronowo Elbląskie</item>
         <item>Gmina Grudziądz</item>
         <item>Gmina Gruta</item>
@@ -219,13 +244,17 @@
         <item>Gmina Hańsk</item>
         <item>Gmina Harasiuki</item>
         <item>Gmina Hażlach</item>
+        <item>Gmina Herby</item>
         <item>Gmina Hrubieszów</item>
+        <item>Gmina Huszlew</item>
         <item>Gmina Hyżne</item>
         <item>Gmina Imielno</item>
         <item>Gmina Inowrocław</item>
+        <item>Gmina Istebna</item>
         <item>Gmina Iwierzyce</item>
         <item>Gmina Iwonicz-Zdrój</item>
         <item>Gmina Izabelin</item>
+        <item>Gmina Izbica</item>
         <item>Gmina Jadów</item>
         <item>Gmina Jaktorów</item>
         <item>Gmina Janikowo</item>
@@ -237,19 +266,23 @@
         <item>Gmina Jasło</item>
         <item>Gmina Jastków</item>
         <item>Gmina Jastrowie</item>
+        <item>Gmina Jastrząb</item>
         <item>Gmina Jedlicze</item>
         <item>Gmina Jedlińsk</item>
         <item>Gmina Jedlnia-Letnisko</item>
         <item>Gmina Jejkowice</item>
         <item>Gmina Jemielnica</item>
+        <item>Gmina Jemielno</item>
         <item>Gmina Jerzmanowa</item>
         <item>Gmina Jeżewo</item>
         <item>Gmina Jeziora Wielkie</item>
+        <item>Gmina Jeziorzany</item>
         <item>Gmina Jeżowe</item>
         <item>Gmina Jordanów</item>
         <item>Gmina Józefów</item>
         <item>Gmina Józefów Nad Wisłą</item>
         <item>Gmina Jutrosin</item>
+        <item>Gmina Kąkolewnica</item>
         <item>Gmina Kamień</item>
         <item>Gmina Kamienica</item>
         <item>Gmina Kamieniec</item>
@@ -262,9 +295,11 @@
         <item>Gmina Kiełczygłów</item>
         <item>Gmina Kikół</item>
         <item>Gmina Kiszkowo</item>
+        <item>Gmina Kleczew</item>
         <item>Gmina Klembów</item>
         <item>Gmina Kleszczewo</item>
         <item>Gmina Kleszczów</item>
+        <item>Gmina Klimontów</item>
         <item>Gmina Kłobuck</item>
         <item>Gmina Kłoczew</item>
         <item>Gmina Kłomnice</item>
@@ -272,6 +307,8 @@
         <item>Gmina Klucze</item>
         <item>Gmina Kluczewsko</item>
         <item>Gmina Kobiele Wielkie</item>
+        <item>Gmina Kochanowice</item>
+        <item>Gmina Kock</item>
         <item>Gmina Kodrąb</item>
         <item>Gmina Kołaczyce</item>
         <item>Gmina Kołbaskowo</item>
@@ -280,9 +317,13 @@
         <item>Gmina Komańcza</item>
         <item>Gmina Komorniki</item>
         <item>Gmina Komprachcice</item>
+        <item>Gmina Konarzyny</item>
+        <item>Gmina Kondratowice</item>
+        <item>Gmina Koniusza</item>
         <item>Gmina Konopiska</item>
         <item>Gmina Końskowola</item>
-        <item>Gmina Korczyna</item>
+        <item>Gmina Koprzywnica</item>
+        <item>Gmina Korsze</item>
         <item>Gmina Korycin</item>
         <item>Gmina Korzenna</item>
         <item>Gmina Kosakowo</item>
@@ -291,6 +332,7 @@
         <item>Gmina Kościerzyna</item>
         <item>Gmina Kosów Lacki</item>
         <item>Gmina Kostrzyn</item>
+        <item>Gmina Koszyce</item>
         <item>Gmina Kotla</item>
         <item>Gmina Kotuń</item>
         <item>Gmina Kozłów</item>
@@ -302,22 +344,31 @@
         <item>Gmina Krokowa</item>
         <item>Gmina Krośnice</item>
         <item>Gmina Krupski Młyn</item>
+        <item>Gmina Kruszwica</item>
+        <item>Gmina Krynki</item>
         <item>Gmina Krzanowice</item>
         <item>Gmina Krzemieniewo</item>
         <item>Gmina Krzymów</item>
+        <item>Gmina Krzywiń</item>
         <item>Gmina Krzyżanowice</item>
+        <item>Gmina Książ Wielki</item>
         <item>Gmina Kunice</item>
         <item>Gmina Kunów</item>
         <item>Gmina Kurów</item>
+        <item>Gmina Kuryłówka</item>
         <item>Gmina Kwidzyn</item>
         <item>Gmina Kwilcz</item>
+        <item>Gmina Łabowa</item>
         <item>Gmina Łabunie</item>
         <item>Gmina Łambinowice</item>
         <item>Gmina Lanckorona</item>
         <item>Gmina Łapsze Niżne</item>
+        <item>Gmina Łasin</item>
         <item>Gmina Łaskarzew</item>
         <item>Gmina Lasowice Wielkie</item>
         <item>Gmina Łaszczów</item>
+        <item>Gmina Laszki</item>
+        <item>Gmina Latowicz</item>
         <item>Gmina Łazy</item>
         <item>Gmina Łęczyca</item>
         <item>Gmina Łęczyce</item>
@@ -329,16 +380,20 @@
         <item>Gmina Leśna Podlaska</item>
         <item>Gmina Lesznowola</item>
         <item>Gmina Leżajsk</item>
+        <item>Gmina Lichnowy</item>
         <item>Gmina Limanowa</item>
+        <item>Gmina Linia</item>
         <item>Gmina Lipinki</item>
         <item>Gmina Lipnik</item>
         <item>Gmina Lipowa</item>
         <item>Gmina Lisia Góra</item>
         <item>Gmina Liszki</item>
+        <item>Gmina Liw</item>
         <item>Gmina Łobez</item>
         <item>Gmina Łodygowice</item>
         <item>Gmina Łomazy</item>
         <item>Gmina Łopiennik Górny</item>
+        <item>Gmina Łopuszno</item>
         <item>Gmina Lubań</item>
         <item>Gmina Lubartów</item>
         <item>Gmina Lubasz</item>
@@ -348,30 +403,40 @@
         <item>Gmina Lubiewo</item>
         <item>Gmina Lubin</item>
         <item>Gmina Łubniany</item>
+        <item>Gmina Lubochnia</item>
         <item>Gmina Lubomia</item>
         <item>Gmina Luboń</item>
         <item>Gmina Łuków</item>
+        <item>Gmina Łukowica</item>
+        <item>Gmina Lutowiska</item>
         <item>Gmina Luzino</item>
         <item>Gmina Łużna</item>
         <item>Gmina Łysomice</item>
         <item>Gmina Magnuszew</item>
         <item>Gmina Maków Podhalański</item>
+        <item>Gmina Mała Wieś</item>
         <item>Gmina Malbork</item>
         <item>Gmina Małdyty</item>
+        <item>Gmina Małkinia Górna</item>
         <item>Gmina Marcinowice</item>
         <item>Gmina Margonin</item>
         <item>Gmina Marianowo</item>
+        <item>Gmina Markusy</item>
         <item>Gmina Masłów</item>
+        <item>Gmina Medyka</item>
         <item>Gmina Mełgiew</item>
+        <item>Gmina Michałów</item>
         <item>Gmina Michałowo</item>
         <item>Gmina Miedziana Góra</item>
         <item>Gmina Miedźna</item>
         <item>Gmina Miedźno</item>
         <item>Gmina Międzybórz</item>
         <item>Gmina Międzylesie</item>
+        <item>Gmina Międzyrzec Podlaski</item>
         <item>Gmina Międzyzdroje</item>
         <item>Gmina Miejsce Piastowe</item>
         <item>Gmina Mielec</item>
+        <item>Gmina Milanów</item>
         <item>Gmina Milejów</item>
         <item>Gmina Milicz</item>
         <item>Gmina Miłkowice</item>
@@ -385,28 +450,38 @@
         <item>Gmina Mogilany</item>
         <item>Gmina Mordy</item>
         <item>Gmina Moryń</item>
+        <item>Gmina Mrocza</item>
         <item>Gmina Mrozy</item>
         <item>Gmina Mszana</item>
         <item>Gmina Mszana Dolna</item>
         <item>Gmina Murów</item>
         <item>Gmina Mycielin</item>
+        <item>Gmina Mysłakowice</item>
         <item>Gmina Myślibórz</item>
         <item>Gmina Nadarzyn</item>
+        <item>Gmina Namysłów</item>
+        <item>Gmina Nasielsk</item>
         <item>Gmina Nawojowa</item>
+        <item>Gmina Nędza</item>
         <item>Gmina Nekla</item>
         <item>Gmina Niebylec</item>
         <item>Gmina Niechlów</item>
         <item>Gmina Niedrzwica Duża</item>
+        <item>Gmina Niedźwiada</item>
+        <item>Gmina Niedźwiedź</item>
         <item>Gmina Niegosławice</item>
         <item>Gmina Niwiska</item>
         <item>Gmina Nowa Ruda</item>
         <item>Gmina Nowa Wieś Lęborska</item>
         <item>Gmina Nowe Miasto</item>
         <item>Gmina Nowe Miasto Nad Wartą</item>
+        <item>Gmina Nowogród Bobrzański</item>
         <item>Gmina Nowosolna</item>
         <item>Gmina Nowy Kawęczyn</item>
         <item>Gmina Nowy Staw</item>
         <item>Gmina Nowy Targ</item>
+        <item>Gmina Nowy Tomyśl</item>
+        <item>Gmina Nur</item>
         <item>Gmina Obrazów</item>
         <item>Gmina Ochotnica Dolna</item>
         <item>Gmina Ogrodzieniec</item>
@@ -420,33 +495,45 @@
         <item>Gmina Osiek Jasielski</item>
         <item>Gmina Osiek Mały</item>
         <item>Gmina Osielsko</item>
+        <item>Gmina Ostrów</item>
         <item>Gmina Ostrówek</item>
         <item>Gmina Ostrów Lubelski</item>
         <item>Gmina Ostrów Mazowiecka</item>
         <item>Gmina Ostrów Wielkopolski</item>
         <item>Gmina Otyń</item>
         <item>Gmina Ożarów</item>
+        <item>Gmina Ożarowice</item>
         <item>Gmina Ozimek</item>
         <item>Gmina Ozorków</item>
         <item>Gmina Pabianice</item>
         <item>Gmina Pacanów</item>
+        <item>Gmina Paczków</item>
         <item>Gmina Padew Narodowa</item>
+        <item>Gmina Pajęczno</item>
         <item>Gmina Pakosław</item>
         <item>Gmina Pakosławice</item>
+        <item>Gmina Pałecznica</item>
         <item>Gmina Panki</item>
         <item>Gmina Parchowo</item>
         <item>Gmina Parczew</item>
         <item>Gmina Pawłosiów</item>
         <item>Gmina Pawłowice</item>
+        <item>Gmina Pawłowiczki</item>
+        <item>Gmina Pęcław</item>
         <item>Gmina Pelplin</item>
         <item>Gmina Piaski</item>
         <item>Gmina Piątnica</item>
+        <item>Gmina Piecki</item>
+        <item>Gmina Piekoszów</item>
         <item>Gmina Pilchowice</item>
         <item>Gmina Pionki</item>
+        <item>Gmina Piotrków Trybunalski</item>
         <item>Gmina Pleśna</item>
         <item>Gmina Pleszew</item>
         <item>Gmina Płońsk</item>
+        <item>Gmina Płośnica</item>
         <item>Gmina Poczesna</item>
+        <item>Gmina Podedwórze</item>
         <item>Gmina Podegrodzie</item>
         <item>Gmina Pokój</item>
         <item>Gmina Połajewo</item>
@@ -456,6 +543,7 @@
         <item>Gmina Police</item>
         <item>Gmina Polkowice</item>
         <item>Gmina Pomiechówek</item>
+        <item>Gmina Popielów</item>
         <item>Gmina Popów</item>
         <item>Gmina Poraj</item>
         <item>Gmina Potęgowo</item>
@@ -482,23 +570,27 @@
         <item>Gmina Puszcza Mariańska</item>
         <item>Gmina Pysznica</item>
         <item>Gmina Pyzdry</item>
+        <item>Gmina Rachanie</item>
         <item>Gmina Raciechowice</item>
         <item>Gmina Racławice</item>
         <item>Gmina Radecznica</item>
         <item>Gmina Radków</item>
         <item>Gmina Radłów</item>
         <item>Gmina Radomin</item>
+        <item>Gmina Radomsko</item>
         <item>Gmina Radomyśl Nad Sanem</item>
         <item>Gmina Radoszyce</item>
         <item>Gmina Radwanice</item>
         <item>Gmina Radziłów</item>
         <item>Gmina Rawa Mazowiecka</item>
         <item>Gmina Reńska Wieś</item>
+        <item>Gmina Rossosz</item>
         <item>Gmina Rozprza</item>
         <item>Gmina Ruciane-Nida</item>
         <item>Gmina Ruda-Huta</item>
         <item>Gmina Rudna</item>
         <item>Gmina Rudniki</item>
+        <item>Gmina Rusiec</item>
         <item>Gmina Rychliki</item>
         <item>Gmina Rychtal</item>
         <item>Gmina Ryczywół</item>
@@ -509,27 +601,33 @@
         <item>Gmina Rząśnia</item>
         <item>Gmina Rzeczyca</item>
         <item>Gmina Rzepiennik Strzyżewski</item>
-        <item>Gmina Rzezawa</item>
+        <item>Gmina Rzepin</item>
         <item>Gmina Rzgów</item>
         <item>Gmina Sadki</item>
         <item>Gmina Sadowne</item>
         <item>Gmina Samborzec</item>
+        <item>Gmina Sanok</item>
         <item>Gmina Ścinawa</item>
         <item>Gmina Sędziejowice</item>
         <item>Gmina Sępopol</item>
         <item>Gmina Serokomla</item>
+        <item>Gmina Sianów</item>
         <item>Gmina Sicienko</item>
         <item>Gmina Sieciechów</item>
         <item>Gmina Siedlce</item>
+        <item>Gmina Siemiatycze</item>
         <item>Gmina Siemyśl</item>
         <item>Gmina Siennica</item>
         <item>Gmina Siennica Różana</item>
         <item>Gmina Sienno</item>
         <item>Gmina Siepraw</item>
+        <item>Gmina Sieradz</item>
         <item>Gmina Sierakowice</item>
         <item>Gmina Siewierz</item>
+        <item>Gmina Sitno</item>
         <item>Gmina Skarżysko Kościelne</item>
         <item>Gmina Skępe</item>
+        <item>Gmina Skierniewice</item>
         <item>Gmina Skoczów</item>
         <item>Gmina Skoki</item>
         <item>Gmina Skołyszyn</item>
@@ -539,8 +637,10 @@
         <item>Gmina Słopnice</item>
         <item>Gmina Słupca</item>
         <item>Gmina Słupia</item>
+        <item>Gmina Sobienie-Jeziory</item>
         <item>Gmina Sobótka</item>
         <item>Gmina Sokółka</item>
+        <item>Gmina Sokoły</item>
         <item>Gmina Solina</item>
         <item>Gmina Sośnicowice</item>
         <item>Gmina Sośnie</item>
@@ -558,12 +658,15 @@
         <item>Gmina Stawiszyn</item>
         <item>Gmina Stoczek Łukowski</item>
         <item>Gmina Stopnica</item>
+        <item>Gmina Strawczyn</item>
         <item>Gmina Stryków</item>
         <item>Gmina Stryszów</item>
         <item>Gmina Strzałkowo</item>
         <item>Gmina Strzelce Opolskie</item>
         <item>Gmina Strzelin</item>
+        <item>Gmina Strzelno</item>
         <item>Gmina Strzyżewice</item>
+        <item>Gmina Stupsk</item>
         <item>Gmina Subkowy</item>
         <item>Gmina Suchedniów</item>
         <item>Gmina Suchożebry</item>
@@ -580,14 +683,18 @@
         <item>Gmina Świlcza</item>
         <item>Gmina Szadek</item>
         <item>Gmina Szaflary</item>
+        <item>Gmina Szastarka</item>
         <item>Gmina Szczebrzeszyn</item>
         <item>Gmina Szczekociny</item>
         <item>Gmina Szczerców</item>
         <item>Gmina Szczutowo</item>
         <item>Gmina Szczytna</item>
         <item>Gmina Szczytniki</item>
+        <item>Gmina Szemud</item>
         <item>Gmina Szerzyny</item>
         <item>Gmina Szlichtyngowa</item>
+        <item>Gmina Szydłów</item>
+        <item>Gmina Tarłów</item>
         <item>Gmina Tarnów</item>
         <item>Gmina Tarnowiec</item>
         <item>Gmina Tarnów Opolski</item>
@@ -607,16 +714,19 @@
         <item>Gmina Trzyciąż</item>
         <item>Gmina Tuchów</item>
         <item>Gmina Turośń Kościelna</item>
+        <item>Gmina Tuszów Narodowy</item>
         <item>Gmina Tyczyn</item>
         <item>Gmina Tymbark</item>
         <item>Gmina Tyrawa Wołoska</item>
         <item>Gmina Uchanie</item>
         <item>Gmina Ujazd</item>
+        <item>Gmina Ulan-Majorat</item>
+        <item>Gmina Ulanów</item>
         <item>Gmina Ułęż</item>
         <item>Gmina Urszulin</item>
         <item>Gmina Urzędów</item>
+        <item>Gmina Uścimów</item>
         <item>Gmina Wąchock</item>
-        <item>Gmina Wadowice Górne</item>
         <item>Gmina Wągrowiec</item>
         <item>Gmina Wąpielsk</item>
         <item>Gmina Wasilków</item>
@@ -634,7 +744,9 @@
         <item>Gmina Wieniawa</item>
         <item>Gmina Wieprz</item>
         <item>Gmina Wieruszów</item>
+        <item>Gmina Wierzbno</item>
         <item>Gmina Wierzchosławice</item>
+        <item>Gmina Wietrzychowice</item>
         <item>Gmina Wijewo</item>
         <item>Gmina Wilczyn</item>
         <item>Gmina Wilków</item>
@@ -665,17 +777,25 @@
         <item>Gmina Wyrzysk</item>
         <item>Gmina Zabierzów</item>
         <item>Gmina Żabno</item>
+        <item>Gmina Żagań</item>
+        <item>Gmina Zagórz</item>
         <item>Gmina Zaklików</item>
         <item>Gmina Zakroczym</item>
         <item>Gmina Zakrzówek</item>
         <item>Gmina Zaleszany</item>
         <item>Gmina Zamość</item>
+        <item>Gmina Żarnowiec</item>
+        <item>Gmina Żarów</item>
         <item>Gmina Zarszyn</item>
         <item>Gmina Zator</item>
+        <item>Gmina Zawadzkie</item>
+        <item>Gmina Zawichost</item>
         <item>Gmina Zawonia</item>
         <item>Gmina Zbąszyń</item>
+        <item>Gmina Zbójno</item>
         <item>Gmina Zbrosławice</item>
         <item>Gmina Zduńska Wola</item>
+        <item>Gmina Zduny</item>
         <item>Gmina Zdzieszowice</item>
         <item>Gmina Zebrzydowice</item>
         <item>Gmina Żelazków</item>
@@ -686,6 +806,7 @@
         <item>Gmina Zławieś Wielka</item>
         <item>Gmina Żmudź</item>
         <item>Gmina Żnin</item>
+        <item>Gmina Żółkiewka</item>
         <item>Gmina Żołynia</item>
         <item>Gmina Żukowice</item>
         <item>Gmina Żyrzyn</item>
@@ -701,12 +822,14 @@
         <item>Gostynin</item>
         <item>Grajewo</item>
         <item>Grodzisk Mazowiecki</item>
+        <item>Gronowo Elbląskie</item>
         <item>Grudziądz</item>
         <item>Gryfino</item>
         <item>Gryfów Śląski</item>
         <item>Hel</item>
         <item>Hrubieszów</item>
         <item>Inowrocław</item>
+        <item>Iwanowice</item>
         <item>Izbica Kujawska</item>
         <item>Jabłonowo Pomorskie</item>
         <item>Janowiec Wielkopolski</item>
@@ -725,6 +848,7 @@
         <item>Kalety</item>
         <item>Kalisz</item>
         <item>Kalwaria Zebrzydowska</item>
+        <item>Kamień Krajeński</item>
         <item>Kańczuga</item>
         <item>Karczew</item>
         <item>Kartuzy</item>
@@ -736,6 +860,7 @@
         <item>Kępno</item>
         <item>Kętrzyn</item>
         <item>Kielce</item>
+        <item>Kiełczygłów</item>
         <item>Kłodawa</item>
         <item>Kłodzko</item>
         <item>Knurów</item>
@@ -751,6 +876,7 @@
         <item>Kościerzyna</item>
         <item>Kostrzyn Nad Odrą</item>
         <item>Koszalin</item>
+        <item>Kowal</item>
         <item>Kowalewo Pomorskie</item>
         <item>Kowary</item>
         <item>Kozienice</item>
@@ -766,7 +892,9 @@
         <item>Krzeszowice</item>
         <item>Krzyż Wielkopolski</item>
         <item>Książ Wielkopolski</item>
+        <item>Kudowa-Zdrój</item>
         <item>Kujawsko-Pomorskie</item>
+        <item>Kuźnia Raciborska</item>
         <item>Łabiszyn</item>
         <item>Lądek-Zdrój</item>
         <item>Łapy</item>
@@ -781,6 +909,7 @@
         <item>Leszno</item>
         <item>Lewin Brzeski</item>
         <item>Leżajsk</item>
+        <item>Limanowa</item>
         <item>Lipno</item>
         <item>Lipsko</item>
         <item>Łódź</item>
@@ -796,12 +925,16 @@
         <item>Lubuskie</item>
         <item>Łuków</item>
         <item>Lwówecki</item>
+        <item>Lwówek Śląski</item>
         <item>Malbork</item>
         <item>Małopolskie</item>
+        <item>Marciszów</item>
         <item>Marki</item>
+        <item>Masłowice</item>
         <item>Mazowieckie</item>
         <item>Miastko</item>
         <item>Michałowice</item>
+        <item>Miechów</item>
         <item>Międzyrzec Podlaski</item>
         <item>Miejska Górka</item>
         <item>Mielec</item>
@@ -816,13 +949,18 @@
         <item>Mysłowice</item>
         <item>Myszków</item>
         <item>Nakło Nad Notecią</item>
+        <item>Nasielsk</item>
+        <item>Niemodlin</item>
+        <item>Niepołomice</item>
         <item>Nisko</item>
         <item>Nowa Dęba</item>
         <item>Nowa Sarzyna</item>
         <item>Nowe Miasteczko</item>
         <item>Nowe Skalmierzyce</item>
         <item>Nowogard</item>
+        <item>Nowogród Bobrzański</item>
         <item>Nowogrodziec</item>
+        <item>Nowosolna</item>
         <item>Nowy Dwór Mazowiecki</item>
         <item>Nowy Sącz</item>
         <item>Nowy Targ</item>
@@ -863,6 +1001,7 @@
         <item>Połczyn-Zdrój</item>
         <item>Pomorskie</item>
         <item>Poniec</item>
+        <item>Poręba</item>
         <item>Powiat aleksandrowski</item>
         <item>Powiat augustowski</item>
         <item>Powiat będziński</item>
@@ -877,6 +1016,7 @@
         <item>Powiat braniewski</item>
         <item>Powiat brodnicki</item>
         <item>Powiat brzeski</item>
+        <item>Powiat brzeziński</item>
         <item>Powiat brzozowski</item>
         <item>Powiat buski</item>
         <item>Powiat bydgoski</item>
@@ -897,6 +1037,7 @@
         <item>Powiat elbląski</item>
         <item>Powiat ełcki</item>
         <item>Powiat garwoliński</item>
+        <item>Powiat gdański</item>
         <item>Powiat giżycki</item>
         <item>Powiat gliwicki</item>
         <item>Powiat głogowski</item>
@@ -955,6 +1096,7 @@
         <item>Powiat leski</item>
         <item>Powiat leszczyński</item>
         <item>Powiat leżajski</item>
+        <item>Powiat lidzbarski</item>
         <item>Powiat limanowski</item>
         <item>Powiat lipnowski</item>
         <item>Powiat lipski</item>
@@ -980,6 +1122,7 @@
         <item>Powiat myślenicki</item>
         <item>Powiat myszkowski</item>
         <item>Powiat nakielski</item>
+        <item>Powiat nidzicki</item>
         <item>Powiat niżański</item>
         <item>Powiat nowodworski</item>
         <item>Powiat nowosądecki</item>
@@ -1015,15 +1158,20 @@
         <item>Powiat polkowicki</item>
         <item>Powiat poznański</item>
         <item>Powiat proszowicki</item>
+        <item>Powiat prudnicki</item>
         <item>Powiat pruszkowski</item>
         <item>Powiat przasnyski</item>
         <item>Powiat przemyski</item>
         <item>Powiat przeworski</item>
+        <item>Powiat przysuski</item>
         <item>Powiat pszczyński</item>
+        <item>Powiat pucki</item>
         <item>Powiat puławski</item>
         <item>Powiat pułtuski</item>
+        <item>Powiat pyrzycki</item>
         <item>Powiat raciborski</item>
         <item>Powiat radomski</item>
+        <item>Powiat radomszczański</item>
         <item>Powiat radziejowski</item>
         <item>Powiat radzyński</item>
         <item>Powiat rawicki</item>
@@ -1054,6 +1202,7 @@
         <item>Powiat starachowicki</item>
         <item>Powiat stargardzki</item>
         <item>Powiat starogardzki</item>
+        <item>Powiat staszowski</item>
         <item>Powiat strzelecki</item>
         <item>Powiat strzeliński</item>
         <item>Powiat strzyżowski</item>
@@ -1096,6 +1245,7 @@
         <item>Powiat wschowski</item>
         <item>Powiat wysokomazowiecki</item>
         <item>Powiat wyszkowski</item>
+        <item>Powiat ząbkowicki</item>
         <item>Powiat żagański</item>
         <item>Powiat zambrowski</item>
         <item>Powiat zamojski</item>
@@ -1112,25 +1262,30 @@
         <item>Powiat żyrardowski</item>
         <item>Powiat żywiecki</item>
         <item>Poznań</item>
+        <item>Prostki</item>
         <item>Proszowice</item>
         <item>Prudnik</item>
         <item>Pruszków</item>
+        <item>Przasnysz</item>
         <item>Przemyśl</item>
         <item>Przeworsk</item>
         <item>Przysucha</item>
         <item>Pszczyna</item>
+        <item>Pszów</item>
         <item>Puck</item>
         <item>Puławy</item>
         <item>Pyskowice</item>
         <item>Rabka-Zdrój</item>
         <item>Raciąż</item>
         <item>Racibórz</item>
+        <item>Raciechowice</item>
         <item>Radom</item>
         <item>Radomsko</item>
         <item>Radymno</item>
         <item>Radziejów</item>
         <item>Radzionków</item>
         <item>Radzyń Podlaski</item>
+        <item>Raków</item>
         <item>Rawa Mazowiecka</item>
         <item>Rawicz</item>
         <item>Reda</item>
@@ -1147,6 +1302,7 @@
         <item>Sandomierz</item>
         <item>Sanok</item>
         <item>Sędziszów Małopolski</item>
+        <item>Sejny</item>
         <item>Siedlce</item>
         <item>Siemianowice Śląskie</item>
         <item>Siemiatycze</item>
@@ -1155,7 +1311,7 @@
         <item>Skarżysko-Kamienna</item>
         <item>Skawina</item>
         <item>Skierniewice</item>
-        <item>Skórcz</item>
+        <item>Skoroszyce</item>
         <item>Śląskie</item>
         <item>Sławno</item>
         <item>Słomniki</item>
@@ -1165,16 +1321,21 @@
         <item>Sokołów Podlaski</item>
         <item>Sopot</item>
         <item>Sosnowiec</item>
+        <item>Śrem</item>
         <item>Środa Śląska</item>
         <item>Środa Wielkopolska</item>
         <item>Starachowice</item>
         <item>Starogard Gdański</item>
         <item>Stary Sącz</item>
         <item>Staszów</item>
+        <item>Stronie Śląskie</item>
         <item>Strzegom</item>
+        <item>Strzyżów</item>
+        <item>Suchy Las</item>
         <item>Sulejówek</item>
         <item>Sułkowice</item>
         <item>Sulmierzyce</item>
+        <item>Suwalski</item>
         <item>Swarzędz</item>
         <item>Świdnica</item>
         <item>Świdnik</item>
@@ -1220,9 +1381,11 @@
         <item>Więcbork</item>
         <item>Wieliczka</item>
         <item>Wielkopolskie</item>
+        <item>Wizna</item>
         <item>Władysławowo</item>
         <item>Włocławek</item>
         <item>Włodawa</item>
+        <item>Woźniki</item>
         <item>Wrocław</item>
         <item>Września</item>
         <item>Wschowa</item>
@@ -1240,6 +1403,7 @@
         <item>Żary</item>
         <item>Zawidów</item>
         <item>Zduńska Wola</item>
+        <item>Zduny</item>
         <item>Żelechów</item>
         <item>Zgierz</item>
         <item>Zgorzelec</item>
@@ -1249,7 +1413,6 @@
         <item>Żory</item>
         <item>Zwoleń</item>
         <item>Żyrardów</item>
-        <item>Żywiec</item>
     </string-array>
     <string-array name="symbols_values">
         <item>andrychow</item>
@@ -1269,6 +1432,8 @@
         <item>bielskobiala</item>
         <item>bierawa</item>
         <item>bierutow</item>
+        <item>biskupice</item>
+        <item>blachownia</item>
         <item>blaszki</item>
         <item>blonie</item>
         <item>bochnia</item>
@@ -1308,6 +1473,7 @@
         <item>dabrowatarnowska</item>
         <item>debica</item>
         <item>dobrzenwielki</item>
+        <item>dobrzynnadwisla</item>
         <item>dolnoslaskie</item>
         <item>dusznikizdroj</item>
         <item>dynow</item>
@@ -1328,36 +1494,53 @@
         <item>gminaaleksandrowkujawski</item>
         <item>gminaaleksandrowlodzki</item>
         <item>gminaalwernia</item>
+        <item>gminaandrzejewo</item>
         <item>gminaannopol</item>
+        <item>gminaaugustow</item>
         <item>gminababice</item>
+        <item>gminabadkowo</item>
         <item>gminabaltow</item>
         <item>gminabaranow</item>
+        <item>gminabarciany</item>
         <item>gminabarcin</item>
         <item>gminabaruchowo</item>
         <item>gminabedzino</item>
         <item>gminabelchatow</item>
+        <item>gminabialaczow</item>
         <item>gminabialeblota</item>
+        <item>gminabielskpodlaski</item>
         <item>gminabircza</item>
         <item>gminablazowa</item>
         <item>gminabledow</item>
         <item>gminabobolice</item>
+        <item>gminabobowa</item>
         <item>gminabobowo</item>
         <item>gminabobrowniki</item>
+        <item>gminabodzentyn</item>
+        <item>gminabogoria</item>
+        <item>gminabojanow</item>
         <item>gminabojanowo</item>
         <item>gminabojszowy</item>
         <item>gminaboleslawiec</item>
         <item>gminabolkow</item>
         <item>gminaboronow</item>
+        <item>gminaborow</item>
         <item>gminaborowa</item>
         <item>gminaborzecin</item>
         <item>gminabranice</item>
+        <item>gminabraniewo</item>
         <item>gminabraszewice</item>
         <item>gminabrenna</item>
         <item>gminabrzegdolny</item>
         <item>gminabrzeziny</item>
         <item>gminabrzeznio</item>
+        <item>gminabrzostek</item>
         <item>gminabrzozow</item>
+        <item>gminabrzuze</item>
         <item>gminabrzyska</item>
+        <item>gminabuczek</item>
+        <item>gminabuczkowice</item>
+        <item>gminabudzow</item>
         <item>gminabudzyn</item>
         <item>gminabukowsko</item>
         <item>gminabyczyna</item>
@@ -1366,15 +1549,15 @@
         <item>gminacekowkolonia</item>
         <item>gminacelestynow</item>
         <item>gminacewice</item>
+        <item>gminacharsznica</item>
         <item>gminachelm</item>
         <item>gminachelmiec</item>
         <item>gminachelmno</item>
         <item>gminachmielnik</item>
-        <item>gminachodecz</item>
+        <item>gminachocz</item>
         <item>gminachodel</item>
         <item>gminachojnice</item>
         <item>gminachojnow</item>
-        <item>gminachorkowka</item>
         <item>gminachrzypskowielkie</item>
         <item>gminachybie</item>
         <item>gminaciasna</item>
@@ -1386,12 +1569,12 @@
         <item>gminaczaplinek</item>
         <item>gminaczarna</item>
         <item>gminaczarnkow</item>
-        <item>gminaczarnybor</item>
         <item>gminaczarnydunajec</item>
         <item>gminaczechowicedziedzice</item>
         <item>gminaczernichow</item>
         <item>gminaczerniejewo</item>
         <item>gminaczerwionkaleszczyny</item>
+        <item>gminaczerwonka</item>
         <item>gminaczluchow</item>
         <item>gminaczosnow</item>
         <item>gminadamaslawek</item>
@@ -1399,6 +1582,7 @@
         <item>gminadarlowo</item>
         <item>gminadebewielkie</item>
         <item>gminadebica</item>
+        <item>gminadebno</item>
         <item>gminadlutow</item>
         <item>gminadobczyce</item>
         <item>gminadobra</item>
@@ -1410,6 +1594,7 @@
         <item>gminadominowo</item>
         <item>gminadorohusk</item>
         <item>gminadrzewica</item>
+        <item>gminadubiecko</item>
         <item>gminadukla</item>
         <item>gminadwikozy</item>
         <item>gminadynow</item>
@@ -1433,6 +1618,7 @@
         <item>gminagluszyca</item>
         <item>gminagniew</item>
         <item>gminagniewoszow</item>
+        <item>gminagniezno</item>
         <item>gminagoczalkowicezdroj</item>
         <item>gminagodkowo</item>
         <item>gminagodow</item>
@@ -1451,6 +1637,7 @@
         <item>gminagozd</item>
         <item>gminagrabow</item>
         <item>gminagrabowiec</item>
+        <item>gminagrabownadpilica</item>
         <item>gminagrajewo</item>
         <item>gminagranowo</item>
         <item>gminagrebocice</item>
@@ -1461,6 +1648,7 @@
         <item>gminagrodziec</item>
         <item>gminagrojec</item>
         <item>gminagromadka</item>
+        <item>gminagromnik</item>
         <item>gminagronowoelblaskie</item>
         <item>gminagrudziadz</item>
         <item>gminagruta</item>
@@ -1470,13 +1658,17 @@
         <item>gminahansk</item>
         <item>gminaharasiuki</item>
         <item>gminahazlach</item>
+        <item>gminaherby</item>
         <item>gminahrubieszow</item>
+        <item>gminahuszlew</item>
         <item>gminahyzne</item>
         <item>gminaimielno</item>
         <item>gminainowroclaw</item>
+        <item>gminaistebna</item>
         <item>gminaiwierzyce</item>
         <item>gminaiwoniczzdroj</item>
         <item>gminaizabelin</item>
+        <item>gminaizbica</item>
         <item>gminajadow</item>
         <item>gminajaktorow</item>
         <item>gminajanikowo</item>
@@ -1488,19 +1680,23 @@
         <item>gminajaslo</item>
         <item>gminajastkow</item>
         <item>gminajastrowie</item>
+        <item>gminajastrzab</item>
         <item>gminajedlicze</item>
         <item>gminajedlinsk</item>
         <item>gminajedlnialetnisko</item>
         <item>gminajejkowice</item>
         <item>gminajemielnica</item>
+        <item>gminajemielno</item>
         <item>gminajerzmanowa</item>
         <item>gminajezewo</item>
         <item>gminajeziorawielkie</item>
+        <item>gminajeziorzany</item>
         <item>gminajezowe</item>
         <item>gminajordanow</item>
         <item>gminajozefow</item>
         <item>gminajozefownadwisla</item>
         <item>gminajutrosin</item>
+        <item>gminakakolewnica</item>
         <item>gminakamien</item>
         <item>gminakamienica</item>
         <item>gminakamieniec</item>
@@ -1513,9 +1709,11 @@
         <item>gminakielczyglow</item>
         <item>gminakikol</item>
         <item>gminakiszkowo</item>
+        <item>gminakleczew</item>
         <item>gminaklembow</item>
         <item>gminakleszczewo</item>
         <item>gminakleszczow</item>
+        <item>gminaklimontow</item>
         <item>gminaklobuck</item>
         <item>gminakloczew</item>
         <item>gminaklomnice</item>
@@ -1523,6 +1721,8 @@
         <item>gminaklucze</item>
         <item>gminakluczewsko</item>
         <item>gminakobielewielkie</item>
+        <item>gminakochanowice</item>
+        <item>gminakock</item>
         <item>gminakodrab</item>
         <item>gminakolaczyce</item>
         <item>gminakolbaskowo</item>
@@ -1531,9 +1731,13 @@
         <item>gminakomancza</item>
         <item>gminakomorniki</item>
         <item>gminakomprachcice</item>
+        <item>gminakonarzyny</item>
+        <item>gminakondratowice</item>
+        <item>gminakoniusza</item>
         <item>gminakonopiska</item>
         <item>gminakonskowola</item>
-        <item>gminakorczyna</item>
+        <item>gminakoprzywnica</item>
+        <item>gminakorsze</item>
         <item>gminakorycin</item>
         <item>gminakorzenna</item>
         <item>gminakosakowo</item>
@@ -1542,6 +1746,7 @@
         <item>gminakoscierzyna</item>
         <item>gminakosowlacki</item>
         <item>gminakostrzyn</item>
+        <item>gminakoszyce</item>
         <item>gminakotla</item>
         <item>gminakotun</item>
         <item>gminakozlow</item>
@@ -1553,22 +1758,31 @@
         <item>gminakrokowa</item>
         <item>gminakrosnice</item>
         <item>gminakrupskimlyn</item>
+        <item>gminakruszwica</item>
+        <item>gminakrynki</item>
         <item>gminakrzanowice</item>
         <item>gminakrzemieniewo</item>
         <item>gminakrzymow</item>
+        <item>gminakrzywin</item>
         <item>gminakrzyzanowice</item>
+        <item>gminaksiazwielki</item>
         <item>gminakunice</item>
         <item>gminakunow</item>
         <item>gminakurow</item>
+        <item>gminakurylowka</item>
         <item>gminakwidzyn</item>
         <item>gminakwilcz</item>
+        <item>gminalabowa</item>
         <item>gminalabunie</item>
         <item>gminalambinowice</item>
         <item>gminalanckorona</item>
         <item>gminalapszenizne</item>
+        <item>gminalasin</item>
         <item>gminalaskarzew</item>
         <item>gminalasowicewielkie</item>
         <item>gminalaszczow</item>
+        <item>gminalaszki</item>
+        <item>gminalatowicz</item>
         <item>gminalazy</item>
         <item>gminaleczyca</item>
         <item>gminaleczyce</item>
@@ -1580,16 +1794,20 @@
         <item>gminalesnapodlaska</item>
         <item>gminalesznowola</item>
         <item>gminalezajsk</item>
+        <item>gminalichnowy</item>
         <item>gminalimanowa</item>
+        <item>gminalinia</item>
         <item>gminalipinki</item>
         <item>gminalipnik</item>
         <item>gminalipowa</item>
         <item>gminalisiagora</item>
         <item>gminaliszki</item>
+        <item>gminaliw</item>
         <item>gminalobez</item>
         <item>gminalodygowice</item>
         <item>gminalomazy</item>
         <item>gminalopiennikgorny</item>
+        <item>gminalopuszno</item>
         <item>gminaluban</item>
         <item>gminalubartow</item>
         <item>gminalubasz</item>
@@ -1599,30 +1817,40 @@
         <item>gminalubiewo</item>
         <item>gminalubin</item>
         <item>gminalubniany</item>
+        <item>gminalubochnia</item>
         <item>gminalubomia</item>
         <item>gminalubon</item>
         <item>gminalukow</item>
+        <item>gminalukowica</item>
+        <item>gminalutowiska</item>
         <item>gminaluzino</item>
         <item>gminaluzna</item>
         <item>gminalysomice</item>
         <item>gminamagnuszew</item>
         <item>gminamakowpodhalanski</item>
+        <item>gminamalawies</item>
         <item>gminamalbork</item>
         <item>gminamaldyty</item>
+        <item>gminamalkiniagorna</item>
         <item>gminamarcinowice</item>
         <item>gminamargonin</item>
         <item>gminamarianowo</item>
+        <item>gminamarkusy</item>
         <item>gminamaslow</item>
+        <item>gminamedyka</item>
         <item>gminamelgiew</item>
+        <item>gminamichalow</item>
         <item>gminamichalowo</item>
         <item>gminamiedzianagora</item>
         <item>gminamiedzna</item>
         <item>gminamiedzno</item>
         <item>gminamiedzyborz</item>
         <item>gminamiedzylesie</item>
+        <item>gminamiedzyrzecpodlaski</item>
         <item>gminamiedzyzdroje</item>
         <item>gminamiejscepiastowe</item>
         <item>gminamielec</item>
+        <item>gminamilanow</item>
         <item>gminamilejow</item>
         <item>gminamilicz</item>
         <item>gminamilkowice</item>
@@ -1636,28 +1864,38 @@
         <item>gminamogilany</item>
         <item>gminamordy</item>
         <item>gminamoryn</item>
+        <item>gminamrocza</item>
         <item>gminamrozy</item>
         <item>gminamszana</item>
         <item>gminamszanadolna</item>
         <item>gminamurow</item>
         <item>gminamycielin</item>
+        <item>gminamyslakowice</item>
         <item>gminamysliborz</item>
         <item>gminanadarzyn</item>
+        <item>gminanamyslow</item>
+        <item>gminanasielsk</item>
         <item>gminanawojowa</item>
+        <item>gminanedza</item>
         <item>gminanekla</item>
         <item>gminaniebylec</item>
         <item>gminaniechlow</item>
         <item>gminaniedrzwicaduza</item>
+        <item>gminaniedzwiada</item>
+        <item>gminaniedzwiedz</item>
         <item>gminaniegoslawice</item>
         <item>gminaniwiska</item>
         <item>gminanowaruda</item>
         <item>gminanowawiesleborska</item>
         <item>gminanowemiasto</item>
         <item>gminanowemiastonadwarta</item>
+        <item>gminanowogrodbobrzanski</item>
         <item>gminanowosolna</item>
         <item>gminanowykaweczyn</item>
         <item>gminanowystaw</item>
         <item>gminanowytarg</item>
+        <item>gminanowytomysl</item>
+        <item>gminanur</item>
         <item>gminaobrazow</item>
         <item>gminaochotnicadolna</item>
         <item>gminaogrodzieniec</item>
@@ -1671,33 +1909,45 @@
         <item>gminaosiekjasielski</item>
         <item>gminaosiekmaly</item>
         <item>gminaosielsko</item>
+        <item>gminaostrow</item>
         <item>gminaostrowek</item>
         <item>gminaostrowlubelski</item>
         <item>gminaostrowmazowiecka</item>
         <item>gminaostrowwielkopolski</item>
         <item>gminaotyn</item>
         <item>gminaozarow</item>
+        <item>gminaozarowice</item>
         <item>gminaozimek</item>
         <item>gminaozorkow</item>
         <item>gminapabianice</item>
         <item>gminapacanow</item>
+        <item>gminapaczkow</item>
         <item>gminapadewnarodowa</item>
+        <item>gminapajeczno</item>
         <item>gminapakoslaw</item>
         <item>gminapakoslawice</item>
+        <item>gminapalecznica</item>
         <item>gminapanki</item>
         <item>gminaparchowo</item>
         <item>gminaparczew</item>
         <item>gminapawlosiow</item>
         <item>gminapawlowice</item>
+        <item>gminapawlowiczki</item>
+        <item>gminapeclaw</item>
         <item>gminapelplin</item>
         <item>gminapiaski</item>
         <item>gminapiatnica</item>
+        <item>gminapiecki</item>
+        <item>gminapiekoszow</item>
         <item>gminapilchowice</item>
         <item>gminapionki</item>
+        <item>gminapiotrkowtrybunalski</item>
         <item>gminaplesna</item>
         <item>gminapleszew</item>
         <item>gminaplonsk</item>
+        <item>gminaplosnica</item>
         <item>gminapoczesna</item>
+        <item>gminapodedworze</item>
         <item>gminapodegrodzie</item>
         <item>gminapokoj</item>
         <item>gminapolajewo</item>
@@ -1707,6 +1957,7 @@
         <item>gminapolice</item>
         <item>gminapolkowice</item>
         <item>gminapomiechowek</item>
+        <item>gminapopielow</item>
         <item>gminapopow</item>
         <item>gminaporaj</item>
         <item>gminapotegowo</item>
@@ -1733,23 +1984,27 @@
         <item>gminapuszczamarianska</item>
         <item>gminapysznica</item>
         <item>gminapyzdry</item>
+        <item>gminarachanie</item>
         <item>gminaraciechowice</item>
         <item>gminaraclawice</item>
         <item>gminaradecznica</item>
         <item>gminaradkow</item>
         <item>gminaradlow</item>
         <item>gminaradomin</item>
+        <item>gminaradomsko</item>
         <item>gminaradomyslnadsanem</item>
         <item>gminaradoszyce</item>
         <item>gminaradwanice</item>
         <item>gminaradzilow</item>
         <item>gminarawamazowiecka</item>
         <item>gminarenskawies</item>
+        <item>gminarossosz</item>
         <item>gminarozprza</item>
         <item>gminarucianenida</item>
         <item>gminarudahuta</item>
         <item>gminarudna</item>
         <item>gminarudniki</item>
+        <item>gminarusiec</item>
         <item>gminarychliki</item>
         <item>gminarychtal</item>
         <item>gminaryczywol</item>
@@ -1760,27 +2015,33 @@
         <item>gminarzasnia</item>
         <item>gminarzeczyca</item>
         <item>gminarzepiennikstrzyzewski</item>
-        <item>gminarzezawa</item>
+        <item>gminarzepin</item>
         <item>gminarzgow</item>
         <item>gminasadki</item>
         <item>gminasadowne</item>
         <item>gminasamborzec</item>
+        <item>gminasanok</item>
         <item>gminascinawa</item>
         <item>gminasedziejowice</item>
         <item>gminasepopol</item>
         <item>gminaserokomla</item>
+        <item>gminasianow</item>
         <item>gminasicienko</item>
         <item>gminasieciechow</item>
         <item>gminasiedlce</item>
+        <item>gminasiemiatycze</item>
         <item>gminasiemysl</item>
         <item>gminasiennica</item>
         <item>gminasiennicarozana</item>
         <item>gminasienno</item>
         <item>gminasiepraw</item>
+        <item>gminasieradz</item>
         <item>gminasierakowice</item>
         <item>gminasiewierz</item>
+        <item>gminasitno</item>
         <item>gminaskarzyskokoscielne</item>
         <item>gminaskepe</item>
+        <item>gminaskierniewice</item>
         <item>gminaskoczow</item>
         <item>gminaskoki</item>
         <item>gminaskolyszyn</item>
@@ -1790,8 +2051,10 @@
         <item>gminaslopnice</item>
         <item>gminaslupca</item>
         <item>gminaslupia</item>
+        <item>gminasobieniejeziory</item>
         <item>gminasobotka</item>
         <item>gminasokolka</item>
+        <item>gminasokoly</item>
         <item>gminasolina</item>
         <item>gminasosnicowice</item>
         <item>gminasosnie</item>
@@ -1809,12 +2072,15 @@
         <item>gminastawiszyn</item>
         <item>gminastoczeklukowski</item>
         <item>gminastopnica</item>
+        <item>gminastrawczyn</item>
         <item>gminastrykow</item>
         <item>gminastryszow</item>
         <item>gminastrzalkowo</item>
         <item>gminastrzelceopolskie</item>
         <item>gminastrzelin</item>
+        <item>gminastrzelno</item>
         <item>gminastrzyzewice</item>
+        <item>gminastupsk</item>
         <item>gminasubkowy</item>
         <item>gminasuchedniow</item>
         <item>gminasuchozebry</item>
@@ -1831,14 +2097,18 @@
         <item>gminaswilcza</item>
         <item>gminaszadek</item>
         <item>gminaszaflary</item>
+        <item>gminaszastarka</item>
         <item>gminaszczebrzeszyn</item>
         <item>gminaszczekociny</item>
         <item>gminaszczercow</item>
         <item>gminaszczutowo</item>
         <item>gminaszczytna</item>
         <item>gminaszczytniki</item>
+        <item>gminaszemud</item>
         <item>gminaszerzyny</item>
         <item>gminaszlichtyngowa</item>
+        <item>gminaszydlow</item>
+        <item>gminatarlow</item>
         <item>gminatarnow</item>
         <item>gminatarnowiec</item>
         <item>gminatarnowopolski</item>
@@ -1858,16 +2128,19 @@
         <item>gminatrzyciaz</item>
         <item>gminatuchow</item>
         <item>gminaturosnkoscielna</item>
+        <item>gminatuszownarodowy</item>
         <item>gminatyczyn</item>
         <item>gminatymbark</item>
         <item>gminatyrawawoloska</item>
         <item>gminauchanie</item>
         <item>gminaujazd</item>
+        <item>gminaulanmajorat</item>
+        <item>gminaulanow</item>
         <item>gminaulez</item>
         <item>gminaurszulin</item>
         <item>gminaurzedow</item>
+        <item>gminauscimow</item>
         <item>gminawachock</item>
-        <item>gminawadowicegorne</item>
         <item>gminawagrowiec</item>
         <item>gminawapielsk</item>
         <item>gminawasilkow</item>
@@ -1885,7 +2158,9 @@
         <item>gminawieniawa</item>
         <item>gminawieprz</item>
         <item>gminawieruszow</item>
+        <item>gminawierzbno</item>
         <item>gminawierzchoslawice</item>
+        <item>gminawietrzychowice</item>
         <item>gminawijewo</item>
         <item>gminawilczyn</item>
         <item>gminawilkow</item>
@@ -1916,17 +2191,25 @@
         <item>gminawyrzysk</item>
         <item>gminazabierzow</item>
         <item>gminazabno</item>
+        <item>gminazagan</item>
+        <item>gminazagorz</item>
         <item>gminazaklikow</item>
         <item>gminazakroczym</item>
         <item>gminazakrzowek</item>
         <item>gminazaleszany</item>
         <item>gminazamosc</item>
+        <item>gminazarnowiec</item>
+        <item>gminazarow</item>
         <item>gminazarszyn</item>
         <item>gminazator</item>
+        <item>gminazawadzkie</item>
+        <item>gminazawichost</item>
         <item>gminazawonia</item>
         <item>gminazbaszyn</item>
+        <item>gminazbojno</item>
         <item>gminazbroslawice</item>
         <item>gminazdunskawola</item>
+        <item>gminazduny</item>
         <item>gminazdzieszowice</item>
         <item>gminazebrzydowice</item>
         <item>gminazelazkow</item>
@@ -1937,6 +2220,7 @@
         <item>gminazlawieswielka</item>
         <item>gminazmudz</item>
         <item>gminaznin</item>
+        <item>gminazolkiewka</item>
         <item>gminazolynia</item>
         <item>gminazukowice</item>
         <item>gminazyrzyn</item>
@@ -1952,12 +2236,14 @@
         <item>gostynin</item>
         <item>grajewo</item>
         <item>grodziskmazowiecki</item>
+        <item>gronowoelblaskie</item>
         <item>grudziadz</item>
         <item>gryfino</item>
         <item>gryfowslaski</item>
         <item>hel</item>
         <item>hrubieszow</item>
         <item>inowroclaw</item>
+        <item>iwanowice</item>
         <item>izbicakujawska</item>
         <item>jablonowopomorskie</item>
         <item>janowiecwielkopolski</item>
@@ -1976,6 +2262,7 @@
         <item>kalety</item>
         <item>kalisz</item>
         <item>kalwariazebrzydowska</item>
+        <item>kamienkrajenski</item>
         <item>kanczuga</item>
         <item>karczew</item>
         <item>kartuzy</item>
@@ -1987,6 +2274,7 @@
         <item>kepno</item>
         <item>ketrzyn</item>
         <item>kielce</item>
+        <item>kielczyglow</item>
         <item>klodawa</item>
         <item>klodzko</item>
         <item>knurow</item>
@@ -2002,6 +2290,7 @@
         <item>koscierzyna</item>
         <item>kostrzynnadodra</item>
         <item>koszalin</item>
+        <item>kowal</item>
         <item>kowalewopomorskie</item>
         <item>kowary</item>
         <item>kozienice</item>
@@ -2017,7 +2306,9 @@
         <item>krzeszowice</item>
         <item>krzyzwielkopolski</item>
         <item>ksiazwielkopolski</item>
+        <item>kudowazdroj</item>
         <item>kujawskopomorskie</item>
+        <item>kuzniaraciborska</item>
         <item>labiszyn</item>
         <item>ladekzdroj</item>
         <item>lapy</item>
@@ -2032,6 +2323,7 @@
         <item>leszno</item>
         <item>lewinbrzeski</item>
         <item>lezajsk</item>
+        <item>limanowa</item>
         <item>lipno</item>
         <item>lipsko</item>
         <item>lodz</item>
@@ -2047,12 +2339,16 @@
         <item>lubuskie</item>
         <item>lukow</item>
         <item>lwowecki</item>
+        <item>lwowekslaski</item>
         <item>malbork</item>
         <item>malopolskie</item>
+        <item>marciszow</item>
         <item>marki</item>
+        <item>maslowice</item>
         <item>mazowieckie</item>
         <item>miastko</item>
         <item>michalowice</item>
+        <item>miechow</item>
         <item>miedzyrzecpodlaski</item>
         <item>miejskagorka</item>
         <item>mielec</item>
@@ -2067,13 +2363,18 @@
         <item>myslowice</item>
         <item>myszkow</item>
         <item>naklonadnotecia</item>
+        <item>nasielsk</item>
+        <item>niemodlin</item>
+        <item>niepolomice</item>
         <item>nisko</item>
         <item>nowadeba</item>
         <item>nowasarzyna</item>
         <item>nowemiasteczko</item>
         <item>noweskalmierzyce</item>
         <item>nowogard</item>
+        <item>nowogrodbobrzanski</item>
         <item>nowogrodziec</item>
+        <item>nowosolna</item>
         <item>nowydwormazowiecki</item>
         <item>nowysacz</item>
         <item>nowytarg</item>
@@ -2114,6 +2415,7 @@
         <item>polczynzdroj</item>
         <item>pomorskie</item>
         <item>poniec</item>
+        <item>poreba</item>
         <item>powiataleksandrowski</item>
         <item>powiataugustowski</item>
         <item>powiatbedzinski</item>
@@ -2128,6 +2430,7 @@
         <item>powiatbraniewski</item>
         <item>powiatbrodnicki</item>
         <item>powiatbrzeski</item>
+        <item>powiatbrzezinski</item>
         <item>powiatbrzozowski</item>
         <item>powiatbuski</item>
         <item>powiatbydgoski</item>
@@ -2148,6 +2451,7 @@
         <item>powiatelblaski</item>
         <item>powiatelcki</item>
         <item>powiatgarwolinski</item>
+        <item>powiatgdanski</item>
         <item>powiatgizycki</item>
         <item>powiatgliwicki</item>
         <item>powiatglogowski</item>
@@ -2206,6 +2510,7 @@
         <item>powiatleski</item>
         <item>powiatleszczynski</item>
         <item>powiatlezajski</item>
+        <item>powiatlidzbarski</item>
         <item>powiatlimanowski</item>
         <item>powiatlipnowski</item>
         <item>powiatlipski</item>
@@ -2231,6 +2536,7 @@
         <item>powiatmyslenicki</item>
         <item>powiatmyszkowski</item>
         <item>powiatnakielski</item>
+        <item>powiatnidzicki</item>
         <item>powiatnizanski</item>
         <item>powiatnowodworski</item>
         <item>powiatnowosadecki</item>
@@ -2266,15 +2572,20 @@
         <item>powiatpolkowicki</item>
         <item>powiatpoznanski</item>
         <item>powiatproszowicki</item>
+        <item>powiatprudnicki</item>
         <item>powiatpruszkowski</item>
         <item>powiatprzasnyski</item>
         <item>powiatprzemyski</item>
         <item>powiatprzeworski</item>
+        <item>powiatprzysuski</item>
         <item>powiatpszczynski</item>
+        <item>powiatpucki</item>
         <item>powiatpulawski</item>
         <item>powiatpultuski</item>
+        <item>powiatpyrzycki</item>
         <item>powiatraciborski</item>
         <item>powiatradomski</item>
+        <item>powiatradomszczanski</item>
         <item>powiatradziejowski</item>
         <item>powiatradzynski</item>
         <item>powiatrawicki</item>
@@ -2305,6 +2616,7 @@
         <item>powiatstarachowicki</item>
         <item>powiatstargardzki</item>
         <item>powiatstarogardzki</item>
+        <item>powiatstaszowski</item>
         <item>powiatstrzelecki</item>
         <item>powiatstrzelinski</item>
         <item>powiatstrzyzowski</item>
@@ -2347,6 +2659,7 @@
         <item>powiatwschowski</item>
         <item>powiatwysokomazowiecki</item>
         <item>powiatwyszkowski</item>
+        <item>powiatzabkowicki</item>
         <item>powiatzaganski</item>
         <item>powiatzambrowski</item>
         <item>powiatzamojski</item>
@@ -2363,25 +2676,30 @@
         <item>powiatzyrardowski</item>
         <item>powiatzywiecki</item>
         <item>poznan</item>
+        <item>prostki</item>
         <item>proszowice</item>
         <item>prudnik</item>
         <item>pruszkow</item>
+        <item>przasnysz</item>
         <item>przemysl</item>
         <item>przeworsk</item>
         <item>przysucha</item>
         <item>pszczyna</item>
+        <item>pszow</item>
         <item>puck</item>
         <item>pulawy</item>
         <item>pyskowice</item>
         <item>rabkazdroj</item>
         <item>raciaz</item>
         <item>raciborz</item>
+        <item>raciechowice</item>
         <item>radom</item>
         <item>radomsko</item>
         <item>radymno</item>
         <item>radziejow</item>
         <item>radzionkow</item>
         <item>radzynpodlaski</item>
+        <item>rakow</item>
         <item>rawamazowiecka</item>
         <item>rawicz</item>
         <item>reda</item>
@@ -2398,6 +2716,7 @@
         <item>sandomierz</item>
         <item>sanok</item>
         <item>sedziszowmalopolski</item>
+        <item>sejny</item>
         <item>siedlce</item>
         <item>siemianowiceslaskie</item>
         <item>siemiatycze</item>
@@ -2406,7 +2725,7 @@
         <item>skarzyskokamienna</item>
         <item>skawina</item>
         <item>skierniewice</item>
-        <item>skorcz</item>
+        <item>skoroszyce</item>
         <item>slaskie</item>
         <item>slawno</item>
         <item>slomniki</item>
@@ -2416,16 +2735,21 @@
         <item>sokolowpodlaski</item>
         <item>sopot</item>
         <item>sosnowiec</item>
+        <item>srem</item>
         <item>srodaslaska</item>
         <item>srodawielkopolska</item>
         <item>starachowice</item>
         <item>starogardgdanski</item>
         <item>starysacz</item>
         <item>staszow</item>
+        <item>stronieslaskie</item>
         <item>strzegom</item>
+        <item>strzyzow</item>
+        <item>suchylas</item>
         <item>sulejowek</item>
         <item>sulkowice</item>
         <item>sulmierzyce</item>
+        <item>suwalski</item>
         <item>swarzedz</item>
         <item>swidnica</item>
         <item>swidnik</item>
@@ -2471,9 +2795,11 @@
         <item>wiecbork</item>
         <item>wieliczka</item>
         <item>wielkopolskie</item>
+        <item>wizna</item>
         <item>wladyslawowo</item>
         <item>wloclawek</item>
         <item>wlodawa</item>
+        <item>wozniki</item>
         <item>wroclaw</item>
         <item>wrzesnia</item>
         <item>wschowa</item>
@@ -2491,6 +2817,7 @@
         <item>zary</item>
         <item>zawidow</item>
         <item>zdunskawola</item>
+        <item>zduny</item>
         <item>zelechow</item>
         <item>zgierz</item>
         <item>zgorzelec</item>
@@ -2500,6 +2827,5 @@
         <item>zory</item>
         <item>zwolen</item>
         <item>zyrardow</item>
-        <item>zywiec</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6221ef99b..36dee1812 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -12,6 +12,9 @@
     <color name="colorDivider">#1f000000</color>
     <color name="colorDividerInverse">#1fffffff</color>
 
+    <color name="note_positive">#a0c431</color>
+    <color name="note_negative">#d43f3f</color>
+
     <color name="grade_black">#424242</color>
     <color name="grade_red">#d43f3f</color>
     <color name="grade_blue">#49a6f2</color>
diff --git a/app/src/main/res/values/library_wulkanowy_api.xml b/app/src/main/res/values/library_wulkanowy_api.xml
deleted file mode 100644
index d16bf86bd..000000000
--- a/app/src/main/res/values/library_wulkanowy_api.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="define_WulkanowyApi" translatable="false" />
-
-    <string name="library_WulkanowyApi_author" translatable="false">Wulkanowy</string>
-    <string name="library_WulkanowyApi_authorWebsite" translatable="false">https://github.com/wulkanowy</string>
-
-    <string name="library_WulkanowyApi_libraryName" translatable="false">UONET+ Scraping API</string>
-    <string name="library_WulkanowyApi_libraryDescription" translatable="false">The  UONET+ client using web scraping</string>
-    <string name="library_WulkanowyApi_libraryWebsite" translatable="false">https://github.com/wulkanowy/api</string>
-    <string name="library_WulkanowyApi_libraryVersion" translatable="false">Development</string>
-
-    <string name="library_WulkanowyApi_isOpenSource" translatable="false">true</string>
-    <string name="library_WulkanowyApi_repositoryLink" translatable="false">https://github.com/wulkanowy/api</string>
-
-    <string name="library_WulkanowyApi_licenseId" translatable="false">apache_2_0</string>
-</resources>
diff --git a/app/src/main/res/values/preferences_defaults.xml b/app/src/main/res/values/preferences_defaults.xml
index 91b357d93..fb82e0ed6 100644
--- a/app/src/main/res/values/preferences_defaults.xml
+++ b/app/src/main/res/values/preferences_defaults.xml
@@ -5,6 +5,7 @@
     <string name="pref_default_grade_average_mode">only_one_semester</string>
     <bool name="pref_default_grade_average_force_calc">false</bool>
     <bool name="pref_default_expand_grade">false</bool>
+    <bool name="pref_default_grade_statistics_list">false</bool>
     <string name="pref_default_app_theme">light</string>
     <string name="pref_default_grade_color_scheme">vulcan</string>
     <string name="pref_default_app_language">system</string>
@@ -12,8 +13,15 @@
     <string name="pref_default_services_interval">60</string>
     <bool name="pref_default_services_wifi_only">false</bool>
     <bool name="pref_default_notifications_enable">true</bool>
+    <bool name="pref_default_notification_upcoming_lessons_enable">false</bool>
     <bool name="pref_default_notification_debug">false</bool>
     <string name="pref_default_grade_modifier_plus">0.33</string>
     <string name="pref_default_grade_modifier_minus">0.33</string>
     <bool name="pref_default_fill_message_content">true</bool>
+    <bool name="pref_default_timetable_show_groups">false</bool>
+    <string name="pref_default_timetable_show_whole_class">no</string>
+    <string name="pref_default_grade_sorting_mode">alphabetic</string>
+    <bool name="pref_default_timetable_show_timers">false</bool>
+    <bool name="pref_default_homework_fullscreen">false</bool>
+    <bool name="pref_default_subjects_without_grades">false</bool>
 </resources>
diff --git a/app/src/main/res/values/preferences_keys.xml b/app/src/main/res/values/preferences_keys.xml
index a2172db96..0cfa485e3 100644
--- a/app/src/main/res/values/preferences_keys.xml
+++ b/app/src/main/res/values/preferences_keys.xml
@@ -7,13 +7,23 @@
     <string name="pref_key_expand_grade">expand_grade</string>
     <string name="pref_key_grade_average_mode">grade_average_mode</string>
     <string name="pref_key_grade_average_force_calc">grade_average_always_calc</string>
+    <string name="pref_key_grade_statistics_list">grade_statistics_list</string>
     <string name="pref_key_app_language">app_language</string>
     <string name="pref_key_services_enable">services_enable</string>
     <string name="pref_key_services_interval">services_interval</string>
     <string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
+    <string name="pref_key_services_force_sync">services_force_sync</string>
+    <string name="pref_key_notifications_fix_issues">notifications_fix_issues</string>
     <string name="pref_key_notifications_enable">notifications_enable</string>
+    <string name="pref_key_notifications_upcoming_lessons_enable">notifications_upcoming_lessons_enable</string>
     <string name="pref_key_notification_debug">notification_debug</string>
     <string name="pref_key_grade_modifier_plus">grade_modifier_plus</string>
     <string name="pref_key_grade_modifier_minus">grade_modifier_minus</string>
     <string name="pref_key_fill_message_content">fill_message_content</string>
+    <string name="pref_key_grade_sorting_mode">grade_sorting_mode</string>
+    <string name="pref_key_timetable_show_whole_class">show_whole_class_plan</string>
+    <string name="pref_key_timetable_show_groups">show_groups_in_plan</string>
+    <string name="pref_key_timetable_show_timers">timetable_show_timers</string>
+    <string name="pref_key_homework_fullscreen">homework_fullscreen</string>
+    <string name="pref_key_subjects_without_grades">subjects_without_grades</string>
 </resources>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index ee54d53c6..d994213c8 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -29,12 +29,18 @@
         <item>Polski</item>
         <item>English</item>
         <item>Pусский</item>
+        <item>Українська</item>
+        <item>Deutsch</item>
+        <item>Čeština</item>
     </string-array>
     <string-array name="app_language_values" translatable="false">
         <item>system</item>
         <item>pl</item>
         <item>en</item>
         <item>ru</item>
+        <item>uk</item>
+        <item>de</item>
+        <item>cs</item>
     </string-array>
 
     <string-array name="services_interval_entries">
@@ -71,6 +77,15 @@
         <item>0.75</item>
     </string-array>
 
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</item>
+    </string-array>
+    <string-array name="grade_sorting_mode_values" translatable="false">
+        <item>alphabetic</item>
+        <item>date</item>
+    </string-array>
+
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -84,10 +99,23 @@
 
     <string-array name="grade_average_mode_entries">
         <item>Average of grades only from the 2nd semester</item>
+        <item>Average of grades from both semesters</item>
         <item>Average of grades from the whole year</item>
     </string-array>
     <string-array name="grade_average_mode_values" translatable="false">
         <item>only_one_semester</item>
+        <item>both_semesters</item>
         <item>all_year</item>
     </string-array>
+
+    <string-array name="timetable_show_whole_class_entries">
+        <item>Don\'t show</item>
+        <item>Show all</item>
+        <item>Show smaller</item>
+    </string-array>
+    <string-array name="timetable_show_whole_class_values" translatable="false">
+        <item>no</item>
+        <item>yes</item>
+        <item>small</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8b94bff5..d45ef8dca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Wulkanowy</string>
-
-
     <!--Activity/Fragment title-->
     <string name="login_title">Login</string>
     <string name="main_title">Wulkanowy</string>
@@ -12,6 +10,8 @@
     <string name="settings_title">Settings</string>
     <string name="more_title">More</string>
     <string name="about_title">About</string>
+    <string name="logviewer_title">Log viewer</string>
+    <string name="contributors_title">Contributors</string>
     <string name="license_title">Licenses</string>
     <string name="message_title">Messages</string>
     <string name="send_message_title">New message</string>
@@ -20,12 +20,18 @@
     <string name="account_title">Choose account</string>
 
 
+    <!--Subtitles-->
+    <string name="grade_subtitle">Semester %1$d, %2$d/%3$d</string>
+
+
     <!--Login-->
     <string name="login_header_default">Sign in with the student or parent account</string>
     <string name="login_header_symbol">Enter the symbol</string>
-    <string name="login_nickname_hint">Email or nick</string>
+    <string name="login_nickname_hint">Username</string>
+    <string name="login_email_hint">Email</string>
+    <string name="login_login_pesel_email_hint">Login, PESEL or e-mail</string>
     <string name="login_password_hint">Password</string>
-    <string name="login_host_hint">Register</string>
+    <string name="login_host_hint">UONET+ Register</string>
     <string name="login_type_api">Mobile API</string>
     <string name="login_type_scrapper">Scraper</string>
     <string name="login_type_hybrid">Hybrid</string>
@@ -35,24 +41,35 @@
     <string name="login_symbol_hint">Symbol</string>
     <string name="login_sign_in">Sign in</string>
     <string name="login_invalid_password">Password too short</string>
-    <string name="login_incorrect_password">Login details are incorrect</string>
+    <string name="login_incorrect_password">Login details are incorrect. Make sure the correct UONET+ register is selected</string>
     <string name="login_invalid_pin">Invalid PIN</string>
     <string name="login_invalid_token">Invalid token</string>
     <string name="login_expired_token">Token expired</string>
+    <string name="login_invalid_email">Invalid email</string>
+    <string name="login_invalid_login">Invalid login</string>
     <string name="login_invalid_symbol">Invalid symbol</string>
     <string name="login_incorrect_symbol">Student not found. Check the symbol</string>
     <string name="login_field_required">This field is required</string>
     <string name="login_duplicate_student">Selected student is already logged in</string>
-    <string name="login_symbol_helper">The symbol can be found on the register page in Uczeń -> Dostęp Mobilny -> Zarejestruj urządzenie mobilne</string>
+    <string name="login_symbol_helper">The symbol can be found on the register page in&#160;<b>Uczeń</b> →&#160;<b>Dostęp Mobilny</b> →&#160;<b>Zarejestruj urządzenie mobilne</b></string>
     <string name="login_select_student">Select students to log in to the application</string>
     <string name="login_advanced">Other options</string>
+    <string name="login_advanced_warning_mobile_api">In this mode, a lucky number does not work, a class grade stats, summary of attendance, excuse for absence, completed lessons, school information and preview of the list of registered devices</string>
+    <string name="login_advanced_warning_scraper">This mode displays the same data as it appears on the register website</string>
+    <string name="login_advanced_warning_hybrid">The combination of the best features of the other two modes. It works faster than scraper and provides features not available in the Mobile API mode. It is in the experimental phase</string>
     <string name="login_privacy_policy">Privacy policy</string>
     <string name="login_contact_header">Trouble signing in? Contact us!</string>
     <string name="login_contact_email">Email</string>
     <string name="login_contact_discord">Discord</string>
     <string name="login_email_intent_title">Send email</string>
+    <string name="login_email_details">Describe details of problem:</string>
     <string name="login_email_subject" translatable="false">Zgłoszenie: Problemy z logowaniem</string>
-    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nOpis problemu:</string>
+    <string name="login_email_text" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\nDodatkowe informacje: %4$s\nOstatni błąd: %5$s\n\nOpis problemu: </string>
+    <string name="login_recover_warning">Make sure the correct UONET+ register is selected!</string>
+    <string name="login_recover_button">I forgot my password</string>
+    <string name="login_recover_title">Recover your account</string>
+    <string name="login_recover">Recover</string>
+    <string name="login_signed_in">Student is already signed in</string>
 
 
     <!--Main-->
@@ -68,10 +85,12 @@
     <string name="grade_switch_semester">Change semester</string>
     <string name="grade_no_items">No grades</string>
     <string name="grade_weight">Weight</string>
+    <string name="grade_weight_value">Weight: %s</string>
     <string name="grade_comment">Comment</string>
     <string name="grade_no_new_items">No new grades</string>
     <string name="grade_number_new_items">Number of new ratings: %1$d</string>
     <string name="grade_average">Average: %1$.2f</string>
+    <string name="grade_points_sum">Points: %s</string>
     <string name="grade_no_average">No average</string>
     <string name="grade_predicted">Predicted: %1$s</string>
     <string name="grade_final">Final: %1$s</string>
@@ -94,10 +113,26 @@
         <item quantity="one">New grade</item>
         <item quantity="other">New grades</item>
     </plurals>
+    <plurals name="grade_new_items_predicted">
+        <item quantity="one">New predicted grade</item>
+        <item quantity="other">New predicted grades</item>
+    </plurals>
+    <plurals name="grade_new_items_final">
+        <item quantity="one">New final grade</item>
+        <item quantity="other">New final grades</item>
+    </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">You received %1$d grade</item>
         <item quantity="other">You received %1$d grades</item>
     </plurals>
+    <plurals name="grade_notify_new_items_predicted">
+        <item quantity="one">You received %1$d predicted grade</item>
+        <item quantity="other">You received %1$d predicted grades</item>
+    </plurals>
+    <plurals name="grade_notify_new_items_final">
+        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="other">You received %1$d final grades</item>
+    </plurals>
 
 
     <!--Timetable-->
@@ -107,6 +142,14 @@
     <string name="timetable_time">Hours</string>
     <string name="timetable_changes">Changes</string>
     <string name="timetable_no_items">No lessons this day</string>
+    <string name="timetable_minutes">%s min</string>
+    <string name="timetable_seconds">%s sec</string>
+    <string name="timetable_time_left">%1$s left</string>
+    <string name="timetable_time_until">in %1$s</string>
+    <string name="timetable_finished">Finished</string>
+    <string name="timetable_now">Now: %s</string>
+    <string name="timetable_next">Next: %s</string>
+    <string name="timetable_later">Later: %s</string>
 
 
     <!--Completed lessons-->
@@ -127,16 +170,24 @@
     <string name="attendance_excused_lateness">Excused lateness</string>
     <string name="attendance_unexcused_lateness">Unexcused lateness</string>
     <string name="attendance_present">Present</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
     <string name="attendance_number">Number of lesson</string>
     <string name="attendance_no_items">No entries</string>
     <plurals name="attendance_number_absences">
         <item quantity="one">%1$d absence</item>
         <item quantity="other">%1$d absences</item>
     </plurals>
+    <string name="attendance_excuse_dialog_reason">Absence reason (optional)</string>
+    <string name="attendance_excuse_dialog_submit">Send</string>
+    <string name="attendance_excuse_success">Absence excused successfully!</string>
+    <string name="attendance_excuse_no_selection">You must select at least one absence!</string>
+    <string name="attendance_excuse_title">Excuse</string>
 
 
     <!--Attendance summary-->
     <string name="attendance_summary_final">Attendance</string>
+    <string name="attendance_summary_total">Total</string>
 
 
     <!--Exam-->
@@ -161,6 +212,8 @@
     <string name="message_move_to_bin">Move to trash</string>
     <string name="message_delete_forever">Delete permanently</string>
     <string name="message_delete_success">Message deleted successfully</string>
+    <string name="message_share">Share</string>
+    <string name="message_print">Print</string>
     <string name="message_subject">Subject</string>
     <string name="message_content">Content</string>
     <string name="message_send_successful">Message sent successfully</string>
@@ -182,6 +235,7 @@
 
     <!--Note-->
     <string name="note_no_items">No info about notes</string>
+    <string name="note_points">Points</string>
     <plurals name="note_number_item">
         <item quantity="one">%d note</item>
         <item quantity="other">%d notes</item>
@@ -195,9 +249,40 @@
         <item quantity="other">You received %1$d notes</item>
     </plurals>
 
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
+
 
     <!--Homework-->
     <string name="homework_no_items">No info about homework</string>
+    <string name="homework_mark_as_done">Mark as done</string>
+    <string name="homework_mark_as_undone">Mark as undone</string>
+    <string name="homework_attachments">Attachments</string>
 
 
     <!--Lucky number-->
@@ -245,10 +330,16 @@
     <string name="account_logout">Logout</string>
     <string name="account_confirm">Do you want to log out of an active student?</string>
     <string name="account_logout_student">Student logout</string>
+    <string name="account_type_student">Student account</string>
+    <string name="account_type_parent">Parent account</string>
+    <string name="account_login_mobile_api">Mobile API mode</string>
+    <string name="account_login_hybrid">Hybrid mode</string>
 
 
     <!--About-->
     <string name="about_version">App version</string>
+    <string name="about_contributor">Contributors</string>
+    <string name="about_contributor_summary">List of Wulkanowy developers</string>
     <string name="about_feedback">Report a bug</string>
     <string name="about_feedback_summary">Send a bug report via e-mail</string>
     <string name="about_faq">FAQ</string>
@@ -261,12 +352,28 @@
     <string name="about_homepage_summary">Visit the website and help develop the application</string>
     <string name="about_licenses">Licenses</string>
     <string name="about_licenses_summary">Licenses of libraries used in the application</string>
+    <string name="about_feedback_template" translatable="false">Informacje o aplikacji:\n\nUrządzenie: %1$s\nWersja SDK: %2$s\nWersja aplikacji: %3$s\n\nTreść zgłoszenia:</string>
 
 
     <!--Licenses-->
     <string name="license_dialog_title">License</string>
 
 
+    <!--Contributor-->
+    <string name="contributor_avatar_description">Avatar</string>
+    <string name="contributor_see_more">See more on GitHub</string>
+
+
+    <!--Log viewer-->
+    <string name="logviewer_share">Share logs</string>
+    <string name="logviewer_refresh">Refresh</string>
+
+
+    <!--Error dialog-->
+    <string name="dialog_error_check_update">Check for updates</string>
+    <string name="dialog_error_check_update_message">Before reporting a bug, check first if an update with the bug fix is available</string>
+
+
     <!--Generic-->
     <string name="all_content">Content</string>
     <string name="all_retry">Retry</string>
@@ -283,6 +390,8 @@
     <string name="all_subject">Subject</string>
     <string name="all_prev">Prev</string>
     <string name="all_next">Next</string>
+    <string name="all_search">Search</string>
+    <string name="all_search_hint">Search…</string>
 
 
     <!--Timetable Widget-->
@@ -290,6 +399,7 @@
     <string name="widget_timetable_theme_title">Choose theme</string>
     <string name="widget_timetable_theme_light">Light</string>
     <string name="widget_timetable_theme_dark">Dark</string>
+    <string name="widget_timetable_theme_system">System Theme</string>
 
 
     <!--Preferences-->
@@ -300,11 +410,21 @@
     <string name="pref_view_present">Show presence in attendance</string>
     <string name="pref_view_app_theme">Application theme</string>
     <string name="pref_view_expand_grade">Expand grades</string>
+    <string name="pref_view_timetable_show_timers">Mark current lesson in timetable</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
+    <string name="pref_view_grade_statistics_list">Show chart list in class grades</string>
+    <string name="pref_view_timetable_show_whole_class">Show whole class lessons</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
     <string name="pref_view_grade_color_scheme">Grades color scheme</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in "Grades"</string>
     <string name="pref_view_app_language">App language</string>
 
     <string name="pref_notify_header">Notifications</string>
     <string name="pref_notify_switch">Show notifications</string>
+    <string name="pref_notify_upcoming_lessons_switch">Show upcoming lesson notifications</string>
+    <string name="pref_notify_fix_sync_issues">Fix synchronization &amp; notifications issues</string>
+    <string name="pref_notify_fix_sync_issues_message">Your device may have data synchronization issues and with notifications.\n\nTo fix them, you need to add Wulkanowy to the autostart and turn off battery optimization/saving in the phone settings.</string>
+    <string name="pref_notify_fix_sync_issues_settings_button">Go to settings</string>
     <string name="pref_notify_debug_switch">Show debug notifications</string>
 
     <string name="pref_services_header">Synchronization</string>
@@ -312,6 +432,15 @@
     <string name="pref_services_suspended">Suspended on holidays</string>
     <string name="pref_services_interval">Updates interval</string>
     <string name="pref_services_wifi">Wi-Fi only</string>
+    <string name="pref_services_force_sync">Sync now</string>
+    <string name="pref_services_message_sync_success">Synced!</string>
+    <string name="pref_services_message_sync_failed">Sync failed</string>
+    <string name="pref_services_sync_in_progress">Sync in progress</string>
+    <string name="pref_services_dialog_force_sync_title">Synchronization</string>
+    <string name="pref_services_dialog_force_sync_summary">
+        Manual sync doesn\'t refresh app views.
+        \nTo see the synced data relaunch the app after syncing.
+    </string>
 
     <string name="pref_other_header">Other</string>
     <string name="pref_other_grade_modifier_plus">Value of the plus</string>
@@ -321,6 +450,12 @@
 
     <!--Notification Channels-->
     <string name="channel_new_entries">New entries in register</string>
+    <string name="channel_new_grades">New grades</string>
+    <string name="channel_lucky_number">Lucky number</string>
+    <string name="channel_new_message">New messages</string>
+    <string name="channel_new_notes">New notes</string>
+    <string name="channel_push">Push notifications</string>
+    <string name="channel_upcoming_lessons">Upcoming lessons</string>
     <string name="channel_debug">Debug</string>
 
 
@@ -337,14 +472,22 @@
     <string name="all_copied">Copied</string>
     <string name="all_undo">Undo</string>
 
+    <!--Update helper-->
+    <string name="update_download_started">Start downloading update…</string>
+    <string name="update_download_success">An update has just been downloaded.</string>
+    <string name="update_download_success_button">Restart</string>
+    <string name="update_failed">Update failed! Wulkanowy may not function properly. Consider updating</string>
+
 
     <!--Errors-->
     <string name="error_no_internet">No internet connection</string>
     <string name="error_timeout">Connection to the register timed out</string>
-    <string name="error_login_failed">Login failed. Try again or restart the app</string>
+    <string name="error_login_failed">Login failed. Try again</string>
+    <string name="error_password_change_required">Password change required</string>
     <string name="error_service_unavailable">Maintenance underway UONET + register. Try again later</string>
+    <string name="error_unknown_uonet">Unknown UONET + register error. Try again later</string>
+    <string name="error_unknown_app">Unknown application error</string>
     <string name="error_unknown">An unexpected error occurred</string>
     <string name="error_feature_disabled">Feature disabled by your school</string>
-    <string name="error_feature_not_available">Feature not available in this mode</string>
-
+    <string name="error_feature_not_available">Feature not available. Login in a mode other than Mobile API</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 68c0800b1..58ad1640e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,13 +16,14 @@
     <style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>
 
     <style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
         <item name="android:windowBackground">@drawable/layer_splash_background</item>
     </style>
 
-    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.Light.Dialog">
+    <style name="WulkanowyTheme.WidgetAccountSwitcher" parent="Theme.MaterialComponents.DayNight.Dialog">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorSecondary">@color/colorPrimary</item>
         <item name="windowActionBar">false</item>
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 000000000..f0da4709a
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,5 @@
+<paths>
+    <files-path
+        name="files"
+        path="." />
+</paths>
diff --git a/app/src/main/res/xml/scheme_preferences.xml b/app/src/main/res/xml/scheme_preferences.xml
index d9e6c5333..3f24c787a 100644
--- a/app/src/main/res/xml/scheme_preferences.xml
+++ b/app/src/main/res/xml/scheme_preferences.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--suppress AndroidElementNotAllowed -->
+<?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:iconSpaceReserved="false"
@@ -29,6 +29,37 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_expand_grade"
             app:title="@string/pref_view_expand_grade" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_timetable_show_timers"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_timers"
+            app:title="@string/pref_view_timetable_show_timers" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_grade_statistics_list"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_statistics_list"
+            app:singleLineTitle="false"
+            app:title="@string/pref_view_grade_statistics_list" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_timetable_show_groups"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_groups"
+            app:singleLineTitle="false"
+            app:title="@string/pref_view_timetable_show_groups" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_subjects_without_grades"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_subjects_without_grades"
+            app:singleLineTitle="false"
+            app:title="@string/pref_view_subjects_without_grades" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_timetable_show_whole_class"
+            app:entries="@array/timetable_show_whole_class_entries"
+            app:entryValues="@array/timetable_show_whole_class_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_timetable_show_whole_class"
+            app:title="@string/pref_view_timetable_show_whole_class"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             app:defaultValue="@string/pref_default_grade_color_scheme"
             app:entries="@array/grade_color_scheme_entries"
@@ -37,6 +68,14 @@
             app:key="@string/pref_key_grade_color_scheme"
             app:title="@string/pref_view_grade_color_scheme"
             app:useSimpleSummaryProvider="true" />
+        <ListPreference
+            app:defaultValue="@string/pref_default_grade_sorting_mode"
+            app:entries="@array/grade_sorting_mode_entries"
+            app:entryValues="@array/grade_sorting_mode_values"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_grade_sorting_mode"
+            app:title="@string/pref_view_grade_sorting_mode"
+            app:useSimpleSummaryProvider="true" />
         <ListPreference
             app:defaultValue="@string/pref_default_app_language"
             app:entries="@array/app_language_entries"
@@ -69,20 +108,35 @@
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_services_wifi_only"
             app:title="@string/pref_services_wifi" />
+        <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_services_force_sync"
+            app:title="@string/pref_services_force_sync" />
     </PreferenceCategory>
     <PreferenceCategory
         app:iconSpaceReserved="false"
         app:title="@string/pref_notify_header">
+        <Preference
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_fix_issues"
+            app:title="@string/pref_notify_fix_sync_issues" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notifications_enable"
             app:dependency="services_enable"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notifications_enable"
             app:title="@string/pref_notify_switch" />
+        <SwitchPreferenceCompat
+            app:defaultValue="@bool/pref_default_notification_upcoming_lessons_enable"
+            app:iconSpaceReserved="false"
+            app:key="@string/pref_key_notifications_upcoming_lessons_enable"
+            app:singleLineTitle="false"
+            app:title="@string/pref_notify_upcoming_lessons_switch" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_notification_debug"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_notification_debug"
+            app:singleLineTitle="false"
             app:title="@string/pref_notify_debug_switch" />
     </PreferenceCategory>
     <PreferenceCategory
@@ -116,11 +170,13 @@
             app:defaultValue="@bool/pref_default_grade_average_force_calc"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_grade_average_force_calc"
+            app:singleLineTitle="false"
             app:title="@string/pref_view_grade_average_force_calc" />
         <SwitchPreferenceCompat
             app:defaultValue="@bool/pref_default_fill_message_content"
             app:iconSpaceReserved="false"
             app:key="@string/pref_key_fill_message_content"
+            app:singleLineTitle="false"
             app:title="@string/pref_other_fill_message_content" />
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
index 4f76ef837..d7850b072 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/CrashlyticsUtils.kt
@@ -1,31 +1,48 @@
 package io.github.wulkanowy.utils
 
-import android.content.Context
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
-import io.fabric.sdk.android.Fabric
-import timber.log.Timber
+import android.util.Log
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import fr.bipi.tressence.base.FormatterPriorityTree
+import fr.bipi.tressence.common.StackTraceRecorder
+import io.github.wulkanowy.sdk.exception.FeatureNotAvailableException
+import io.github.wulkanowy.sdk.scrapper.exception.FeatureDisabledException
+import java.io.InterruptedIOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
 
-fun initCrashlytics(context: Context, appInfo: AppInfo) {
-    Fabric.with(Fabric.Builder(context)
-        .kits(
-            Crashlytics.Builder()
-                .core(CrashlyticsCore.Builder()
-                    .disabled(!appInfo.isCrashlyticsEnabled)
-                    .build())
-                .build()
-        )
-        .debuggable(appInfo.isDebug)
-        .build())
-}
+class CrashlyticsTree : FormatterPriorityTree(Log.VERBOSE) {
 
-class CrashlyticsTree : Timber.Tree() {
+    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
 
     override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-        Crashlytics.setInt("priority", priority)
-        Crashlytics.setString("tag", tag)
+        if (skipLog(priority, tag, message, t)) return
 
-        if (t == null) Crashlytics.log(message)
-        else Crashlytics.logException(t)
+        crashlytics.log(format(priority, tag, message))
+    }
+}
+
+class CrashlyticsExceptionTree : FormatterPriorityTree(Log.ERROR) {
+
+    private val crashlytics by lazy { FirebaseCrashlytics.getInstance() }
+
+    override fun skipLog(priority: Int, tag: String?, message: String, t: Throwable?): Boolean {
+        if (t is FeatureDisabledException || t is FeatureNotAvailableException || t is UnknownHostException || t is SocketTimeoutException || t is InterruptedIOException) {
+            return true
+        }
+
+        return super.skipLog(priority, tag, message, t)
+    }
+
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        if (skipLog(priority, tag, message, t)) return
+
+        crashlytics.setCustomKey("priority", priority)
+        crashlytics.setCustomKey("tag", tag.orEmpty())
+        crashlytics.setCustomKey("message", message)
+        if (t != null) {
+            crashlytics.recordException(t)
+        } else {
+            crashlytics.recordException(StackTraceRecorder(format(priority, tag, message)))
+        }
     }
 }
diff --git a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
index 6810e66ac..f7e4a0fc0 100644
--- a/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
+++ b/app/src/play/java/io/github/wulkanowy/utils/FirebaseAnalyticsHelper.kt
@@ -1,13 +1,17 @@
 package io.github.wulkanowy.utils
 
+import android.app.Activity
 import android.content.Context
 import android.os.Bundle
 import com.google.firebase.analytics.FirebaseAnalytics
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class FirebaseAnalyticsHelper @Inject constructor(private val context: Context) {
+class FirebaseAnalyticsHelper @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
 
     private val analytics by lazy { FirebaseAnalytics.getInstance(context) }
 
@@ -24,4 +28,8 @@ class FirebaseAnalyticsHelper @Inject constructor(private val context: Context)
             analytics.logEvent(name, this)
         }
     }
+
+    fun setCurrentScreen(activity: Activity, name: String?) {
+        analytics.setCurrentScreen(activity, name, null)
+    }
 }
diff --git a/app/src/play/java/io/github/wulkanowy/utils/UpdateHelper.kt b/app/src/play/java/io/github/wulkanowy/utils/UpdateHelper.kt
new file mode 100644
index 000000000..7586a21a1
--- /dev/null
+++ b/app/src/play/java/io/github/wulkanowy/utils/UpdateHelper.kt
@@ -0,0 +1,105 @@
+package io.github.wulkanowy.utils
+
+import android.app.Activity
+import android.app.Activity.RESULT_OK
+import android.content.Context
+import android.view.View
+import android.widget.Toast
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.play.core.appupdate.AppUpdateInfo
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.install.InstallStateUpdatedListener
+import com.google.android.play.core.install.model.AppUpdateType.FLEXIBLE
+import com.google.android.play.core.install.model.AppUpdateType.IMMEDIATE
+import com.google.android.play.core.install.model.InstallStatus.DOWNLOADED
+import com.google.android.play.core.install.model.InstallStatus.PENDING
+import com.google.android.play.core.install.model.UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS
+import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_AVAILABLE
+import com.google.android.play.core.ktx.isFlexibleUpdateAllowed
+import com.google.android.play.core.ktx.isImmediateUpdateAllowed
+import dagger.hilt.android.qualifiers.ApplicationContext
+import io.github.wulkanowy.R
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class UpdateHelper @Inject constructor(@ApplicationContext private val context: Context) {
+
+    lateinit var messageContainer: View
+
+    companion object {
+        const val IN_APP_UPDATE_REQUEST_CODE = 1721
+
+        const val DAYS_FOR_FLEXIBLE_UPDATE = 7
+        const val HIGH_PRIORITY_UPDATE = 4
+    }
+
+    private val appUpdateManager by lazy { AppUpdateManagerFactory.create(context) }
+
+    private val flexibleUpdateListener = InstallStateUpdatedListener { state ->
+        when (state.installStatus()) {
+            PENDING -> Toast.makeText(context, R.string.update_download_started, Toast.LENGTH_SHORT).show()
+            DOWNLOADED -> popupSnackBarForCompleteUpdate()
+            else -> Timber.d("Update state: ${state.installStatus()}")
+        }
+    }
+
+    private inline val AppUpdateInfo.isImmediateUpdateAvailable: Boolean
+        get() = updateAvailability() == UPDATE_AVAILABLE && isImmediateUpdateAllowed &&
+            updatePriority() >= HIGH_PRIORITY_UPDATE
+
+    private inline val AppUpdateInfo.isFlexibleUpdateAvailable: Boolean
+        get() = updateAvailability() == UPDATE_AVAILABLE && isFlexibleUpdateAllowed &&
+            clientVersionStalenessDays() ?: 0 >= DAYS_FOR_FLEXIBLE_UPDATE
+
+    fun checkAndInstallUpdates(activity: Activity) {
+        Timber.d("Checking for updates...")
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            when {
+                appUpdateInfo.isImmediateUpdateAvailable -> startUpdate(activity, appUpdateInfo, IMMEDIATE)
+                appUpdateInfo.isFlexibleUpdateAvailable -> {
+                    appUpdateManager.registerListener(flexibleUpdateListener)
+                    startUpdate(activity, appUpdateInfo, FLEXIBLE)
+                }
+                else -> Timber.d("No update available")
+            }
+        }
+    }
+
+    private fun startUpdate(activity: Activity, appUpdateInfo: AppUpdateInfo, updateType: Int) {
+        appUpdateManager.startUpdateFlowForResult(
+            appUpdateInfo, updateType, activity, IN_APP_UPDATE_REQUEST_CODE
+        )
+    }
+
+    fun onActivityResult(requestCode: Int, resultCode: Int) {
+        if (requestCode == IN_APP_UPDATE_REQUEST_CODE && resultCode != RESULT_OK) {
+            Timber.e("Update failed! Result code: $resultCode")
+            Toast.makeText(context, R.string.update_failed, Toast.LENGTH_LONG).show()
+        }
+    }
+
+    fun onResume(activity: Activity) {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { info ->
+            Timber.d("InAppUpdate.onResume() listener: $info")
+
+            when {
+                DOWNLOADED == info.installStatus() -> popupSnackBarForCompleteUpdate()
+                DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS == info.updateAvailability() -> {
+                    startUpdate(activity, info, if (info.isImmediateUpdateAvailable) IMMEDIATE else FLEXIBLE)
+                }
+            }
+        }
+    }
+
+    private fun popupSnackBarForCompleteUpdate() {
+        Snackbar.make(messageContainer, R.string.update_download_success, Snackbar.LENGTH_INDEFINITE).apply {
+            setAction(R.string.update_download_success_button) {
+                appUpdateManager.completeUpdate()
+                appUpdateManager.unregisterListener(flexibleUpdateListener)
+            }
+            show()
+        }
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
new file mode 100644
index 000000000..10724868a
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/MainCoroutineRule.kt
@@ -0,0 +1,26 @@
+package io.github.wulkanowy
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class MainCoroutineRule(
+    private val testDispatcher: TestCoroutineDispatcher = TestCoroutineDispatcher()
+) : TestWatcher() {
+
+    override fun starting(description: Description?) {
+        super.starting(description)
+        Dispatchers.setMain(testDispatcher)
+    }
+
+    override fun finished(description: Description?) {
+        super.finished(description)
+        Dispatchers.resetMain()
+        testDispatcher.cleanupTestCoroutines()
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
new file mode 100644
index 000000000..e60b1d7a2
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestDispatchersProvider.kt
@@ -0,0 +1,11 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.utils.DispatchersProvider
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+class TestDispatchersProvider : DispatchersProvider() {
+
+    override val backgroundThread: CoroutineDispatcher
+        get() = Dispatchers.Unconfined
+}
diff --git a/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
new file mode 100644
index 000000000..d15dc9530
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/TestEnityCreator.kt
@@ -0,0 +1,99 @@
+package io.github.wulkanowy
+
+import io.github.wulkanowy.data.db.entities.Message
+import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.sdk.Sdk
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalDateTime.now
+
+fun createSemesterEntity(diaryId: Int, semesterId: Int, start: LocalDate, end: LocalDate, semesterName: Int = 1): Semester {
+    return Semester(
+        studentId = 1,
+        diaryId = diaryId,
+        semesterId = semesterId,
+        diaryName = "$semesterId",
+        schoolYear = 1970,
+        classId = 0,
+        semesterName = semesterName,
+        unitId = 1,
+        start = start,
+        end = end
+    )
+}
+
+fun getStudentEntity(mode: Sdk.Mode = Sdk.Mode.API): Student {
+    return Student(
+        scrapperBaseUrl = "http://fakelog.cf",
+        email = "jan@fakelog.cf",
+        certificateKey = "",
+        classId = 0,
+        className = "",
+        isCurrent = false,
+        isParent = false,
+        loginMode = mode.name,
+        loginType = "STANDARD",
+        mobileBaseUrl = "",
+        password = "",
+        privateKey = "",
+        registrationDate = now(),
+        schoolName = "",
+        schoolShortName = "test",
+        schoolSymbol = "",
+        studentId = 0,
+        studentName = "",
+        symbol = "",
+        userLoginId = 0,
+        userName = "",
+    )
+}
+
+fun getTimetableEntity(
+    isStudentPlan: Boolean = false,
+    canceled: Boolean = false,
+    start: LocalDateTime = now(),
+    end: LocalDateTime = now()
+) = Timetable(
+    studentId = 0,
+    subject = "",
+    number = 0,
+    diaryId = 0,
+    canceled = canceled,
+    changes = false,
+    date = LocalDate.now(),
+    end = end,
+    group = "",
+    info = "",
+    isStudentPlan = isStudentPlan,
+    room = "",
+    roomOld = "",
+    start = start,
+    subjectOld = "",
+    teacher = "",
+    teacherOld = ""
+)
+
+fun getMessageEntity(
+    messageId: Int,
+    content: String,
+    unread: Boolean
+) = Message(
+    studentId = 1,
+    realId = 1,
+    messageId = messageId,
+    sender = "",
+    senderId = 1,
+    recipient = "",
+    subject = "",
+    date = now(),
+    folderId = 1,
+    unread = unread,
+    removed = false,
+    hasAttachments = false
+).apply {
+    this.content = content
+    unreadBy = 1
+    readBy = 1
+}
diff --git a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt b/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
deleted file mode 100644
index 8c52d7b37..000000000
--- a/app/src/test/java/io/github/wulkanowy/TestSchedulersProvider.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.github.wulkanowy
-
-import io.github.wulkanowy.utils.SchedulersProvider
-import io.reactivex.Scheduler
-import io.reactivex.schedulers.Schedulers
-
-class TestSchedulersProvider : SchedulersProvider() {
-
-    override val backgroundThread: Scheduler
-        get() = Schedulers.trampoline()
-
-    override val mainThread: Scheduler
-        get() = Schedulers.trampoline()
-}
-
diff --git a/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt b/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt
new file mode 100644
index 000000000..3b0d7c841
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/db/ConvertersTest.kt
@@ -0,0 +1,30 @@
+package io.github.wulkanowy.data.db
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ConvertersTest {
+
+    @Test
+    fun stringPairListToJson() {
+        assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]")
+        assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb", "ccc" to "ddd")), "[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]")
+        assertEquals(Converters().stringPairListToJson(listOf("aaa" to "bbb")), "[{\"first\":\"aaa\",\"second\":\"bbb\"}]")
+        assertEquals(Converters().stringPairListToJson(listOf()), "[]")
+    }
+
+    @Test
+    fun jsonToStringPairList() {
+        assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"},{\"first\":\"eee\",\"second\":\"fff\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd", "eee" to "fff"))
+        assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"},{\"first\":\"ccc\",\"second\":\"ddd\"}]"), listOf("aaa" to "bbb", "ccc" to "ddd"))
+        assertEquals(Converters().jsonToStringPairList("[{\"first\":\"aaa\",\"second\":\"bbb\"}]"), listOf("aaa" to "bbb"))
+        assertEquals(Converters().jsonToStringPairList("[]"), listOf<Pair<String, String>>())
+    }
+
+    @Test
+    fun jsonToStringPairList_0210() {
+        assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\",\"ccc\":\"ddd\"}"), listOf("aaa" to "bbb", "ccc" to "ddd"))
+        assertEquals(Converters().jsonToStringPairList("{\"aaa\":\"bbb\"}"), listOf("aaa" to "bbb"))
+        assertEquals(Converters().jsonToStringPairList("{}"), listOf<Pair<String, String>>())
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
deleted file mode 100644
index 28abbb993..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/UnitTestInternetObservingStrategy.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package io.github.wulkanowy.data.repositories
-
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingStrategy
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.error.ErrorHandler
-import io.reactivex.Observable
-import io.reactivex.Single
-
-class UnitTestInternetObservingStrategy : InternetObservingStrategy {
-
-    override fun checkInternetConnectivity(host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Single<Boolean> {
-        return Single.just(true)
-    }
-
-    override fun observeInternetConnectivity(initialIntervalInMs: Int, intervalInMs: Int, host: String?, port: Int, timeoutInMs: Int, httpResponse: Int, errorHandler: ErrorHandler?): Observable<Boolean> {
-        return Observable.just(true)
-    }
-
-    override fun getDefaultPingHost() = "localhost"
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
index b471dc520..2400c6c46 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/attendance/AttendanceRemoteTest.kt
@@ -1,26 +1,32 @@
 package io.github.wulkanowy.data.repositories.attendance
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Attendance
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import io.mockk.impl.annotations.SpyK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.of
+import java.time.LocalDate
+import java.time.LocalDate.of
 
 class AttendanceRemoteTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
+    @SpyK
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private var student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -28,16 +34,17 @@ class AttendanceRemoteTest {
 
     @Test
     fun getAttendanceTest() {
-        every {
+        every { mockSdk.init(student) } returns mockSdk
+        coEvery {
             mockSdk.getAttendance(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns Single.just(listOf(
+        } returns listOf(
             getAttendance(of(2018, 9, 10)),
             getAttendance(of(2018, 9, 17))
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -45,10 +52,12 @@ class AttendanceRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val attendance = AttendanceRemote(mockSdk).getAttendance(semesterMock,
-            of(2018, 9, 10),
-            of(2018, 9, 15)
-        ).blockingGet()
+        val attendance = runBlocking {
+            AttendanceRemote(mockSdk).getAttendance(student, semesterMock,
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        }
         assertEquals(2, attendance.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
index 7570164fd..7be3f84fd 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/completedlessons/CompletedLessonsRemoteTest.kt
@@ -1,26 +1,32 @@
 package io.github.wulkanowy.data.repositories.completedlessons
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.CompletedLesson
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import io.mockk.impl.annotations.SpyK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.of
+import java.time.LocalDate
+import java.time.LocalDate.of
 
 class CompletedLessonsRemoteTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
+    @SpyK
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -28,15 +34,16 @@ class CompletedLessonsRemoteTest {
 
     @Test
     fun getCompletedLessonsTest() {
-        every {
+        every { mockSdk.init(student) } returns mockSdk
+        coEvery {
             mockSdk.getCompletedLessons(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns Single.just(listOf(
+        } returns listOf(
             getCompletedLesson(of(2018, 9, 10)),
             getCompletedLesson(of(2018, 9, 17))
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -44,10 +51,12 @@ class CompletedLessonsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val completed = CompletedLessonsRemote(mockSdk).getCompletedLessons(semesterMock,
-            of(2018, 9, 10),
-            of(2018, 9, 15)
-        ).blockingGet()
+        val completed = runBlocking {
+            CompletedLessonsRemote(mockSdk).getCompletedLessons(student, semesterMock,
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        }
         Assert.assertEquals(2, completed.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
index c17ec21eb..23bf0297e 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/exam/ExamRemoteTest.kt
@@ -1,55 +1,64 @@
 package io.github.wulkanowy.data.repositories.exam
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Exam
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import io.mockk.impl.annotations.SpyK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.of
+import java.time.LocalDate
+import java.time.LocalDate.of
 
 class ExamRemoteTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
+    @SpyK
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
-    fun initApi() {
+    fun setUp() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getExamsTest() {
-        every {
+        every { mockSdk.init(student) } returns mockSdk
+        every { mockSdk.switchDiary(1, 2019) } returns mockSdk
+
+        coEvery {
             mockSdk.getExams(
                 of(2018, 9, 10),
                 of(2018, 9, 15),
                 1
             )
-        } returns Single.just(listOf(
+        } returns listOf(
             getExam(of(2018, 9, 10)),
             getExam(of(2018, 9, 17))
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
         every { semesterMock.schoolYear } returns 2019
         every { semesterMock.semesterId } returns 1
-        every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val exams = ExamRemote(mockSdk)
-            .getExams(semesterMock,
+        val exams = runBlocking {
+            ExamRemote(mockSdk).getExams(student, semesterMock,
                 of(2018, 9, 10),
                 of(2018, 9, 15)
-            ).blockingGet()
+            )
+        }
         assertEquals(2, exams.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
index ee08454f1..cd2a3070b 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/gradestatistics/GradeStatisticsRemoteTest.kt
@@ -1,36 +1,43 @@
 package io.github.wulkanowy.data.repositories.gradestatistics
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.GradePointsStatistics
 import io.github.wulkanowy.sdk.pojo.GradeStatistics
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import io.mockk.impl.annotations.SpyK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 
 class GradeStatisticsRemoteTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
+    @SpyK
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
+        every { mockSdk.init(student) } returns mockSdk
     }
 
     @Test
     fun getGradeStatisticsTest() {
-        every { mockSdk.getGradesPartialStatistics(1) } returns Single.just(listOf(
+        coEvery { mockSdk.getGradesPartialStatistics(1) } returns listOf(
             getGradeStatistics("Fizyka"),
             getGradeStatistics("Matematyka")
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -38,16 +45,16 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = GradeStatisticsRemote(mockSdk).getGradeStatistics(semesterMock, false).blockingGet()
+        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradeStatistics(student, semesterMock, false) }
         assertEquals(2, stats.size)
     }
 
     @Test
     fun getGradePointsStatisticsTest() {
-        every { mockSdk.getGradesPointsStatistics(1) } returns Single.just(listOf(
+        coEvery { mockSdk.getGradesPointsStatistics(1) } returns listOf(
             getGradePointsStatistics("Fizyka"),
             getGradePointsStatistics("Matematyka")
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -55,7 +62,7 @@ class GradeStatisticsRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val stats = GradeStatisticsRemote(mockSdk).getGradePointsStatistics(semesterMock).blockingGet()
+        val stats = runBlocking { GradeStatisticsRemote(mockSdk).getGradePointsStatistics(student, semesterMock) }
         assertEquals(2, stats.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
index e8699f1ee..1a8157f66 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/luckynumber/LuckyNumberRemoteTest.kt
@@ -1,44 +1,44 @@
 package io.github.wulkanowy.data.repositories.luckynumber
 
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
+import io.github.wulkanowy.utils.init
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
-import io.mockk.impl.annotations.MockK
 import io.mockk.impl.annotations.SpyK
-import io.reactivex.Maybe
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 class LuckyNumberRemoteTest {
 
     @SpyK
     private var mockSdk = Sdk()
 
-    @MockK
-    private lateinit var semesterMock: Semester
+    private val student = getStudentEntity(Sdk.Mode.SCRAPPER)
 
     @Before
-    fun initApi() {
+    fun setUp() {
         MockKAnnotations.init(this)
     }
 
     @Test
     fun getLuckyNumberTest() {
-        every { mockSdk.getLuckyNumber() } returns Maybe.just(14)
+        every { mockSdk.init(student) } returns mockSdk
+        coEvery { mockSdk.getLuckyNumber("test") } returns 14
 
         every { mockSdk.diaryId } returns 1
-        every { semesterMock.studentId } returns 1
-        every { semesterMock.diaryId } returns 1
 
-        val luckyNumber = LuckyNumberRemote(mockSdk)
-            .getLuckyNumber(semesterMock)
-            .blockingGet()
+        val luckyNumber = runBlocking {
+            LuckyNumberRemote(mockSdk)
+                .getLuckyNumber(student)
+        }
 
-        assertEquals(14, luckyNumber.luckyNumber)
-        assertEquals(LocalDate.now(), luckyNumber.date)
-        assertEquals(semesterMock.studentId, luckyNumber.studentId)
+        assertEquals(14, luckyNumber?.luckyNumber)
+        assertEquals(LocalDate.now(), luckyNumber?.date)
+        assertEquals(student.studentId, luckyNumber?.studentId)
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
new file mode 100644
index 000000000..d07a0f393
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/message/MessageRepositoryTest.kt
@@ -0,0 +1,106 @@
+package io.github.wulkanowy.data.repositories.message
+
+import io.github.wulkanowy.data.Status
+import io.github.wulkanowy.data.db.entities.MessageWithAttachment
+import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.getMessageEntity
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import java.net.UnknownHostException
+
+class MessageRepositoryTest {
+
+    @MockK
+    lateinit var local: MessageLocal
+
+    @MockK
+    lateinit var remote: MessageRemote
+
+    @MockK
+    lateinit var student: Student
+
+    private lateinit var repo: MessageRepository
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        every { student.userName } returns "Jan"
+        repo = MessageRepository(local, remote)
+    }
+
+    @Test
+    fun `throw error when message is not in the db`() {
+        val testMessage = getMessageEntity(1, "", false)
+        coEvery { local.getMessageWithAttachment(student, testMessage) } throws NullPointerException("No message in database")
+
+        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
+        assertEquals(NullPointerException::class.java, message.exceptionOrNull()?.javaClass)
+    }
+
+    @Test
+    fun `get message when content already in db`() {
+        val testMessage = getMessageEntity(123, "Test", false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        coEvery { local.getMessageWithAttachment(student, testMessage) } returns flowOf(messageWithAttachment)
+
+        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+
+        assertEquals(Status.SUCCESS, message[1].status)
+        assertEquals("Test", message[1].data!!.message.content)
+    }
+
+    @Test
+    fun `get message when content in db is empty`() {
+        val testMessage = getMessageEntity(123, "", true)
+        val testMessageWithContent = testMessage.copy().apply { content = "Test" }
+
+        val mWa = MessageWithAttachment(testMessage, emptyList())
+        val mWaWithContent = MessageWithAttachment(testMessageWithContent, emptyList())
+
+        coEvery { local.getMessageWithAttachment(student, testMessage) } returnsMany listOf(flowOf(mWa), flowOf(mWaWithContent))
+        coEvery { remote.getMessagesContentDetails(student, any(), any()) } returns ("Test" to emptyList())
+        coEvery { local.updateMessages(any()) } just Runs
+        coEvery { local.saveMessageAttachments(any()) } just Runs
+
+        val message = runBlocking { repo.getMessage(student, testMessage).toList() }
+
+        assertEquals(Status.SUCCESS, message[2].status)
+        assertEquals("Test", message[2].data!!.message.content)
+        coVerify { local.updateMessages(listOf(testMessageWithContent)) }
+    }
+
+    @Test
+    fun `get message when content in db is empty and there is no internet connection`() {
+        val testMessage = getMessageEntity(123, "", false)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+
+        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
+        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+    }
+
+    @Test
+    fun `get message when content in db is empty, unread and there is no internet connection`() {
+        val testMessage = getMessageEntity(123, "", true)
+        val messageWithAttachment = MessageWithAttachment(testMessage, emptyList())
+
+        coEvery { local.getMessageWithAttachment(student, testMessage) } throws UnknownHostException()
+
+        val message = runCatching { runBlocking { repo.getMessage(student, testMessage).toList()[1] } }
+        assertEquals(UnknownHostException::class.java, message.exceptionOrNull()?.javaClass)
+    }
+}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
index 9c1bb9756..286cf5e91 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/mobiledevice/MobileDeviceRepositoryTest.kt
@@ -1,40 +1,40 @@
 package io.github.wulkanowy.data.repositories.mobiledevice
 
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
 import io.github.wulkanowy.data.db.entities.MobileDevice
 import io.github.wulkanowy.data.db.entities.Semester
-import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.github.wulkanowy.getStudentEntity
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDateTime.of
+import java.time.LocalDateTime.of
 
 class MobileDeviceRepositoryTest {
 
-    @Mock
+    @MockK
     private lateinit var semester: Semester
 
-    @Mock
+    @MockK
     private lateinit var mobileDeviceRemote: MobileDeviceRemote
 
-    @Mock
+    @MockK
     private lateinit var mobileDeviceLocal: MobileDeviceLocal
 
+    private val student = getStudentEntity()
+
     private lateinit var mobileDeviceRepository: MobileDeviceRepository
 
-    private val settings = InternetObservingSettings.builder()
-        .strategy(UnitTestInternetObservingStrategy())
-        .build()
-
     @Before
     fun initTest() {
-        MockitoAnnotations.initMocks(this)
-        mobileDeviceRepository = MobileDeviceRepository(settings, mobileDeviceLocal, mobileDeviceRemote)
+        MockKAnnotations.init(this)
+        mobileDeviceRepository = MobileDeviceRepository(mobileDeviceLocal, mobileDeviceRemote)
     }
 
     @Test
@@ -44,13 +44,15 @@ class MobileDeviceRepositoryTest {
             getDeviceEntity(2)
         )
 
-        doReturn(Maybe.empty<MobileDevice>()).`when`(mobileDeviceLocal).getDevices(semester)
-        doReturn(Single.just(devices)).`when`(mobileDeviceRemote).getDevices(semester)
+        coEvery { mobileDeviceLocal.getDevices(semester) } returns flowOf(emptyList())
+        coEvery { mobileDeviceLocal.deleteDevices(emptyList()) } just Runs
+        coEvery { mobileDeviceLocal.saveDevices(devices) } just Runs
+        coEvery { mobileDeviceRemote.getDevices(student, semester) } returns devices
 
-        mobileDeviceRepository.getDevices(semester).blockingGet()
+        runBlocking { mobileDeviceRepository.getDevices(student, semester, true).toList() }
 
-        verify(mobileDeviceLocal).deleteDevices(emptyList())
-        verify(mobileDeviceLocal).saveDevices(devices)
+        coVerify { mobileDeviceLocal.deleteDevices(emptyList()) }
+        coVerify { mobileDeviceLocal.saveDevices(devices) }
     }
 
     private fun getDeviceEntity(day: Int): MobileDevice {
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
index 808354761..5a2388ff7 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/SemesterRepositoryTest.kt
@@ -1,74 +1,216 @@
 package io.github.wulkanowy.data.repositories.semester
 
-import com.github.pwittchen.reactivenetwork.library.rx2.internet.observing.InternetObservingSettings
-import io.github.wulkanowy.data.SdkHelper
-import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.TestDispatchersProvider
+import io.github.wulkanowy.createSemesterEntity
 import io.github.wulkanowy.data.db.entities.Student
-import io.github.wulkanowy.data.repositories.UnitTestInternetObservingStrategy
-import io.reactivex.Maybe
-import io.reactivex.Single
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.doNothing
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
+import java.time.LocalDate.now
 
 class SemesterRepositoryTest {
 
-    @Mock
+    @MockK
     private lateinit var semesterRemote: SemesterRemote
 
-    @Mock
+    @MockK
     private lateinit var semesterLocal: SemesterLocal
 
-    @Mock
-    private lateinit var sdkHelper: SdkHelper
-
-    @Mock
+    @MockK
     private lateinit var student: Student
 
     private lateinit var semesterRepository: SemesterRepository
 
-    private val settings = InternetObservingSettings.builder()
-        .strategy(UnitTestInternetObservingStrategy())
-        .build()
-
     @Before
     fun initTest() {
-        MockitoAnnotations.initMocks(this)
-        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, settings, sdkHelper)
+        MockKAnnotations.init(this)
+        semesterRepository = SemesterRepository(semesterRemote, semesterLocal, TestDispatchersProvider())
+        every { student.loginMode } returns "SCRAPPER"
     }
 
     @Test
-    fun singleCurrentSemesterTest() {
+    fun getSemesters_noSemesters() {
         val semesters = listOf(
-            createSemesterEntity(false),
-            createSemesterEntity(true)
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
         )
 
-        doNothing().`when`(sdkHelper).init(student)
-        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
+        coEvery { semesterRemote.getSemesters(student) } returns semesters
+        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
+        coEvery { semesterLocal.saveSemesters(any()) } just Runs
 
-        semesterRepository.getSemesters(student).blockingGet()
+        runBlocking { semesterRepository.getSemesters(student) }
 
-        verify(semesterLocal).deleteSemesters(emptyList())
-        verify(semesterLocal).saveSemesters(semesters)
+        coVerify { semesterLocal.saveSemesters(semesters) }
+        coVerify { semesterLocal.deleteSemesters(emptyList()) }
+    }
+
+    @Test
+    fun getSemesters_invalidDiary_api() {
+        every { student.loginMode } returns "API"
+        val badSemesters = listOf(
+            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(0, 2, now().minusMonths(3), now())
+        )
+
+        val goodSemesters = listOf(
+            createSemesterEntity(122, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(123, 2, now().minusMonths(3), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns badSemesters
+        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
+        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
+        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+
+        val items = runBlocking { semesterRepository.getSemesters(student) }
+        assertEquals(2, items.size)
+        assertEquals(0, items[0].diaryId)
+    }
+
+    @Test
+    fun getSemesters_invalidDiary_scrapper() {
+        every { student.loginMode } returns "SCRAPPER"
+        val badSemesters = listOf(
+            createSemesterEntity(0, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(0, 2, now().minusMonths(3), now())
+        )
+
+        val goodSemesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returnsMany listOf(badSemesters, badSemesters, goodSemesters)
+        coEvery { semesterRemote.getSemesters(student) } returns goodSemesters
+        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
+        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+
+        val items = runBlocking { semesterRepository.getSemesters(student) }
+        assertEquals(2, items.size)
+        assertNotEquals(0, items[0].diaryId)
+    }
+
+    @Test
+    fun getSemesters_noCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns semesters
+
+        val items = runBlocking { semesterRepository.getSemesters(student) }
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_oneCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns semesters
+
+        val items = runBlocking { semesterRepository.getSemesters(student) }
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns semesters
+
+        val items = runBlocking { semesterRepository.getSemesters(student) }
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_noSemesters_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(6), now().minusMonths(3)),
+            createSemesterEntity(1, 2, now().minusMonths(3), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
+        coEvery { semesterRemote.getSemesters(student) } returns semesters
+        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
+        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+
+        runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+
+        coVerify { semesterLocal.deleteSemesters(emptyList()) }
+        coVerify { semesterLocal.saveSemesters(semesters) }
+    }
+
+    @Test
+    fun getSemesters_noCurrent_refreshOnNoCurrent() {
+        val semestersWithNoCurrent = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1))
+        )
+
+        val newSemesters = listOf(
+            createSemesterEntity(1, 1, now().minusMonths(12), now().minusMonths(6)),
+            createSemesterEntity(1, 2, now().minusMonths(6), now().minusMonths(1)),
+
+            createSemesterEntity(2, 1, now().minusMonths(1), now().plusMonths(5)),
+            createSemesterEntity(2, 2, now().plusMonths(5), now().plusMonths(11)),
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns semestersWithNoCurrent
+        coEvery { semesterRemote.getSemesters(student) } returns newSemesters
+        coEvery { semesterLocal.deleteSemesters(any()) } just Runs
+        coEvery { semesterLocal.saveSemesters(any()) } just Runs
+
+        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        assertEquals(2, items.size)
+    }
+
+    @Test
+    fun getSemesters_doubleCurrent_refreshOnNoCurrent() {
+        val semesters = listOf(
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 2, now(), now())
+        )
+
+        coEvery { semesterLocal.getSemesters(student) } returns semesters
+
+        val items = runBlocking { semesterRepository.getSemesters(student, refreshOnNoCurrent = true) }
+        assertEquals(2, items.size)
     }
 
     @Test(expected = IllegalArgumentException::class)
-    fun twoCurrentSemesterTest() {
+    fun getCurrentSemester_doubleCurrent() {
         val semesters = listOf(
-            createSemesterEntity(true),
-            createSemesterEntity(true)
+            createSemesterEntity(1, 1, now(), now()),
+            createSemesterEntity(1, 1, now(), now())
         )
 
-        doNothing().`when`(sdkHelper).init(student)
-        doReturn(Maybe.empty<Semester>()).`when`(semesterLocal).getSemesters(student)
-        doReturn(Single.just(semesters)).`when`(semesterRemote).getSemesters(student)
+        coEvery { semesterLocal.getSemesters(student) } returns semesters
 
-        semesterRepository.getSemesters(student).blockingGet()
+        runBlocking { semesterRepository.getCurrentSemester(student) }
+    }
+
+    @Test(expected = RuntimeException::class)
+    fun getCurrentSemester_emptyList() {
+        coEvery { semesterLocal.getSemesters(student) } returns emptyList()
+
+        runBlocking { semesterRepository.getCurrentSemester(student) }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
deleted file mode 100644
index f628710fc..000000000
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/semester/TestSemesterEnityCreator.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.github.wulkanowy.data.repositories.semester
-
-import io.github.wulkanowy.data.db.entities.Semester
-import org.threeten.bp.LocalDate.now
-
-fun createSemesterEntity(current: Boolean): Semester {
-    return Semester(
-        studentId = 0,
-        diaryId = 0,
-        semesterId = 0,
-        diaryName = "",
-        schoolYear = 1970,
-        classId = 0,
-        isCurrent = current,
-        semesterName = 0,
-        unitId = 0,
-        start = now(),
-        end = now()
-    )
-}
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
index f52c01424..47a10772e 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/student/StudentRemoteTest.kt
@@ -1,36 +1,32 @@
 package io.github.wulkanowy.data.repositories.student
 
-import io.github.wulkanowy.data.SdkHelper
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Student
-import io.mockk.impl.annotations.SpyK
-import io.reactivex.Single
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.anyBoolean
-import org.mockito.Mockito.anyString
-import org.mockito.Mockito.doReturn
-import org.mockito.MockitoAnnotations
 
 class StudentRemoteTest {
 
-    @Mock
+    @MockK
     private lateinit var mockSdk: Sdk
 
     @Before
     fun initApi() {
-        MockitoAnnotations.initMocks(this)
+        MockKAnnotations.init(this)
     }
 
     @Test
     fun testRemoteAll() {
-        doReturn(Single.just(listOf(getStudent("test")))).`when`(mockSdk).getStudentsFromScrapper(anyString(), anyString(), anyString(), anyString())
+        coEvery { mockSdk.getStudentsFromScrapper(any(), any(), any(), any()) } returns listOf(getStudent("test"))
 
-        val students = StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "").blockingGet()
+        val students = runBlocking { StudentRemote(mockSdk).getStudentsScrapper("", "", "http://fakelog.cf", "") }
         assertEquals(1, students.size)
-        assertEquals("test", students.first().studentName)
+        assertEquals("test Kowalski", students.first().student.studentName)
     }
 
     private fun getStudent(name: String): Student {
@@ -39,8 +35,12 @@ class StudentRemoteTest {
             symbol = "",
             studentId = 0,
             userLoginId = 0,
+            userLogin = "",
+            userName = "",
             studentName = name,
+            studentSurname = "Kowalski",
             schoolSymbol = "",
+            schoolShortName = "",
             schoolName = "",
             className = "",
             classId = 0,
@@ -50,7 +50,8 @@ class StudentRemoteTest {
             mobileBaseUrl = "",
             loginType = Sdk.ScrapperLoginType.STANDARD,
             scrapperBaseUrl = "",
-            isParent = false
+            isParent = false,
+            semesters = emptyList()
         )
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
index 100bc0aed..c948ba31b 100644
--- a/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/data/repositories/timetable/TimetableRemoteTest.kt
@@ -1,27 +1,32 @@
 package io.github.wulkanowy.data.repositories.timetable
 
 import io.github.wulkanowy.data.db.entities.Semester
+import io.github.wulkanowy.getStudentEntity
 import io.github.wulkanowy.sdk.Sdk
 import io.github.wulkanowy.sdk.pojo.Timetable
 import io.mockk.MockKAnnotations
+import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.reactivex.Single
+import io.mockk.impl.annotations.SpyK
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDate.of
-import org.threeten.bp.LocalDateTime.now
+import java.time.LocalDate
+import java.time.LocalDate.of
+import java.time.LocalDateTime.now
 
 class TimetableRemoteTest {
 
-    @MockK
-    private lateinit var mockSdk: Sdk
+    @SpyK
+    private var mockSdk = Sdk()
 
     @MockK
     private lateinit var semesterMock: Semester
 
+    private val student = getStudentEntity()
+
     @Before
     fun initApi() {
         MockKAnnotations.init(this)
@@ -29,15 +34,15 @@ class TimetableRemoteTest {
 
     @Test
     fun getTimetableTest() {
-        every {
+        coEvery {
             mockSdk.getTimetable(
                 of(2018, 9, 10),
                 of(2018, 9, 15)
             )
-        } returns Single.just(listOf(
+        } returns listOf(
             getTimetable(of(2018, 9, 10)),
             getTimetable(of(2018, 9, 17))
-        ))
+        )
 
         every { semesterMock.studentId } returns 1
         every { semesterMock.diaryId } returns 1
@@ -45,10 +50,12 @@ class TimetableRemoteTest {
         every { semesterMock.semesterId } returns 1
         every { mockSdk.switchDiary(any(), any()) } returns mockSdk
 
-        val timetable = TimetableRemote(mockSdk).getTimetable(semesterMock,
-            of(2018, 9, 10),
-            of(2018, 9, 15)
-        ).blockingGet()
+        val timetable = runBlocking {
+            TimetableRemote(mockSdk).getTimetable(student, semesterMock,
+                of(2018, 9, 10),
+                of(2018, 9, 15)
+            )
+        }
         assertEquals(2, timetable.size)
     }
 
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
index 56b1e66f8..390098f0d 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
@@ -1,214 +1,500 @@
 package io.github.wulkanowy.ui.modules.grade
 
+import io.github.wulkanowy.createSemesterEntity
+import io.github.wulkanowy.data.Resource
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
-import io.github.wulkanowy.data.db.entities.Semester
 import io.github.wulkanowy.data.db.entities.Student
 import io.github.wulkanowy.data.repositories.grade.GradeRepository
-import io.github.wulkanowy.data.repositories.gradessummary.GradeSummaryRepository
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
+import io.github.wulkanowy.data.repositories.semester.SemesterRepository
 import io.github.wulkanowy.sdk.Sdk
-import io.reactivex.Single
+import io.github.wulkanowy.utils.flowWithResource
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.doReturn
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDate.now
-import org.threeten.bp.LocalDateTime
+import java.time.LocalDate.now
+import java.time.LocalDate.of
+import java.time.LocalDateTime
 
 class GradeAverageProviderTest {
 
-    @Mock
+    private suspend fun <T> Flow<Resource<T>>.getResult() = toList()[1].data!!
+
+    @MockK
     lateinit var preferencesRepository: PreferencesRepository
 
-    @Mock
-    lateinit var gradeRepository: GradeRepository
+    @MockK
+    lateinit var semesterRepository: SemesterRepository
 
-    @Mock
-    lateinit var gradeSummaryRepository: GradeSummaryRepository
+    @MockK
+    lateinit var gradeRepository: GradeRepository
 
     private lateinit var gradeAverageProvider: GradeAverageProvider
 
-    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", 1, true, LocalDateTime.now())
+    private val student = Student("", "", "", "SCRAPPER", "", "", false, "", "", "", 101, 0, "", "", "", "", "", "", 1, true, LocalDateTime.now())
 
     private val semesters = mutableListOf(
-        Semester(101, 10, "", 1, 21, 1, false, now(), now(), 1, 1),
-        Semester(101, 11, "", 1, 22, 1, false, now(), now(), 1, 1),
-        Semester(101, 11, "", 1, 23, 2, true, now(), now(), 1, 1)
+        createSemesterEntity(10, 21, of(2019, 1, 31), of(2019, 6, 23)),
+        createSemesterEntity(11, 22, of(2019, 9, 1), of(2020, 1, 31)),
+        createSemesterEntity(11, 23, of(2020, 2, 1), now(), semesterName = 2)
     )
 
     private val firstGrades = listOf(
+        // avg: 3.5
         getGrade(22, "Matematyka", 4.0),
         getGrade(22, "Matematyka", 3.0),
+
+        // avg: 3.5
         getGrade(22, "Fizyka", 6.0),
         getGrade(22, "Fizyka", 1.0)
     )
 
-    private val secondGrade = listOf(
+    private val firstSummaries = listOf(
+        getSummary(semesterId = 22, subject = "Matematyka", average = 3.9),
+        getSummary(semesterId = 22, subject = "Fizyka", average = 3.1)
+    )
+
+    private val secondGrades = listOf(
+        // avg: 2.5
         getGrade(23, "Matematyka", 2.0),
         getGrade(23, "Matematyka", 3.0),
+
+        // avg: 3.0
         getGrade(23, "Fizyka", 4.0),
         getGrade(23, "Fizyka", 2.0)
     )
 
+    private val secondSummaries = listOf(
+        getSummary(semesterId = 23, subject = "Matematyka", average = 2.9),
+        getSummary(semesterId = 23, subject = "Fizyka", average = 3.4)
+    )
+
     private val secondGradeWithModifier = listOf(
+        // avg: 3.375
         getGrade(24, "Język polski", 3.0, -0.50),
         getGrade(24, "Język polski", 4.0, 0.25)
     )
 
+    private val secondSummariesWithModifier = listOf(
+        getSummary(24, "Język polski", 3.49)
+    )
+
     @Before
-    fun initTest() {
-        MockitoAnnotations.initMocks(this)
-        gradeAverageProvider = GradeAverageProvider(preferencesRepository, gradeRepository, gradeSummaryRepository)
+    fun setUp() {
+        MockKAnnotations.init(this)
 
-        doReturn(.33).`when`(preferencesRepository).gradeMinusModifier
-        doReturn(.33).`when`(preferencesRepository).gradePlusModifier
-        doReturn(false).`when`(preferencesRepository).gradeAverageForceCalc
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        every { preferencesRepository.gradeMinusModifier } returns .33
+        every { preferencesRepository.gradePlusModifier } returns .33
 
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], true)
-        doReturn(Single.just(secondGrade)).`when`(gradeRepository).getGrades(student, semesters[2], true)
+        gradeAverageProvider = GradeAverageProvider(semesterRepository, gradeRepository, preferencesRepository)
     }
 
     @Test
-    fun onlyOneSemesterTest() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+    fun `force calc average on no grades`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { emptyList<Grade>() to emptyList<GradeSummary>() }
 
-        assertEquals(2, averages.size)
-        assertEquals(2.5, averages["Matematyka"])
-        assertEquals(3.0, averages["Fizyka"])
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(0, items.size)
     }
 
     @Test
-    fun onlyOneSemester_gradesWithModifiers_default() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
-        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student, semesters[2], true)
+    fun `force calc current semester average with default modifiers in scraper mode`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
 
-        assertEquals(3.5, averages["Język polski"])
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
     }
 
     @Test
-    fun onlyOneSemester_gradesWithModifiers_api() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
-        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.API.name), semesters[2], true)
+    fun `force calc current semester average with custom modifiers in scraper mode`() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
 
-        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.API.name), semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeMinusModifier } returns .33
+        every { preferencesRepository.gradePlusModifier } returns .33
 
-        assertEquals(3.375, averages["Język polski"])
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(3.5, items.single { it.subject == "Język polski" }.average, .0) // from details and after set custom plus/minus
     }
 
     @Test
-    fun onlyOneSemester_gradesWithModifiers_scrapper() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
-        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters[2], true)
+    fun `force calc current semester average with custom modifiers in api mode`() {
+        val student = student.copy(loginMode = Sdk.Mode.API.name)
 
-        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.SCRAPPER.name), semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeMinusModifier } returns .33  // useless in this mode
+        every { preferencesRepository.gradePlusModifier } returns .33
 
-        assertEquals(3.5, averages["Język polski"])
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
     }
 
     @Test
-    fun onlyOneSemester_gradesWithModifiers_hybrid() {
-        doReturn("only_one_semester").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
-        doReturn(Single.just(secondGradeWithModifier)).`when`(gradeRepository).getGrades(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters[2], true)
+    fun `force calc current semester average with custom modifiers in hybrid mode`() {
+        val student = student.copy(loginMode = Sdk.Mode.HYBRID.name)
 
-        val averages = gradeAverageProvider.getGradeAverage(student.copy(loginMode = Sdk.Mode.HYBRID.name), semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeMinusModifier } returns .33 // useless in this mode
+        every { preferencesRepository.gradePlusModifier } returns .33
 
-        assertEquals(3.375, averages["Język polski"])
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGradeWithModifier to secondSummariesWithModifier }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(3.375, items.single { it.subject == "Język polski" }.average, .0) // (from details): 3.375
     }
 
     @Test
-    fun allYearFirstSemesterTest() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[1], true)
+    fun `calc current semester average`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[1].semesterId, true)
-            .blockingGet()
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
 
-        assertEquals(2, averages.size)
-        assertEquals(3.5, averages["Matematyka"])
-        assertEquals(3.5, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(2.9, items.single { it.subject == "Matematyka" }.average, .0) // from summary: 2,9
+        assertEquals(3.4, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,4
     }
 
     @Test
-    fun allYearSecondSemesterTest() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(emptyList<GradeSummary>())).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+    fun `force calc current semester average`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ONE_SEMESTER
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
 
-        assertEquals(2, averages.size)
-        assertEquals(3.0, averages["Matematyka"])
-        assertEquals(3.25, averages["Fizyka"])
-    }
-
-    @Test(expected = IllegalArgumentException::class)
-    fun incorrectAverageModeTest() {
-        doReturn("test_mode").`when`(preferencesRepository).gradeAverageMode
-
-        gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true).blockingGet()
+        assertEquals(2, items.size)
+        assertEquals(2.5, items.single { it.subject == "Matematyka" }.average, .0) // from details: 2,5
+        assertEquals(3.0, items.single { it.subject == "Fizyka" }.average, .0) // from details: 3,0
     }
 
     @Test
-    fun onlyOneSemester_averageFromSummary() {
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(listOf(
-            getSummary(22, "Matematyka", 3.1),
-            getSummary(22, "Fizyka", 3.26)
-        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+    fun `force calc full year average when current is first`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[1].semesterId, true).getResult() }
 
-        assertEquals(2, averages.size)
-        assertEquals(3.1, averages["Matematyka"])
-        assertEquals(3.26, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summary): 3,5
+        assertEquals(3.5, items.single { it.subject == "Fizyka" }.average, .0) // (from summary): 3,5
     }
 
     @Test
-    fun onlyOneSemester_averageFromSummary_forceCalc() {
-        doReturn(true).`when`(preferencesRepository).gradeAverageForceCalc
-        doReturn("all_year").`when`(preferencesRepository).gradeAverageMode
-        doReturn(Single.just(firstGrades)).`when`(gradeRepository).getGrades(student, semesters[1], false)
-        doReturn(Single.just(listOf(
-            getSummary(22, "Matematyka", 3.1),
-            getSummary(22, "Fizyka", 3.26)
-        ))).`when`(gradeSummaryRepository).getGradesSummary(semesters[2], true)
+    fun `calc both semesters average`() {
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            firstGrades to listOf(
+                getSummary(22, "Matematyka", 3.0),
+                getSummary(22, "Fizyka", 3.5)
+            )
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            secondGrades to listOf(
+                getSummary(22, "Matematyka", 3.5),
+                getSummary(22, "Fizyka", 4.0)
+            )
+        }
 
-        val averages = gradeAverageProvider.getGradeAverage(student, semesters, semesters[2].semesterId, true)
-            .blockingGet()
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
 
-        assertEquals(2, averages.size)
-        assertEquals(3.0, averages["Matematyka"])
-        assertEquals(3.25, averages["Fizyka"])
+        assertEquals(2, items.size)
+        assertEquals(3.25, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 3,0 + 3,5 → 3,25
+        assertEquals(3.75, items.single { it.subject == "Fizyka" }.average, .0) // (from summaries ↑): 3,5 + 4,0 → 3,75
     }
 
-    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0): Grade {
+    @Test
+    fun `force calc full year average`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            secondGrades to listOf(
+                getSummary(22, "Matematyka", 1.1),
+                getSummary(22, "Fizyka", 7.26)
+            )
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+    }
+
+    @Test
+    fun `calc both semesters average when no summaries`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5 + 3,0 → 3,25
+    }
+
+    @Test
+    fun `force calc full year average when no summaries`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to emptyList<GradeSummary>() }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to emptyList<GradeSummary>() }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+    }
+
+    @Test
+    fun `calc both semesters average when missing summaries in both semesters`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            firstGrades to listOf(
+                getSummary(22, "Matematyka", 4.0)
+            )
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            secondGrades to listOf(
+                getSummary(23, "Matematyka", 3.0)
+            )
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.5, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries ↑): 4,0 + 3,0 → 3,5
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+    }
+
+    @Test
+    fun `calc both semesters average when missing summary in second semester`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries.dropLast(1) }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
+        assertEquals(3.05, items.single { it.subject == "Fizyka" }.average, .0) // 3,1 (from summary) + 3,0 (from details) → 3,05
+    }
+
+    @Test
+    fun `calc both semesters average when missing summary in first semester`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns false
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.4, items.single { it.subject == "Matematyka" }.average, .0) // (from summaries): 3,9 + 2,9 → 3,4
+        assertEquals(3.45, items.single { it.subject == "Fizyka" }.average, .0) // 3,5 (from details) + 3,4 (from summary) → 3,45
+    }
+
+    @Test
+    fun `force calc full year average when missing summary in first semester`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource { firstGrades to firstSummaries.dropLast(1) }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource { secondGrades to secondSummaries }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(2, items.size)
+        assertEquals(3.0, items.single { it.subject == "Matematyka" }.average, .0) // (from details): 3,5 + 2,5 → 3,0
+        assertEquals(3.25, items.single { it.subject == "Fizyka" }.average, .0) // (from details): 3,5  + 3,0 → 3,25
+    }
+
+    @Test
+    fun `force calc both semesters average with different average from all grades and from two semesters`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            listOf(
+                getGrade(22, "Fizyka", 5.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 5.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            listOf(
+                getGrade(23, "Fizyka", 5.0, weight = 1.0),
+                getGrade(23, "Fizyka", 5.0, weight = 2.0),
+                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(5.2296, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → 5.229636363636364
+    }
+
+    @Test
+    fun `force calc full year average with different average from all grades and from two semesters`() {
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            listOf(
+                getGrade(22, "Fizyka", 5.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 5.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            listOf(
+                getGrade(23, "Fizyka", 5.0, weight = 1.0),
+                getGrade(23, "Fizyka", 5.0, weight = 2.0),
+                getGrade(23, "Fizyka", 4.0, modifier = 0.3, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(5.5429, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,732 → .average()
+    }
+
+    @Test
+    fun `force calc both semesters average with different average from all grades and from two semesters with custom modifiers`() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeMinusModifier } returns .33
+        every { preferencesRepository.gradePlusModifier } returns .5
+
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.BOTH_SEMESTERS
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            listOf(
+                getGrade(22, "Fizyka", 5.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 5.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            listOf(
+                getGrade(23, "Fizyka", 5.0, weight = 1.0),
+                getGrade(23, "Fizyka", 5.0, weight = 2.0),
+                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(5.2636, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272 + 4,8 → 5.26363636
+    }
+
+    @Test
+    fun `force calc full year average with different average from all grades and from two semesters with custom modifiers`() {
+        val student = student.copy(loginMode = Sdk.Mode.SCRAPPER.name)
+
+        every { preferencesRepository.gradeAverageForceCalc } returns true
+        every { preferencesRepository.gradeMinusModifier } returns .33
+        every { preferencesRepository.gradePlusModifier } returns .5
+
+        every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
+        coEvery { semesterRepository.getSemesters(student) } returns semesters
+
+        coEvery { gradeRepository.getGrades(student, semesters[1], true) } returns flowWithResource {
+            listOf(
+                getGrade(22, "Fizyka", 5.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 5.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 4.0),
+                getGrade(22, "Fizyka", 6.0, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 22, subject = "Fizyka", average = .0))
+        }
+        coEvery { gradeRepository.getGrades(student, semesters[2], true) } returns flowWithResource {
+            listOf(
+                getGrade(23, "Fizyka", 5.0, weight = 1.0),
+                getGrade(23, "Fizyka", 5.0, weight = 2.0),
+                getGrade(23, "Fizyka", 4.0, modifier = 0.33, weight = 2.0)
+            ) to listOf(getSummary(semesterId = 23, subject = "Fizyka", average = .0))
+        }
+
+        val items = runBlocking { gradeAverageProvider.getGradesDetailsWithAverage(student, semesters[2].semesterId, true).getResult() }
+
+        assertEquals(5.5555, items.single { it.subject == "Fizyka" }.average, .0001) // (from details): 5.72727272  + 4,8 → .average()
+    }
+
+    private fun getGrade(semesterId: Int, subject: String, value: Double, modifier: Double = 0.0, weight: Double = 1.0): Grade {
         return Grade(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
             value = value,
             modifier = modifier,
-            weightValue = 1.0,
+            weightValue = weight,
             teacher = "",
             date = now(),
             weight = "",
@@ -220,12 +506,12 @@ class GradeAverageProviderTest {
         )
     }
 
-    private fun getSummary(semesterId: Int, subject: String, value: Double): GradeSummary {
+    private fun getSummary(semesterId: Int, subject: String, average: Double): GradeSummary {
         return GradeSummary(
             studentId = 101,
             semesterId = semesterId,
             subject = subject,
-            average = value,
+            average = average,
             pointsSum = "",
             proposedPoints = "",
             finalPoints = "",
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
index 4ef5904fb..4f32cf7eb 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/LoginPresenterTest.kt
@@ -1,56 +1,55 @@
 package io.github.wulkanowy.ui.modules.login
 
-import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.student.StudentRepository
+import io.mockk.MockKAnnotations
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.verify
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
 
 class LoginPresenterTest {
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var loginView: LoginView
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var errorHandler: LoginErrorHandler
 
-    @Mock
+    @MockK
     lateinit var studentRepository: StudentRepository
 
     private lateinit var presenter: LoginPresenter
 
     @Before
     fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(loginView)
+        MockKAnnotations.init(this)
+        clearMocks(loginView)
 
-        presenter = LoginPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
+        presenter = LoginPresenter(errorHandler, studentRepository)
         presenter.onAttachView(loginView)
     }
 
     @Test
     fun initViewTest() {
-        verify(loginView).initView()
-        verify(loginView).showActionBar(false)
+        verify { loginView.initView() }
+        verify { loginView.showActionBar(false) }
     }
 
     @Test
     fun onBackPressedTest() {
-        clearInvocations(loginView)
-        doReturn(1).`when`(loginView).currentViewIndex
+        clearMocks(loginView)
+        every { loginView.currentViewIndex } returns 1
         presenter.onBackPressed { }
-        verify(loginView).switchView(0)
+        verify { loginView.switchView(0) }
     }
 
     @Test
     fun onBackPressedDefaultTest() {
         var i = 0
-        doReturn(0).`when`(loginView).currentViewIndex
+        every { loginView.currentViewIndex } returns 0
         presenter.onBackPressed { i++ }
         assertNotEquals(0, i)
     }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
index be99d4d46..daacbac20 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/form/LoginFormPresenterTest.kt
@@ -1,157 +1,169 @@
 package io.github.wulkanowy.ui.modules.login.form
 
-import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
-import io.github.wulkanowy.utils.AppInfo
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.reactivex.Single
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
-import org.mockito.ArgumentMatchers.anyString
-import org.mockito.Mock
-import org.mockito.Mockito.`when`
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.never
-import org.mockito.Mockito.times
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDateTime.now
+import java.time.LocalDateTime.now
+import java.io.IOException
 
 class LoginFormPresenterTest {
 
-    @Mock
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
+    @MockK(relaxed = true)
     lateinit var loginFormView: LoginFormView
 
-    @Mock
+    @MockK
     lateinit var repository: StudentRepository
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var errorHandler: LoginErrorHandler
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var analytics: FirebaseAnalyticsHelper
 
-    @Mock
-    lateinit var appInfo: AppInfo
-
     private lateinit var presenter: LoginFormPresenter
 
     @Before
-    fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(repository, loginFormView)
-        presenter = LoginFormPresenter(TestSchedulersProvider(), repository, errorHandler, analytics)
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        every { loginFormView.initView() } just Runs
+        every { loginFormView.showContact(any()) } just Runs
+        every { loginFormView.showVersion() } just Runs
+        every { loginFormView.showProgress(any()) } just Runs
+        every { loginFormView.showContent(any()) } just Runs
+        every { loginFormView.formHostSymbol } returns "Default"
+        every { loginFormView.setErrorPassInvalid(any()) } just Runs
+        every { loginFormView.setErrorPassRequired(any()) } just Runs
+        every { loginFormView.setErrorUsernameRequired() } just Runs
+
+        presenter = LoginFormPresenter(repository, errorHandler, analytics)
         presenter.onAttachView(loginFormView)
     }
 
     @Test
     fun initViewTest() {
-        verify(loginFormView).initView()
+        verify { loginFormView.initView() }
     }
 
     @Test
     fun emptyNicknameLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("")
-        `when`(loginFormView.formPassValue).thenReturn("test123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        every { loginFormView.formUsernameValue } returns ""
+        every { loginFormView.formPassValue } returns "test123"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
         presenter.onSignInClick()
 
-        verify(loginFormView).setErrorNameRequired()
-        verify(loginFormView, never()).setErrorPassRequired(false)
-        verify(loginFormView, never()).setErrorPassInvalid(false)
+        verify { loginFormView.setErrorUsernameRequired() }
+        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
+        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
     }
 
     @Test
     fun emptyPassLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns ""
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNameRequired()
-        verify(loginFormView).setErrorPassRequired(true)
-        verify(loginFormView, never()).setErrorPassInvalid(false)
+        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
+        verify { loginFormView.setErrorPassRequired(true) }
+        verify(exactly = 0) { loginFormView.setErrorPassInvalid(false) }
     }
 
     @Test
     fun invalidPassLoginTest() {
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("123")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns "123"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
         presenter.onSignInClick()
 
-        verify(loginFormView, never()).setErrorNameRequired()
-        verify(loginFormView, never()).setErrorPassRequired(true)
-        verify(loginFormView).setErrorPassInvalid(true)
+        verify(exactly = 0) { loginFormView.setErrorUsernameRequired() }
+        verify(exactly = 0) { loginFormView.setErrorPassRequired(true) }
+        verify { loginFormView.setErrorPassInvalid(true) }
     }
 
     @Test
     fun loginTest() {
-        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, isParent = false)
-        doReturn(Single.just(listOf(studentTest))).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
+        val studentTest = Student(email = "test@", password = "123", scrapperBaseUrl = "https://fakelog.cf/", loginType = "AUTO", studentName = "", schoolSymbol = "", schoolName = "", studentId = 0, classId = 1, isCurrent = false, symbol = "", registrationDate = now(), className = "", mobileBaseUrl = "", privateKey = "", certificateKey = "", loginMode = "", userLoginId = 0, schoolShortName = "", isParent = false, userName = "")
+        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf(StudentWithSemesters(studentTest, emptyList()))
 
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns "123456"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        every { loginFormView.formHostSymbol } returns "Default"
         presenter.onSignInClick()
 
-        verify(loginFormView).hideSoftKeyboard()
-        verify(loginFormView).showProgress(true)
-        verify(loginFormView).showProgress(false)
-        verify(loginFormView).showContent(false)
-        verify(loginFormView).showContent(true)
+        verify { loginFormView.hideSoftKeyboard() }
+        verify { loginFormView.showProgress(true) }
+        verify { loginFormView.showProgress(false) }
+        verify { loginFormView.showContent(false) }
+        verify { loginFormView.showContent(true) }
     }
 
     @Test
     fun loginEmptyTest() {
-        doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns "123456"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        every { loginFormView.formHostSymbol } returns "Default"
         presenter.onSignInClick()
 
-        verify(loginFormView).hideSoftKeyboard()
-        verify(loginFormView).showProgress(true)
-        verify(loginFormView).showProgress(false)
-        verify(loginFormView).showContent(false)
-        verify(loginFormView).showContent(true)
+        verify { loginFormView.showContent(false) }
+        verify { loginFormView.showProgress(true) }
+        verify { loginFormView.showProgress(false) }
+        verify { loginFormView.showContent(false) }
+        verify { loginFormView.showContent(true) }
     }
 
     @Test
     fun loginEmptyTwiceTest() {
-        doReturn(Single.just(emptyList<Student>()))
-            .`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } returns listOf()
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns "123456"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        every { loginFormView.formHostSymbol } returns "Default"
         presenter.onSignInClick()
         presenter.onSignInClick()
 
-        verify(loginFormView, times(2)).hideSoftKeyboard()
-        verify(loginFormView, times(2)).showProgress(true)
-        verify(loginFormView, times(2)).showProgress(false)
-        verify(loginFormView, times(2)).showContent(false)
-        verify(loginFormView, times(2)).showContent(true)
+        verify(exactly = 2) { loginFormView.hideSoftKeyboard() }
+        verify(exactly = 2) { loginFormView.showProgress(true) }
+        verify(exactly = 2) { loginFormView.showProgress(false) }
+        verify(exactly = 2) { loginFormView.showContent(false) }
+        verify(exactly = 2) { loginFormView.showContent(true) }
     }
 
     @Test
     fun loginErrorTest() {
-        val testException = RuntimeException("test")
-        doReturn(Single.error<List<Student>>(testException)).`when`(repository).getStudentsScrapper(anyString(), anyString(), anyString(), anyString())
-        `when`(loginFormView.formNameValue).thenReturn("@")
-        `when`(loginFormView.formPassValue).thenReturn("123456")
-        `when`(loginFormView.formHostValue).thenReturn("https://fakelog.cf")
+        val testException = IOException("test")
+        coEvery { repository.getStudentsScrapper(any(), any(), any(), any()) } throws testException
+        every { loginFormView.formUsernameValue } returns "@"
+        every { loginFormView.formPassValue } returns "123456"
+        every { loginFormView.formHostValue } returns "https://fakelog.cf/?standard"
+        every { loginFormView.formHostSymbol } returns "Default"
+        every { loginFormView.showProgress(any()) } just Runs
+        every { loginFormView.showProgress(any()) } just Runs
         presenter.onSignInClick()
 
-        verify(loginFormView).hideSoftKeyboard()
-        verify(loginFormView).showProgress(true)
-        verify(loginFormView).showProgress(false)
-        verify(loginFormView).showContent(false)
-        verify(loginFormView).showContent(true)
-        verify(errorHandler).dispatch(testException)
+        verify { loginFormView.hideSoftKeyboard() }
+        verify { loginFormView.showProgress(false) }
+        verify { loginFormView.showContent(false) }
+        verify { loginFormView.showContent(true) }
+        verify { errorHandler.dispatch(match { it.message == testException.message }) }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
index 2c174fb58..b3a24a2ac 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenterTest.kt
@@ -1,73 +1,88 @@
 package io.github.wulkanowy.ui.modules.login.studentselect
 
-import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.db.entities.Student
+import io.github.wulkanowy.data.db.entities.StudentWithSemesters
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
-import io.reactivex.Completable
-import io.reactivex.Single
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.clearMocks
+import io.mockk.coEvery
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDateTime.now
+import java.time.LocalDateTime.now
 
 class LoginStudentSelectPresenterTest {
 
-    @Mock
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
+    @MockK(relaxed = true)
     lateinit var errorHandler: LoginErrorHandler
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var loginStudentSelectView: LoginStudentSelectView
 
-    @Mock
+    @MockK
     lateinit var studentRepository: StudentRepository
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: LoginStudentSelectPresenter
 
-    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", userLoginId = 1, isParent = false) }
+    private val testStudent by lazy { Student(email = "test", password = "test123", scrapperBaseUrl = "https://fakelog.cf", loginType = "AUTO", symbol = "", isCurrent = false, studentId = 0, schoolName = "", schoolSymbol = "", classId = 1, studentName = "", registrationDate = now(), className = "", loginMode = "", certificateKey = "", privateKey = "", mobileBaseUrl = "", schoolShortName = "", userLoginId = 1, isParent = false, userName = "") }
 
     private val testException by lazy { RuntimeException("Problem") }
 
     @Before
-    fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(studentRepository, loginStudentSelectView)
-        presenter = LoginStudentSelectPresenter(TestSchedulersProvider(), studentRepository, errorHandler, analytics)
+    fun setUp() {
+        MockKAnnotations.init(this)
+
+        clearMocks(studentRepository, loginStudentSelectView)
+        every { loginStudentSelectView.initView() } just Runs
+        every { loginStudentSelectView.showContact(any()) } just Runs
+        every { loginStudentSelectView.enableSignIn(any()) } just Runs
+        every { loginStudentSelectView.showProgress(any()) } just Runs
+        every { loginStudentSelectView.showContent(any()) } just Runs
+
+        presenter = LoginStudentSelectPresenter(studentRepository, errorHandler, analytics)
         presenter.onAttachView(loginStudentSelectView, null)
     }
 
     @Test
     fun initViewTest() {
-        verify(loginStudentSelectView).initView()
+        verify { loginStudentSelectView.initView() }
     }
 
     @Test
     fun onSelectedStudentTest() {
-        doReturn(Single.just(listOf(1L))).`when`(studentRepository).saveStudents(listOf(testStudent))
-        doReturn(Completable.complete()).`when`(studentRepository).switchStudent(testStudent)
-        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } returns listOf(1L)
+        coEvery { studentRepository.switchStudent(StudentWithSemesters(testStudent, emptyList())) } just Runs
+        every { loginStudentSelectView.openMainView() } just Runs
+        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
         presenter.onSignIn()
-        verify(loginStudentSelectView).showContent(false)
-        verify(loginStudentSelectView).showProgress(true)
-        verify(loginStudentSelectView).openMainView()
+
+        verify { loginStudentSelectView.showContent(false) }
+        verify { loginStudentSelectView.showProgress(true) }
+        verify { loginStudentSelectView.openMainView() }
     }
 
     @Test
     fun onSelectedStudentErrorTest() {
-        doReturn(Single.error<Student>(testException)).`when`(studentRepository).saveStudents(listOf(testStudent))
-        doReturn(Completable.complete()).`when`(studentRepository).logoutStudent(testStudent)
-        presenter.onItemSelected(LoginStudentSelectItem(testStudent))
+        coEvery { studentRepository.saveStudents(listOf(StudentWithSemesters(testStudent, emptyList()))) } throws testException
+        coEvery { studentRepository.logoutStudent(testStudent) } just Runs
+        presenter.onItemSelected(StudentWithSemesters(testStudent, emptyList()), false)
         presenter.onSignIn()
-        verify(loginStudentSelectView).showContent(false)
-        verify(loginStudentSelectView).showProgress(true)
-        verify(errorHandler).dispatch(testException)
+        verify { loginStudentSelectView.showContent(false) }
+        verify { loginStudentSelectView.showProgress(true) }
+        verify { errorHandler.dispatch(match { testException.message == it.message }) }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
index 936098970..fc2832b2e 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/main/MainPresenterTest.kt
@@ -1,58 +1,67 @@
 package io.github.wulkanowy.ui.modules.main
 
-import io.github.wulkanowy.TestSchedulersProvider
 import io.github.wulkanowy.data.repositories.preferences.PreferencesRepository
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.services.sync.SyncManager
 import io.github.wulkanowy.ui.base.ErrorHandler
 import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
+import io.mockk.MockKAnnotations
+import io.mockk.Runs
+import io.mockk.clearMocks
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import io.mockk.just
+import io.mockk.verify
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.clearInvocations
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
 
 class MainPresenterTest {
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler
 
-    @Mock
+    @MockK
     lateinit var studentRepository: StudentRepository
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var prefRepository: PreferencesRepository
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var syncManager: SyncManager
 
-    @Mock
+    @MockK
     lateinit var mainView: MainView
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var analytics: FirebaseAnalyticsHelper
 
     private lateinit var presenter: MainPresenter
 
     @Before
     fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        clearInvocations(mainView)
+        MockKAnnotations.init(this)
+        clearMocks(mainView)
 
-        presenter = MainPresenter(TestSchedulersProvider(), errorHandler, studentRepository, prefRepository, syncManager, analytics)
+        every { mainView.startMenuIndex = any() } just Runs
+        every { mainView.startMenuMoreIndex = any() } just Runs
+        every { mainView.startMenuIndex } returns 1
+        every { mainView.startMenuMoreIndex } returns 1
+        every { mainView.initView() } just Runs
+        presenter = MainPresenter(errorHandler, studentRepository, prefRepository, syncManager, analytics)
         presenter.onAttachView(mainView, null)
     }
 
     @Test
     fun initMenuTest() {
-        verify(mainView).initView()
+        verify { mainView.initView() }
     }
 
     @Test
     fun onTabSelectedTest() {
+        every { mainView.notifyMenuViewChanged() } just Runs
+
+        every { mainView.switchMenuView(1) } just Runs
         presenter.onTabSelected(1, false)
-        verify(mainView).switchMenuView(1)
+        verify { mainView.switchMenuView(1) }
     }
 }
-
diff --git a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
index 34d0ce5cb..a81f1abd9 100644
--- a/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/ui/modules/splash/SplashPresenterTest.kt
@@ -1,46 +1,49 @@
 package io.github.wulkanowy.ui.modules.splash
 
-import io.github.wulkanowy.TestSchedulersProvider
+import io.github.wulkanowy.MainCoroutineRule
 import io.github.wulkanowy.data.repositories.student.StudentRepository
 import io.github.wulkanowy.ui.base.ErrorHandler
-import io.reactivex.Single
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.impl.annotations.MockK
+import io.mockk.verify
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.Mockito.doReturn
-import org.mockito.Mockito.verify
-import org.mockito.MockitoAnnotations
 
 class SplashPresenterTest {
 
-    @Mock
+    @get:Rule
+    val coroutineRule = MainCoroutineRule()
+
+    @MockK(relaxed = true)
     lateinit var splashView: SplashView
 
-    @Mock
+    @MockK
     lateinit var studentRepository: StudentRepository
 
-    @Mock
+    @MockK(relaxed = true)
     lateinit var errorHandler: ErrorHandler
 
     private lateinit var presenter: SplashPresenter
 
     @Before
-    fun initPresenter() {
-        MockitoAnnotations.initMocks(this)
-        presenter = SplashPresenter(TestSchedulersProvider(), errorHandler, studentRepository)
+    fun setUp() {
+        MockKAnnotations.init(this)
+        presenter = SplashPresenter(errorHandler, studentRepository)
     }
 
     @Test
     fun testOpenLoginView() {
-        doReturn(Single.just(false)).`when`(studentRepository).isCurrentStudentSet()
+        coEvery { studentRepository.isCurrentStudentSet() } returns false
         presenter.onAttachView(splashView)
-        verify(splashView).openLoginView()
+        verify { splashView.openLoginView() }
     }
 
     @Test
     fun testMainMainView() {
-        doReturn(Single.just(true)).`when`(studentRepository).isCurrentStudentSet()
+        coEvery { studentRepository.isCurrentStudentSet() } returns true
         presenter.onAttachView(splashView)
-        verify(splashView).openMainView()
+        verify { splashView.openMainView() }
     }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
index ece7acf20..e1693d523 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/GradeExtensionTest.kt
@@ -3,21 +3,21 @@ package io.github.wulkanowy.utils
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.data.db.entities.GradeSummary
+import io.mockk.MockKAnnotations
+import io.mockk.impl.annotations.MockK
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
-import org.mockito.MockitoAnnotations
-import org.threeten.bp.LocalDate
+import java.time.LocalDate
 
 class GradeExtensionTest {
 
-    @Mock
+    @MockK
     lateinit var date: LocalDate
 
     @Before
     fun before() {
-        MockitoAnnotations.initMocks(this)
+        MockKAnnotations.init(this)
     }
 
     @Test
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
index 024b4727b..d604dfef4 100644
--- a/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimeExtensionTest.kt
@@ -4,9 +4,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.threeten.bp.LocalDate.of
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.Month.JANUARY
+import java.time.LocalDate.of
+import java.time.LocalDateTime
+import java.time.Month.JANUARY
 import java.util.Locale
 
 class TimeExtensionTest {
@@ -38,12 +38,12 @@ class TimeExtensionTest {
     }
 
     @Test
-    fun fridayTest() {
-        assertEquals(of(2018, 10, 5), of(2018, 10, 2).friday)
-        assertEquals(of(2018, 10, 5), of(2018, 10, 5).friday)
-        assertEquals(of(2018, 10, 5), of(2018, 10, 6).friday)
-        assertEquals(of(2018, 10, 5), of(2018, 10, 7).friday)
-        assertEquals(of(2018, 10, 12), of(2018, 10, 8).friday)
+    fun sundayTestTest() {
+        assertEquals(of(2018, 10, 7), of(2018, 10, 2).sunday)
+        assertEquals(of(2018, 10, 7), of(2018, 10, 5).sunday)
+        assertEquals(of(2018, 10, 7), of(2018, 10, 6).sunday)
+        assertEquals(of(2018, 10, 7), of(2018, 10, 7).sunday)
+        assertEquals(of(2018, 10, 14), of(2018, 10, 8).sunday)
     }
 
     @Test
@@ -171,4 +171,42 @@ class TimeExtensionTest {
         assertEquals(of(2019, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2018))
         assertEquals(of(2018, 5, 1), of(2019, 5, 1).getLastSchoolDayIfHoliday(2017))
     }
+
+    @Test
+    fun getExamsCutOffDates() {
+        with(of(2020, 9, 13)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 14)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 15)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 16)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 17)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 18)) {
+            assertEquals(of(2020, 9, 14), startExamsDay)
+            assertEquals(of(2020, 10, 11), endExamsDay)
+        }
+
+        with(of(2020, 9, 19)) {
+            assertEquals(of(2020, 9, 21), startExamsDay)
+            assertEquals(of(2020, 10, 18), endExamsDay)
+        }
+    }
 }
diff --git a/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
new file mode 100644
index 000000000..eac84759d
--- /dev/null
+++ b/app/src/test/java/io/github/wulkanowy/utils/TimetableExtensionTest.kt
@@ -0,0 +1,43 @@
+package io.github.wulkanowy.utils
+
+import io.github.wulkanowy.getTimetableEntity
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import java.time.LocalDateTime.now
+
+class TimetableExtensionTest {
+
+    @Test
+    fun isShowTimeUntil() {
+        assertFalse(getTimetableEntity().isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = false).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = true).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(5)).isShowTimeUntil(now().plusMinutes(5)))
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(61)).isShowTimeUntil(now().minusMinutes(5)))
+
+        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(now().minusMinutes(5)))
+        assertTrue(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().plusMinutes(60)).isShowTimeUntil(null))
+
+        assertFalse(getTimetableEntity(isStudentPlan = true, canceled = false, start = now().minusSeconds(1)).isShowTimeUntil(null))
+    }
+
+    @Test
+    fun getLeft() {
+        assertEquals(null, getTimetableEntity(canceled = true).left)
+        assertEquals(null, getTimetableEntity(start = now().plusMinutes(5), end = now().plusMinutes(50)).left)
+        assertEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = false).left)
+        assertNotEquals(null, getTimetableEntity(start = now().minusMinutes(1), end = now().plusMinutes(44), isStudentPlan = true).left)
+    }
+
+    @Test
+    fun isJustFinished() {
+        assertFalse(getTimetableEntity(end = now().minusSeconds(16)).isJustFinished)
+        assertTrue(getTimetableEntity(end = now().minusSeconds(14)).isJustFinished)
+        assertTrue(getTimetableEntity(end = now().minusSeconds(1)).isJustFinished)
+        assertFalse(getTimetableEntity(end = now().plusSeconds(1)).isJustFinished)
+    }
+}
diff --git a/appgallery_badge.png b/appgallery_badge.png
new file mode 100644
index 000000000..ce8860758
Binary files /dev/null and b/appgallery_badge.png differ
diff --git a/build.gradle b/build.gradle
index 0843a31a3..608e3ce5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,25 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext {
+        kotlin_version = '1.4.10'
+        about_libraries = '8.4.2'
+        hilt_version = "2.29.1-alpha"
+    }
     repositories {
         mavenCentral()
         google()
         jcenter()
         maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath "io.fabric.tools:gradle:1.31.2"
-        classpath "com.github.triplet.gradle:play-publisher:2.4.2"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
+        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
+        classpath "com.github.triplet.gradle:play-publisher:2.8.0"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"
     }
 }
 
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 000000000..2399a56b5
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,14 @@
+files:
+  - source: /app/src/main/res/values/*.xml
+    ignore:
+      - /app/src/main/res/values/styles.xml
+      - /app/src/main/res/values/api_hosts.xml
+      - /app/src/main/res/values/api_symbols.xml
+      - /app/src/main/res/values/attrs.xml
+      - /app/src/main/res/values/colors.xml
+      - /app/src/main/res/values/dimens.xml
+      - /app/src/main/res/values/preferences_keys.xml
+      - /app/src/main/res/values/preferences_defaults.xml
+    translation: /app/src/main/res/values-%android_code%/%original_file_name%
+    translate_attributes: 0
+    content_segmentation: 0
diff --git a/gradle.properties b/gradle.properties
index 113bb1069..5741ecfc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,6 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=true
 org.gradle.jvmargs=-Xmx1536m
 kapt.incremental.apt=true
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..e708b1c02 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0ebb3108e..33682bbbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfdc..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141..ac1b06f93 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell